diff options
| author | Selim Gurun <sgurun@google.com> | 2012-07-10 12:10:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-10 12:10:35 -0700 |
| commit | c8f13359d284e1ae6185f8a2e025b17bc40d38ab (patch) | |
| tree | 7e8e7e6169f485cfac217b5a8f7cd8c49beacc8d /Source/WebKit | |
| parent | a09e21bb9545f8ccd1598eb38b43a1179c7d54e2 (diff) | |
| parent | 10f87e2741ddcfef1e87580671bfb750fd64199c (diff) | |
| download | external_webkit-c8f13359d284e1ae6185f8a2e025b17bc40d38ab.zip external_webkit-c8f13359d284e1ae6185f8a2e025b17bc40d38ab.tar.gz external_webkit-c8f13359d284e1ae6185f8a2e025b17bc40d38ab.tar.bz2 | |
Merge "Clean appcache properly on deleteAllData()"
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/android/jni/WebStorage.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Source/WebKit/android/jni/WebStorage.cpp b/Source/WebKit/android/jni/WebStorage.cpp index 66a3517..0cfe414 100644 --- a/Source/WebKit/android/jni/WebStorage.cpp +++ b/Source/WebKit/android/jni/WebStorage.cpp @@ -130,14 +130,10 @@ static void DeleteOrigin(JNIEnv* env, jobject obj, jstring origin) static void DeleteAllData(JNIEnv* env, jobject obj) { + // delete WebSQL database WebCore::DatabaseTracker::tracker().deleteAllDatabases(); - - Vector<WebCore::KURL> manifestUrls; - if (!WebCore::cacheStorage().manifestURLs(&manifestUrls)) - return; - int size = manifestUrls.size(); - for (int i = 0; i < size; ++i) - WebCore::cacheStorage().deleteCacheGroup(manifestUrls[i]); + // delete AppCache + WebCore::cacheStorage().deleteAllEntries(); // 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 |