diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-06 18:37:26 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-09-11 12:08:59 +0100 |
| commit | cde10b3801d3eb42f7c2e5cec01709fac6f0fff4 (patch) | |
| tree | 4cc4971652c3156044a590e0c614293b74895b8e /WebKit/android/jni/WebCoreFrameBridge.cpp | |
| parent | 3109582109d8e9c2a93e6b686f621edf9378f327 (diff) | |
| download | external_webkit-cde10b3801d3eb42f7c2e5cec01709fac6f0fff4.zip external_webkit-cde10b3801d3eb42f7c2e5cec01709fac6f0fff4.tar.gz external_webkit-cde10b3801d3eb42f7c2e5cec01709fac6f0fff4.tar.bz2 | |
Merge Webkit at r66666 : Renamed function in Settings.h
Webkit CL:
http://trac.webkit.org/changeset/66247/trunk/WebCore/page/Settings.h
Change-Id: Ied8f51db04683ddc51e6c2f5179928be2285f7fc
Diffstat (limited to 'WebKit/android/jni/WebCoreFrameBridge.cpp')
| -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 d4d3bfe..a717301 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -922,7 +922,7 @@ static void CreateFrame(JNIEnv* env, jobject obj, jobject javaview, jobject jAss // 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); + page->settings()->setEnforceCSSMIMETypeInNoQuirksMode(false); editorC->setPage(page); page->setGroupName("android.webkit"); |