2010-03-31 Marcus Bulach <bulach@chromium.org>
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 31 Mar 2010 17:47:34 +0000 (17:47 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 31 Mar 2010 17:47:34 +0000 (17:47 +0000)
        Reviewed by Jeremy Orlow.

        Implements cancelGeolocationPermissionRequestForFrame.
        Similar to requestGeolocationPermissionForFrame(), passes Geolocation* to cancelGeolocationPermissionRequestForFrame(),
        so that the embedder can identify which Geolocation object is cancelling the pending permission request.
        Calls cancelGeolocationPermissionRequestForFrame() before stopUpdating() so it better matches the startUpdating() / requestPermission() flow.
        https://bugs.webkit.org/show_bug.cgi?id=35031

        * loader/EmptyClients.h:
        (WebCore::EmptyChromeClient::cancelGeolocationPermissionRequestForFrame):
        * page/Chrome.cpp:
        (WebCore::Chrome::cancelGeolocationPermissionRequestForFrame):
        * page/Chrome.h:
        * page/ChromeClient.h:
        * page/Geolocation.cpp:
        (WebCore::Geolocation::disconnectFrame):
2010-03-31  Marcus Bulach  <bulach@chromium.org>

        Reviewed by Jeremy Orlow.

        Implements cancelGeolocationPermissionRequestForFrame.
        https://bugs.webkit.org/show_bug.cgi?id=35031

        * public/WebGeolocationService.h:
        (WebKit::WebGeolocationService::cancelPermissionRequestForFrame):
        * src/ChromeClientImpl.cpp:
        (WebKit::ChromeClientImpl::cancelGeolocationPermissionRequestForFrame):
        * src/ChromeClientImpl.h:
2010-03-31  Marcus Bulach  <bulach@chromium.org>

        Reviewed by Jeremy Orlow.

        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
        https://bugs.webkit.org/show_bug.cgi?id=35031

        * WebCoreSupport/ChromeClientGtk.cpp:
        (WebKit::ChromeClient::cancelGeolocationPermissionRequestForFrame):
        * WebCoreSupport/ChromeClientGtk.h:
2010-03-31  Marcus Bulach  <bulach@chromium.org>

        Reviewed by Jeremy Orlow.

        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
        https://bugs.webkit.org/show_bug.cgi?id=35031

        * WebCoreSupport/ChromeClientHaiku.h:
        (WebCore::ChromeClientHaiku::cancelGeolocationPermissionRequestForFrame):
2010-03-31  Marcus Bulach  <bulach@chromium.org>

        Reviewed by Jeremy Orlow.

        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
        https://bugs.webkit.org/show_bug.cgi?id=35031

        * WebCoreSupport/WebChromeClient.h:
        (WebChromeClient::cancelGeolocationPermissionRequestForFrame):
2010-03-31  Marcus Bulach  <bulach@chromium.org>

        Reviewed by Jeremy Orlow.

        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
        https://bugs.webkit.org/show_bug.cgi?id=35031

        * WebCoreSupport/ChromeClientQt.h:
        (WebCore::ChromeClientQt::cancelGeolocationPermissionRequestForFrame):
2010-03-31  Marcus Bulach  <bulach@chromium.org>

        Reviewed by Jeremy Orlow.

        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
        https://bugs.webkit.org/show_bug.cgi?id=35031

        * WebCoreSupport/WebChromeClient.h:
        (WebChromeClient::cancelGeolocationPermissionRequestForFrame):
2010-03-31  Marcus Bulach  <bulach@chromium.org>

        Reviewed by Jeremy Orlow.

        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
        https://bugs.webkit.org/show_bug.cgi?id=35031

        * WebKitSupport/ChromeClientWx.h:
        (WebCore::ChromeClientWx::cancelGeolocationPermissionRequestForFrame):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@56851 268f45cc-cd09-0410-ab3c-d52691b4dbfc

23 files changed:
WebCore/ChangeLog
WebCore/loader/EmptyClients.h
WebCore/page/Chrome.cpp
WebCore/page/Chrome.h
WebCore/page/ChromeClient.h
WebCore/page/Geolocation.cpp
WebKit/chromium/ChangeLog
WebKit/chromium/public/WebGeolocationService.h
WebKit/chromium/src/ChromeClientImpl.cpp
WebKit/chromium/src/ChromeClientImpl.h
WebKit/gtk/ChangeLog
WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
WebKit/haiku/ChangeLog
WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
WebKit/mac/ChangeLog
WebKit/mac/WebCoreSupport/WebChromeClient.h
WebKit/qt/ChangeLog
WebKit/qt/WebCoreSupport/ChromeClientQt.h
WebKit/win/ChangeLog
WebKit/win/WebCoreSupport/WebChromeClient.h
WebKit/wx/ChangeLog
WebKit/wx/WebKitSupport/ChromeClientWx.h

index 8a68678..8e26c1d 100644 (file)
@@ -1,3 +1,22 @@
+2010-03-31  Marcus Bulach  <bulach@chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Implements cancelGeolocationPermissionRequestForFrame.
+        Similar to requestGeolocationPermissionForFrame(), passes Geolocation* to cancelGeolocationPermissionRequestForFrame(),
+        so that the embedder can identify which Geolocation object is cancelling the pending permission request.
+        Calls cancelGeolocationPermissionRequestForFrame() before stopUpdating() so it better matches the startUpdating() / requestPermission() flow.
+        https://bugs.webkit.org/show_bug.cgi?id=35031
+
+        * loader/EmptyClients.h:
+        (WebCore::EmptyChromeClient::cancelGeolocationPermissionRequestForFrame):
+        * page/Chrome.cpp:
+        (WebCore::Chrome::cancelGeolocationPermissionRequestForFrame):
+        * page/Chrome.h:
+        * page/ChromeClient.h:
+        * page/Geolocation.cpp:
+        (WebCore::Geolocation::disconnectFrame):
+
 2010-03-31  Yael Aharon  <yael.aharon@nokia.com>
 
         Reviewed by Antti Koivisto.
 2010-03-31  Yael Aharon  <yael.aharon@nokia.com>
 
         Reviewed by Antti Koivisto.
index 262400d..f73e709 100644 (file)
@@ -158,7 +158,7 @@ public:
     virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {}
 
     virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*) {}
     virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {}
 
     virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*) {}
