diff options
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 3 | ||||
| -rw-r--r-- | WebKit/android/jni/WebStorage.cpp | 7 |
2 files changed, 7 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"); diff --git a/WebKit/android/jni/WebStorage.cpp b/WebKit/android/jni/WebStorage.cpp index ebe840b..ca3ccc6 100644 --- a/WebKit/android/jni/WebStorage.cpp +++ b/WebKit/android/jni/WebStorage.cpp @@ -29,6 +29,7 @@ #include "JavaSharedClient.h" #include "KURL.h" +#include "PageGroup.h" #include "WebCoreJni.h" #include <JNIHelp.h> @@ -137,6 +138,12 @@ static void DeleteAllData(JNIEnv* env, jobject obj) int size = manifestUrls.size(); for (int i = 0; i < size; ++i) WebCore::cacheStorage().deleteCacheGroup(manifestUrls[i]); + + // FIXME: this is a workaround for eliminating any DOM Storage data (both + // session and local storage) as there is no functionality inside WebKit at the + // moment to do it. That functionality is a WIP in https://bugs.webkit.org/show_bug.cgi?id=51878 + // and when that patch lands and we merge it, we should move towards that approach instead. + WebCore::PageGroup::clearDomStorage(); } static void SetAppCacheMaximumSize(JNIEnv* env, jobject obj, unsigned long long size) |