From 80754947fdaad5fb6800b937f01f8d9ad53b4559 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Mon, 12 Oct 2009 11:38:23 +0100 Subject: [PATCH] Merge webkit.org at R49305 : Page constructor now takes a PluginHalterClient. See http://trac.webkit.org/changeset/48748 Change-Id: I2dd80bcda65ad309fe9d3cd4d73e832d7d17467f --- WebKit/android/jni/WebCoreFrameBridge.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 72ba964f9..803f1b1a9 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); -- 2.11.0