-    virtual void cancelGeolocationPermissionRequestForFrame(Frame*) {}
+    virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) {}
 
 #if USE(ACCELERATED_COMPOSITING)
     virtual void attachRootGraphicsLayer(Frame*, GraphicsLayer*) {};
 
 #if USE(ACCELERATED_COMPOSITING)
     virtual void attachRootGraphicsLayer(Frame*, GraphicsLayer*) {};
index 4174695..f428608 100644 (file)
@@ -420,9 +420,9 @@ void Chrome::requestGeolocationPermissionForFrame(Frame* frame, Geolocation* geo
     m_client->requestGeolocationPermissionForFrame(frame, geolocation);
 }
 
     m_client->requestGeolocationPermissionForFrame(frame, geolocation);
 }
 
-void Chrome::cancelGeolocationPermissionRequestForFrame(Frame* frame)
+void Chrome::cancelGeolocationPermissionRequestForFrame(Frame* frame, Geolocation* geolocation)
 {
 {
-    m_client->cancelGeolocationPermissionRequestForFrame(frame);
+    m_client->cancelGeolocationPermissionRequestForFrame(frame, geolocation);
 }
 
 void Chrome::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileChooser)
 }
 
 void Chrome::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileChooser)
index 72312bc..76b4149 100644 (file)
@@ -132,7 +132,7 @@ namespace WebCore {
         void print(Frame*);
 
         void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
         void print(Frame*);
 
         void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
-        void cancelGeolocationPermissionRequestForFrame(Frame*);
+        void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*);
 
         void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
         void chooseIconForFiles(const Vector<String>&, PassRefPtr<FileChooser>);
 
         void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
         void chooseIconForFiles(const Vector<String>&, PassRefPtr<FileChooser>);
index 34e2893..70f74c6 100644 (file)
@@ -185,7 +185,7 @@ namespace WebCore {
         // This can be either a synchronous or asynchronous call. The ChromeClient can display UI asking the user for permission
         // to use Geolocation.
         virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*) = 0;
         // This can be either a synchronous or asynchronous call. The ChromeClient can display UI asking the user for permission
         // to use Geolocation.
         virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*) = 0;
-        virtual void cancelGeolocationPermissionRequestForFrame(Frame*) = 0;
+        virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) = 0;
             
         virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) = 0;
         // Asynchronous request to load an icon for specified filenames.
             
         virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) = 0;
         // Asynchronous request to load an icon for specified filenames.
