diff options
| author | Steve Block <steveblock@google.com> | 2010-04-29 14:47:46 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:13 +0100 |
| commit | 937c3ffe48bb0798ca15e3db31ece787450bcd4d (patch) | |
| tree | a35a0b5129467f9efa6f2bf5f90a90f241253c88 /WebKit/android | |
| parent | 0720887e9440684b224887da8e42442b7059f5b7 (diff) | |
| download | external_webkit-937c3ffe48bb0798ca15e3db31ece787450bcd4d.zip external_webkit-937c3ffe48bb0798ca15e3db31ece787450bcd4d.tar.gz external_webkit-937c3ffe48bb0798ca15e3db31ece787450bcd4d.tar.bz2 | |
Merge webkit.org at r58033 : ChromeClient::cancelGeolocationPermissionRequestForFrame() now takes a Geolocation parameter
Change-Id: I26acb60fc15511968f81628c44c29670d8324cc7
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp index d13a006..c9ddf6f 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp @@ -461,7 +461,7 @@ void ChromeClientAndroid::requestGeolocationPermissionForFrame(Frame* frame, Geo m_geolocationPermissions->queryPermissionState(frame); } -void ChromeClientAndroid::cancelGeolocationPermissionRequestForFrame(Frame* frame) +void ChromeClientAndroid::cancelGeolocationPermissionRequestForFrame(Frame* frame, WebCore::Geolocation*) { if (m_geolocationPermissions) m_geolocationPermissions->cancelPermissionStateQuery(frame); diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h index 0e4d5c9..210bef8 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h @@ -143,7 +143,7 @@ namespace android { // Methods used to request and provide Geolocation permissions. virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*); - virtual void cancelGeolocationPermissionRequestForFrame(Frame*); + virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*); // Android-specific void provideGeolocationPermissions(const String &origin, bool allow, bool remember); void storeGeolocationPermissions(); |