Title: [199992] releases/WebKitGTK/webkit-2.12/Source/WebKit2
- Revision
- 199992
- Author
- [email protected]
- Date
- 2016-04-25 04:57:32 -0700 (Mon, 25 Apr 2016)
Log Message
Merge r199204 - Clearing the application cache doesn't work.
https://bugs.webkit.org/show_bug.cgi?id=156354
rdar://problem/22369239
Patch by Jeremy Jones <[email protected]> on 2016-04-07
Reviewed by Brady Eidson.
Use the correct "ApplicationCache" directory.
Delete the caches, not just the entries.
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::fetchData):
(WebKit::WebsiteDataStore::removeData):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog (199991 => 199992)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-04-25 11:21:44 UTC (rev 199991)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-04-25 11:57:32 UTC (rev 199992)
@@ -1,3 +1,18 @@
+2016-04-07 Jeremy Jones <[email protected]>
+
+ Clearing the application cache doesn't work.
+ https://bugs.webkit.org/show_bug.cgi?id=156354
+ rdar://problem/22369239
+
+ Reviewed by Brady Eidson.
+
+ Use the correct "ApplicationCache" directory.
+ Delete the caches, not just the entries.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::fetchData):
+ (WebKit::WebsiteDataStore::removeData):
+
2016-04-14 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.12.1 release.
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (199991 => 199992)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2016-04-25 11:21:44 UTC (rev 199991)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2016-04-25 11:57:32 UTC (rev 199992)
@@ -321,7 +321,7 @@
callbackAggregator->addPendingCallback();
m_queue->dispatch([applicationCacheDirectory, callbackAggregator] {
- auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), "Files");
+ auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), "ApplicationCache");
HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
storage->getOriginsWithCache(origins);
@@ -579,9 +579,9 @@
callbackAggregator->addPendingCallback();
m_queue->dispatch([applicationCacheDirectory, callbackAggregator] {
- auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), "Files");
+ auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), "ApplicationCache");
- storage->deleteAllEntries();
+ storage->deleteAllCaches();
WTF::RunLoop::main().dispatch([callbackAggregator] {
callbackAggregator->removePendingCallback();
@@ -818,7 +818,7 @@
callbackAggregator->addPendingCallback();
m_queue->dispatch([origins, applicationCacheDirectory, callbackAggregator] {
- auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), "Files");
+ auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), "ApplicationCache");
for (const auto& origin : origins)
storage->deleteCacheForOrigin(*origin);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
