summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-03-09 13:22:16 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-09 13:22:16 -0800
commit05bdccdbcfd40b731c68ddc249d43bf9cfa08f3d (patch)
tree25a67c6fb9c1f8caacd302e0eb1b1c8cd6be4611 /WebKit
parent63e8611fe24e589a25662aa5ef011da87ad25074 (diff)
parent1d7cc17ccbeabb654e416c598e2631ff691166ca (diff)
downloadexternal_webkit-05bdccdbcfd40b731c68ddc249d43bf9cfa08f3d.zip
external_webkit-05bdccdbcfd40b731c68ddc249d43bf9cfa08f3d.tar.gz
external_webkit-05bdccdbcfd40b731c68ddc249d43bf9cfa08f3d.tar.bz2
Merge "Clear DOM storage when clearing other cached data." into honeycomb-mr1
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/jni/WebStorage.cpp7
1 files changed, 7 insertions, 0 deletions
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)