index 7dd47bb..be86966 100644 (file)
@@ -221,13 +221,11 @@ Geolocation::~Geolocation()
 
 void Geolocation::disconnectFrame()
 {
 
 void Geolocation::disconnectFrame()
 {
+    if (m_frame && m_frame->page() && m_allowGeolocation == InProgress)
+        m_frame->page()->chrome()->cancelGeolocationPermissionRequestForFrame(m_frame, this);
     stopUpdating();
     stopUpdating();
-    if (m_frame) {
-        if (m_frame->document())
-            m_frame->document()->setUsingGeolocation(false);
-        if (m_frame->page() && m_allowGeolocation == InProgress)
-            m_frame->page()->chrome()->cancelGeolocationPermissionRequestForFrame(m_frame);
-    }
+    if (m_frame && m_frame->document())
+        m_frame->document()->setUsingGeolocation(false);
     m_frame = 0;
 }
 
     m_frame = 0;
 }
 
index bb8094f..010edba 100644 (file)
@@ -1,3 +1,16 @@
+2010-03-31  Marcus Bulach  <bulach@chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Implements cancelGeolocationPermissionRequestForFrame.
+        https://bugs.webkit.org/show_bug.cgi?id=35031
+
+        * public/WebGeolocationService.h:
+        (WebKit::WebGeolocationService::cancelPermissionRequestForFrame):
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::cancelGeolocationPermissionRequestForFrame):
+        * src/ChromeClientImpl.h:
+
 2010-03-31  Pavel Feldman  <pfeldman@chromium.org>
 
         Not reviewed. Rolling out r56829 since it broke chromium layout tests.
 2010-03-31  Pavel Feldman  <pfeldman@chromium.org>
 
         Not reviewed. Rolling out r56829 since it broke chromium layout tests.
index c4e1ca5..089f723 100644 (file)
@@ -42,6 +42,7 @@ class WebURL;
 class WebGeolocationService {
 public:
     virtual void requestPermissionForFrame(int bridgeId, const WebURL& url) { }
 class WebGeolocationService {
 public:
     virtual void requestPermissionForFrame(int bridgeId, const WebURL& url) { }
+    virtual void cancelPermissionRequestForFrame(int bridgeId, const WebURL&) { }
     virtual void startUpdating(int bridgeId, const WebURL& url, bool enableHighAccuracy) { }
     virtual void stopUpdating(int bridgeId) { }
     virtual void suspend(int bridgeId) { }
     virtual void startUpdating(int bridgeId, const WebURL& url, bool enableHighAccuracy) { }
     virtual void stopUpdating(int bridgeId) { }
     virtual void suspend(int bridgeId) { }
index 37f436d..82b9f38 100644 (file)
@@ -703,10 +703,16 @@ NotificationPresenter* ChromeClientImpl::notificationPresenter() const
 
 void ChromeClientImpl::requestGeolocationPermissionForFrame(Frame* frame, Geolocation* geolocation)
 {
 
 void ChromeClientImpl::requestGeolocationPermissionForFrame(Frame* frame, Geolocation* geolocation)
 {
-    GeolocationServiceChromium* geolocationService = reinterpret_cast<GeolocationServiceChromium*>(geolocation->getGeolocationService());
+    GeolocationServiceChromium* geolocationService = static_cast<GeolocationServiceChromium*>(geolocation->getGeolocationService());
     m_webView->client()->geolocationService()->requestPermissionForFrame(geolocationService->geolocationServiceBridge()->getBridgeId(), frame->document()->url());
 }
 
     m_webView->client()->geolocationService()->requestPermissionForFrame(geolocationService->geolocationServiceBridge()->getBridgeId(), frame->document()->url());
 }
 
+void ChromeClientImpl::cancelGeolocationPermissionRequestForFrame(Frame* frame, Geolocation* geolocation)
+{
+    GeolocationServiceChromium* geolocationService = static_cast<GeolocationServiceChromium*>(geolocation->getGeolocationService());
+    m_webView->client()->geolocationService()->cancelPermissionRequestForFrame(geolocationService->geolocationServiceBridge()->getBridgeId(), frame->document()->url());
+}
+
 #if USE(ACCELERATED_COMPOSITING)
 void ChromeClientImpl::attachRootGraphicsLayer(Frame* frame, GraphicsLayer* graphicsLayer)
 {
 #if USE(ACCELERATED_COMPOSITING)
 void ChromeClientImpl::attachRootGraphicsLayer(Frame* frame, GraphicsLayer* graphicsLayer)
 {
index 72815d3..c582a76 100644 (file)
@@ -122,7 +122,7 @@ public:
     virtual WebCore::NotificationPresenter* notificationPresenter() const;
 #endif
     virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*);
     virtual WebCore::NotificationPresenter* notificationPresenter() const;
 #endif
     virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*);
-    virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*) { }
+    virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*);
     virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
     virtual void chooseIconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>);
     virtual bool setCursor(WebCore::PlatformCursorHandle) { return false; }
     virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
     virtual void chooseIconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>);
     virtual bool setCursor(WebCore::PlatformCursorHandle) { return false; }
