diff options
| author | Ben Murdoch <benm@google.com> | 2011-03-09 14:05:01 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-09 14:05:01 -0800 |
| commit | 760a71b5d52f2022e8d514cf41c3f477d3a120ea (patch) | |
| tree | f697599f9c493a6e35ab9ec0e67e49df8959a534 /WebKit | |
| parent | f624288562e82a22cd0b2bd4b38327a663ff05a9 (diff) | |
| parent | bc3bf9d0c1bcbb18a881f2be8a9b57b522b1fbde (diff) | |
| download | external_webkit-760a71b5d52f2022e8d514cf41c3f477d3a120ea.zip external_webkit-760a71b5d52f2022e8d514cf41c3f477d3a120ea.tar.gz external_webkit-760a71b5d52f2022e8d514cf41c3f477d3a120ea.tar.bz2 | |
am bc3bf9d0: am 05bdccdb: Merge "Clear DOM storage when clearing other cached data." into honeycomb-mr1
* commit 'bc3bf9d0c1bcbb18a881f2be8a9b57b522b1fbde':
Clear DOM storage when clearing other cached data.
Diffstat (limited to 'WebKit')
| -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) |