[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 9adec3032459fbd092ef8be9226e825588aa0a5e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 19 16:57:38 2010 +0000

    2010-02-19  Marcus Bulach  <bulach at chromium.org>
    
            Reviewed by Jeremy Orlow.
    
            Fixes GeolocationServiceBridgeImpl::stopUpdating (it can be called multiple times).
    
            * src/GeolocationServiceBridgeChromium.cpp:
            (WebKit::GeolocationServiceBridgeImpl::stopUpdating):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55018 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index b70f325..9e35866 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-19  Marcus Bulach  <bulach at chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Fixes GeolocationServiceBridgeImpl::stopUpdating (it can be called multiple times).
+
+        * src/GeolocationServiceBridgeChromium.cpp:
+        (WebKit::GeolocationServiceBridgeImpl::stopUpdating):
+
 2010-02-19  Pavel Feldman  <pfeldman at chromium.org>
 
         Not reviewed. Chromium build fix: reverting r54997 and r54998.
diff --git a/WebKit/chromium/src/GeolocationServiceBridgeChromium.cpp b/WebKit/chromium/src/GeolocationServiceBridgeChromium.cpp
index eadcdaf..abbb9c6 100644
--- a/WebKit/chromium/src/GeolocationServiceBridgeChromium.cpp
+++ b/WebKit/chromium/src/GeolocationServiceBridgeChromium.cpp
@@ -126,10 +126,12 @@ bool GeolocationServiceBridgeImpl::startUpdating(PositionOptions* positionOption
 
 void GeolocationServiceBridgeImpl::stopUpdating()
 {
-    WebGeolocationServiceInterface* geolocationService = getWebViewClient()->getGeolocationService();
-    geolocationService->stopUpdating(m_bridgeId);
-    geolocationService->dettachBridge(m_bridgeId);
-    m_bridgeId = 0;
+    if (m_bridgeId) {
+        WebGeolocationServiceInterface* geolocationService = getWebViewClient()->getGeolocationService();
+        geolocationService->stopUpdating(m_bridgeId);
+        geolocationService->dettachBridge(m_bridgeId);
+        m_bridgeId = 0;
+    }
 }
 
 void GeolocationServiceBridgeImpl::suspend()

-- 
WebKit Debian packaging