diff options
| author | Ben Murdoch <benm@google.com> | 2011-03-09 13:36:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-09 13:36:38 -0800 |
| commit | bc3bf9d0c1bcbb18a881f2be8a9b57b522b1fbde (patch) | |
| tree | 25a67c6fb9c1f8caacd302e0eb1b1c8cd6be4611 /WebKit/android | |
| parent | 992fbcb2e10456f2fd90fc015ad49cf19c9c7911 (diff) | |
| parent | 05bdccdbcfd40b731c68ddc249d43bf9cfa08f3d (diff) | |
| download | external_webkit-bc3bf9d0c1bcbb18a881f2be8a9b57b522b1fbde.zip external_webkit-bc3bf9d0c1bcbb18a881f2be8a9b57b522b1fbde.tar.gz external_webkit-bc3bf9d0c1bcbb18a881f2be8a9b57b522b1fbde.tar.bz2 | |
am 05bdccdb: Merge "Clear DOM storage when clearing other cached data." into honeycomb-mr1
* commit '05bdccdbcfd40b731c68ddc249d43bf9cfa08f3d':
Clear DOM storage when clearing other cached data.
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/jni/WebStorage.cpp | 7 |
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) |