[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 092e888b76c0df00a984d756dbbf409f944d6af6
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 15 20:30:17 2010 +0000

    2010-03-15  Marcus Bulach  <bulach at chromium.org>
    
            Reviewed by Jeremy Orlow.
    
            Send the frame URL on GeolocationServiceBridgeImpl::startUpdating.
            https://bugs.webkit.org/show_bug.cgi?id=36012
    
            * public/GeolocationServiceBridgeChromium.h:
            * src/GeolocationServiceBridgeChromium.cpp:
            (WebKit::GeolocationServiceBridgeImpl::startUpdating):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56011 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 5ffddda..b17ca71 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-15  Marcus Bulach  <bulach at chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Send the frame URL on GeolocationServiceBridgeImpl::startUpdating.
+        https://bugs.webkit.org/show_bug.cgi?id=36012
+
+        * public/GeolocationServiceBridgeChromium.h:
+        * src/GeolocationServiceBridgeChromium.cpp:
+        (WebKit::GeolocationServiceBridgeImpl::startUpdating):
+
 2010-03-15  Patrik Persson  <patrik.j.persson at ericsson.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/chromium/public/GeolocationServiceBridgeChromium.h b/WebKit/chromium/public/GeolocationServiceBridgeChromium.h
index adca956..177eab2 100644
--- a/WebKit/chromium/public/GeolocationServiceBridgeChromium.h
+++ b/WebKit/chromium/public/GeolocationServiceBridgeChromium.h
@@ -53,7 +53,7 @@ public:
 class WebGeolocationServiceInterface {
 public:
     virtual void requestPermissionForFrame(int bridgeId, const WebURL& url) = 0;
-    virtual void startUpdating(int bridgeId, bool hasHighAccuracy) = 0;
+    virtual void startUpdating(int bridgeId, const WebURL& url, bool enableHighAccuracy) = 0;
     virtual void stopUpdating(int bridgeId) = 0;
     virtual void suspend(int bridgeId) = 0;
     virtual void resume(int bridgeId) = 0;
diff --git a/WebKit/chromium/src/GeolocationServiceBridgeChromium.cpp b/WebKit/chromium/src/GeolocationServiceBridgeChromium.cpp
index abbb9c6..69a95d7 100644
--- a/WebKit/chromium/src/GeolocationServiceBridgeChromium.cpp
+++ b/WebKit/chromium/src/GeolocationServiceBridgeChromium.cpp
@@ -117,10 +117,7 @@ bool GeolocationServiceBridgeImpl::startUpdating(PositionOptions* positionOption
 {
     if (!m_bridgeId)
         m_bridgeId = getWebViewClient()->getGeolocationService()->attachBridge(this);
-    getWebViewClient()->getGeolocationService()->startUpdating(m_bridgeId, positionOptions->enableHighAccuracy());
-    //// FIXME: this will trigger a permission request regardless.
-    //// Is it correct? confirm with andreip.
-    // positionChanged();
+    getWebViewClient()->getGeolocationService()->startUpdating(m_bridgeId, m_GeolocationServiceChromium->frame()->document()->url(), positionOptions->enableHighAccuracy());
     return true;
 }
 

-- 
WebKit Debian packaging