summaryrefslogtreecommitdiffstats
path: root/WebKit/android
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2011-03-09 13:05:53 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-09 13:05:53 -0800
commit63e8611fe24e589a25662aa5ef011da87ad25074 (patch)
tree75acfbbdaf96ee7e144dfb35d7dee7a8d37e46d7 /WebKit/android
parent615fcf00641400b4851396f3ac5525818c4aa33a (diff)
parent321983031d50f2ac20b1cd7beb28eaa206139e1a (diff)
downloadexternal_webkit-63e8611fe24e589a25662aa5ef011da87ad25074.zip
external_webkit-63e8611fe24e589a25662aa5ef011da87ad25074.tar.gz
external_webkit-63e8611fe24e589a25662aa5ef011da87ad25074.tar.bz2
Merge "remove restriction on CSS Mimetype" into honeycomb-mr1
Diffstat (limited to 'WebKit/android')
-rw-r--r--WebKit/android/jni/WebCoreFrameBridge.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 6683fb2..49eac3c 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1206,9 +1206,6 @@ static void CreateFrame(JNIEnv* env, jobject obj, jobject javaview, jobject jAss
pageClients.deviceOrientationClient = deviceOrientationC;
WebCore::Page* page = new WebCore::Page(pageClients);
- // css files without explicit MIMETYPE is treated as generic text files in
- // the Java side. So we can't enforce CSS MIMETYPE.
- page->settings()->setEnforceCSSMIMETypeInNoQuirksMode(false);
editorC->setPage(page);
page->setGroupName("android.webkit");