summaryrefslogtreecommitdiffstats
path: root/WebKit/android
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-10-05 20:53:27 +0100
committerSteve Block <steveblock@google.com>2010-10-07 11:03:33 +0100
commita485c90712dfe99674e708d289ca14c6623a41f7 (patch)
tree6cc55e0fc6aaebbf581719eedd5d275c91e135b8 /WebKit/android
parentec39fd6fb1e0ae6e61e6fcdea4197f54dda2713d (diff)
downloadexternal_webkit-a485c90712dfe99674e708d289ca14c6623a41f7.zip
external_webkit-a485c90712dfe99674e708d289ca14c6623a41f7.tar.gz
external_webkit-a485c90712dfe99674e708d289ca14c6623a41f7.tar.bz2
Merge WebKit at r68651 : Default implementation for allowScriptExtension
Just added a default implementation that always return true. http://trac.webkit.org/changeset/68061 Change-Id: I0f740ac32369580953b2fdbe071316521b9b2382
Diffstat (limited to 'WebKit/android')
-rw-r--r--WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
index 7072818..8677d35 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
@@ -197,6 +197,8 @@ namespace android {
virtual void didCreateScriptContextForFrame() { }
virtual void didDestroyScriptContextForFrame() { }
virtual void didCreateIsolatedScriptContext() { }
+
+ virtual bool allowScriptExtension(const String& extensionName, int extensionGroup) { return false; }
#endif
virtual void registerForIconNotification(bool listen = true);