index 23e1d9f..4039d95 100644 (file)
@@ -1,3 +1,14 @@
+2010-03-31  Marcus Bulach  <bulach@chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
+        https://bugs.webkit.org/show_bug.cgi?id=35031
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+        (WebKit::ChromeClient::cancelGeolocationPermissionRequestForFrame):
+        * WebCoreSupport/ChromeClientGtk.h:
+
 2010-03-30  Gavin Barraclough  <barraclough@apple.com>
 
         Rubber stamped by Sam Weinig.
 2010-03-30  Gavin Barraclough  <barraclough@apple.com>
 
         Rubber stamped by Sam Weinig.
index 9ee4566..2961f0b 100644 (file)
@@ -583,7 +583,7 @@ void ChromeClient::requestGeolocationPermissionForFrame(Frame* frame, Geolocatio
         webkit_geolocation_policy_deny(policyDecision);
 }
 
         webkit_geolocation_policy_deny(policyDecision);
 }
 
-void ChromeClient::cancelGeolocationPermissionRequestForFrame(WebCore::Frame* frame)
+void ChromeClient::cancelGeolocationPermissionRequestForFrame(WebCore::Frame* frame, WebCore::Geolocation*)
 {
     WebKitWebFrame* webFrame = kit(frame);
     WebKitWebView* webView = getViewFromFrame(webFrame);
 {
     WebKitWebFrame* webFrame = kit(frame);
     WebKitWebView* webView = getViewFromFrame(webFrame);
index 6d5b4d6..c6aeff7 100644 (file)
@@ -120,7 +120,7 @@ namespace WebKit {
 
         virtual void scrollRectIntoView(const WebCore::IntRect&, const WebCore::ScrollView*) const {}
         virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*);
 
         virtual void scrollRectIntoView(const WebCore::IntRect&, const WebCore::ScrollView*) const {}
         virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*);
-        virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*);
+        virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*);
 
     private:
         WebKitWebView* m_webView;
 
     private:
         WebKitWebView* m_webView;
index b72ef30..a3efae8 100644 (file)
@@ -1,3 +1,13 @@
+2010-03-31  Marcus Bulach  <bulach@chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
+        https://bugs.webkit.org/show_bug.cgi?id=35031
+
+        * WebCoreSupport/ChromeClientHaiku.h:
+        (WebCore::ChromeClientHaiku::cancelGeolocationPermissionRequestForFrame):
+
 2010-03-28  Alexey Proskuryakov  <ap@apple.com>
 
         Build fix. Include WindowsKeyboardCodes.h instead of KeyboardCodes.h.
 2010-03-28  Alexey Proskuryakov  <ap@apple.com>
 
         Build fix. Include WindowsKeyboardCodes.h instead of KeyboardCodes.h.
index 0362b2b..920555a 100644 (file)
@@ -135,7 +135,7 @@ namespace WebCore {
         // This is an asynchronous call. The ChromeClient can display UI asking the user for permission
         // to use Geolococation.
         void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
         // This is an asynchronous call. The ChromeClient can display UI asking the user for permission
         // to use Geolococation.
         void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
-        void cancelGeolocationPermissionRequestForFrame(Frame*) { }
+        void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) { }
 
         void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
         void chooseIconForFiles(const Vector<String>&, PassRefPtr<FileChooser>);
 
         void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
         void chooseIconForFiles(const Vector<String>&, PassRefPtr<FileChooser>);
