[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 18:46:21 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 452bbf528801f566c91bd576c5fe66b2e8cfc74b
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 17 17:37:04 2010 +0000

    2010-12-17  John Knottenbelt  <jknotten at chromium.org>
    
            Reviewed by Jeremy Orlow.
    
            Fix test failures where NULL GeolocationClient is provided
            https://bugs.webkit.org/show_bug.cgi?id=51256
    
            * src/GeolocationClientProxy.cpp:
            (WebKit::GeolocationClientProxy::geolocationDestroyed):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74274 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 0488f0a..144b6b5 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-17  John Knottenbelt  <jknotten at chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Fix test failures where NULL GeolocationClient is provided
+        https://bugs.webkit.org/show_bug.cgi?id=51256
+
+        * src/GeolocationClientProxy.cpp:
+        (WebKit::GeolocationClientProxy::geolocationDestroyed):
+
 2010-12-17  Hans Wennborg  <hans at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebKit/chromium/src/GeolocationClientProxy.cpp b/WebKit/chromium/src/GeolocationClientProxy.cpp
index 73a8690..b2536dd 100644
--- a/WebKit/chromium/src/GeolocationClientProxy.cpp
+++ b/WebKit/chromium/src/GeolocationClientProxy.cpp
@@ -55,7 +55,8 @@ void GeolocationClientProxy::setController(WebCore::GeolocationController* contr
 
 void GeolocationClientProxy::geolocationDestroyed()
 {
-    m_client->geolocationDestroyed();
+    if (m_client)
+        m_client->geolocationDestroyed();
 }
 
 void GeolocationClientProxy::startUpdating()

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list