diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-07-15 13:12:51 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-07-20 16:57:23 +0100 |
| commit | 5f0038a5bfeb3edb460ed06dbabbdd1969d81037 (patch) | |
| tree | ea2b928a6cebbf5df54331053198a095bc87de7e /WebKit/android | |
| parent | 437eb84238c98f59ef5768ee86ee27c160416c4c (diff) | |
| download | external_webkit-5f0038a5bfeb3edb460ed06dbabbdd1969d81037.zip external_webkit-5f0038a5bfeb3edb460ed06dbabbdd1969d81037.tar.gz external_webkit-5f0038a5bfeb3edb460ed06dbabbdd1969d81037.tar.bz2 | |
Merge WebKit at r63173 : Following @62607 Page takes a BackForwardClient
Change-Id: I1c86a2881f5bef152f1b9841d6dce41da91b03ac
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 3 | ||||
| -rw-r--r-- | WebKit/android/jni/WebCoreJniOnLoad.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index f57a94f..33fafb5 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -888,7 +888,8 @@ static void CreateFrame(JNIEnv* env, jobject obj, jobject javaview, jobject jAss inspectorC, 0, // PluginHalterClient 0, // GeolocationControllerClient - 0); // DeviceOrientationClient + 0, // DeviceOrientationClient + 0); // BackForwardClient // css files without explicit MIMETYPE is treated as generic text files in // the Java side. So we can't enforce CSS MIMETYPE. page->settings()->setEnforceCSSMIMETypeInStrictMode(false); diff --git a/WebKit/android/jni/WebCoreJniOnLoad.cpp b/WebKit/android/jni/WebCoreJniOnLoad.cpp index 1a3c676..396d97e 100644 --- a/WebKit/android/jni/WebCoreJniOnLoad.cpp +++ b/WebKit/android/jni/WebCoreJniOnLoad.cpp @@ -195,7 +195,8 @@ EXPORT void benchmark(const char* url, int reloadCount, int width, int height) { new InspectorClientAndroid, 0, // PluginHalterClient 0, // GeolocationControllerClient - 0); // DeviceOrientationClient + 0, // DeviceOrientationClient + 0); // BackForwardClient editor->setPage(page); // Create MyWebFrame that intercepts network requests |