diff options
| author | Steve Block <steveblock@google.com> | 2009-10-12 11:38:23 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:45:06 +0100 |
| commit | 80754947fdaad5fb6800b937f01f8d9ad53b4559 (patch) | |
| tree | 78d2b037a3f2ebc53e6974f14947e823ac056ea1 /WebKit | |
| parent | 5f26944ca7d695d502778deeef7b20565bc3fa2e (diff) | |
| download | external_webkit-80754947fdaad5fb6800b937f01f8d9ad53b4559.zip external_webkit-80754947fdaad5fb6800b937f01f8d9ad53b4559.tar.gz external_webkit-80754947fdaad5fb6800b937f01f8d9ad53b4559.tar.bz2 | |
Merge webkit.org at R49305 : Page constructor now takes a PluginHalterClient.
See http://trac.webkit.org/changeset/48748
Change-Id: I2dd80bcda65ad309fe9d3cd4d73e832d7d17467f
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 72ba964..803f1b1 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -882,7 +882,7 @@ static void CreateFrame(JNIEnv* env, jobject obj, jobject javaview, jobject jAss WebCore::DragClient* dragC = new DragClientAndroid; InspectorClientAndroid* inspectorC = new InspectorClientAndroid; // Create a new page - WebCore::Page* page = new WebCore::Page(chromeC, contextMenuC, editorC, dragC, inspectorC); + WebCore::Page* page = new WebCore::Page(chromeC, contextMenuC, editorC, dragC, inspectorC, 0); // 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); |