summaryrefslogtreecommitdiffstats
path: root/WebKit/android/WebCoreSupport
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-02-23 14:59:58 +0000
committerSteve Block <steveblock@google.com>2010-02-23 15:06:05 +0000
commit234ad679c5705a581292e45349c33513bbaa526a (patch)
treef467a09fa34f240a75f081915583fa9b0f44259b /WebKit/android/WebCoreSupport
parent41084a8fbaa3b6914ecfb085be8a9f32bebfb55b (diff)
downloadexternal_webkit-234ad679c5705a581292e45349c33513bbaa526a.zip
external_webkit-234ad679c5705a581292e45349c33513bbaa526a.tar.gz
external_webkit-234ad679c5705a581292e45349c33513bbaa526a.tar.bz2
Cherry-pick WebKit change 55136 to add a means to cancel an ongoing Geolocation permission request
This is part of the change required to fix a Geolocation permissions bug. See https://android-git.corp.google.com/g/#change,40601 Note that We take only the WebCore component of the change, but additional changes are required to ChromeClientAndroid. See http://trac.webkit.org/changeset/55136 Change-Id: Iff0eab3adc3e41876df7f114c0d50243d015664f
Diffstat (limited to 'WebKit/android/WebCoreSupport')
-rw-r--r--WebKit/android/WebCoreSupport/ChromeClientAndroid.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
index e75393b..15473ca 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
@@ -143,6 +143,7 @@ namespace android {
// Methods used to request and provide Geolocation permissions.
virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
+ virtual void cancelGeolocationPermissionRequestForFrame(Frame*) { }
// Android-specific
void provideGeolocationPermissions(const String &origin, bool allow, bool remember);
void storeGeolocationPermissions();