index 104b0ae..b04b12c 100644 (file)
@@ -1,3 +1,13 @@
+2010-03-31  Marcus Bulach  <bulach@chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
+        https://bugs.webkit.org/show_bug.cgi?id=35031
+
+        * WebCoreSupport/WebChromeClient.h:
+        (WebChromeClient::cancelGeolocationPermissionRequestForFrame):
+
 2010-03-30  Gavin Barraclough  <barraclough@apple.com>
 
         Rubber stamped by Sam Weinig.
 2010-03-30  Gavin Barraclough  <barraclough@apple.com>
 
         Rubber stamped by Sam Weinig.
index 287e6af..1a54992 100644 (file)
@@ -163,7 +163,7 @@ public:
 #endif
 
     virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*);
 #endif
 
     virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*);
-    virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*) { }
+    virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*) { }
 
 private:
     WebView *m_webView;
 
 private:
     WebView *m_webView;
index 8c35e46..a368075 100644 (file)
@@ -1,3 +1,13 @@
+2010-03-31  Marcus Bulach  <bulach@chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
+        https://bugs.webkit.org/show_bug.cgi?id=35031
+
+        * WebCoreSupport/ChromeClientQt.h:
+        (WebCore::ChromeClientQt::cancelGeolocationPermissionRequestForFrame):
+
 2010-03-31  Antti Koivisto  <koivisto@iki.fi>
 
         Reviewed by Kenneth Rohde Christiansen.
 2010-03-31  Antti Koivisto  <koivisto@iki.fi>
 
         Reviewed by Kenneth Rohde Christiansen.
index 90ad29e..e24ccdd 100644 (file)
@@ -152,7 +152,7 @@ namespace WebCore {
         virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {}
 
         virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
         virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {}
 
         virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
-        virtual void cancelGeolocationPermissionRequestForFrame(Frame*) { }
+        virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) { }
 
 #if ENABLE(WIDGETS_10_SUPPORT)
         virtual bool isDocked();
 
 #if ENABLE(WIDGETS_10_SUPPORT)
         virtual bool isDocked();
index 0dc1c72..aa0742c 100644 (file)
@@ -1,3 +1,13 @@
+2010-03-31  Marcus Bulach  <bulach@chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
+        https://bugs.webkit.org/show_bug.cgi?id=35031
+
+        * WebCoreSupport/WebChromeClient.h:
+        (WebChromeClient::cancelGeolocationPermissionRequestForFrame):
+
 2010-03-30  Gavin Barraclough  <barraclough@apple.com>
 
         Rubber stamped by Sam Weinig.
 2010-03-30  Gavin Barraclough  <barraclough@apple.com>
 
         Rubber stamped by Sam Weinig.
index 5df4db1..eb04dae 100644 (file)
@@ -150,7 +150,7 @@ public:
     virtual void scrollRectIntoView(const WebCore::IntRect&, const WebCore::ScrollView*) const {}
 
     virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*);
     virtual void scrollRectIntoView(const WebCore::IntRect&, const WebCore::ScrollView*) const {}
 
     virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*);
-    virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*) { }
+    virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*) { }
 
 #if ENABLE(VIDEO)
     virtual bool supportsFullscreenForNode(const WebCore::Node*);
 
 #if ENABLE(VIDEO)
     virtual bool supportsFullscreenForNode(const WebCore::Node*);
index 049e6e6..2777d42 100644 (file)
@@ -1,3 +1,13 @@
+2010-03-31  Marcus Bulach  <bulach@chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Adds Geolocation param for cancelGeolocationPermissionRequestForFrame.
+        https://bugs.webkit.org/show_bug.cgi?id=35031
+
+        * WebKitSupport/ChromeClientWx.h:
+        (WebCore::ChromeClientWx::cancelGeolocationPermissionRequestForFrame):
+
 2010-03-30  Gavin Barraclough  <barraclough@apple.com>
 
         Rubber stamped by Sam Weinig.
 2010-03-30  Gavin Barraclough  <barraclough@apple.com>
 
         Rubber stamped by Sam Weinig.
index 90734e2..0733105 100644 (file)
@@ -139,7 +139,7 @@ public:
     virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {}
 
     virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
     virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {}
 
     virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
-    virtual void cancelGeolocationPermissionRequestForFrame(Frame*) { }
+    virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) { }
 
 private:
     wxWebView* m_webView;
 
 private:
     wxWebView* m_webView;