Changeset 181775 in webkit

Timestamp:

Mar 19, 2015 6:37:14 PM (9 years ago)

Author:

andersca@apple.com

Message:

Add support for deleting individual cache entries
​https://bugs.webkit.org/show_bug.cgi?id=142886

Reviewed by Antti Koivisto.

• NetworkProcess/NetworkProcess.cpp:

(WebKit::fetchDiskCacheEntries):
Remove an unnecessary call to cfURLCacheOrigins().

(WebKit::clearDiskCacheEntries):
Helper function for clearing disk cache entries. This handles both the old and new cache implementations.

(WebKit::NetworkProcess::deleteWebsiteDataForOrigins):
Call clearDiskCacheEntries if needed.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-19  Anders Carlsson  <andersca@apple.com>
+
+        Add support for deleting individual cache entries
+        https://bugs.webkit.org/show_bug.cgi?id=142886
+
+        Reviewed by Antti Koivisto.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::fetchDiskCacheEntries):
+        Remove an unnecessary call to cfURLCacheOrigins().
+
+        (WebKit::clearDiskCacheEntries):
+        Helper function for clearing disk cache entries. This handles both the old and new cache implementations.
+
+        (WebKit::NetworkProcess::deleteWebsiteDataForOrigins):
+        Call clearDiskCacheEntries if needed.
+
 2015-03-19  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp

@@ -298 +298 @@
 
 #if USE(CFURLCACHE)
-    auto origins = cfURLCacheOrigins();
     for (auto& origin : cfURLCacheOrigins())
         entries.append(WebsiteData::Entry { WTF::move(origin), WebsiteDataTypeDiskCache });
@@ -367 +366 @@
 }
 
+static void clearDiskCacheEntries(const Vector<SecurityOriginData>& origins, std::function<void ()> completionHandler)
+{
+#if ENABLE(NETWORK_CACHE)
+    if (NetworkCache::singleton().isEnabled()) {
+        auto* originsToDelete = new HashSet<RefPtr<SecurityOrigin>>();
+
+        for (auto& origin : origins)
+            originsToDelete->add(origin.securityOrigin());
+
+        auto* cacheKeysToDelete = new Vector<NetworkCache::Key>;
+
+        NetworkCache::singleton().traverse([completionHandler, originsToDelete, cacheKeysToDelete](const NetworkCache::Entry *entry) {
+
+            if (entry) {
+                if (originsToDelete->contains(SecurityOrigin::create(entry->response.url())))
+                    cacheKeysToDelete->append(entry->storageEntry.key);
+                return;
+            }
+
+            delete originsToDelete;
+
+            for (auto& key : *cacheKeysToDelete)
+                NetworkCache::singleton().remove(key);
+
+            delete cacheKeysToDelete;
+
+            RunLoop::main().dispatch(completionHandler);
+            return;
+        });
+
+        return;
+    }
+#endif
+
+#if USE(CFURLCACHE)
+    auto hostNames = adoptCF(CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks));
+    for (auto& origin : origins)
+        CFArrayAppendValue(hostNames.get(), origin.host.createCFString().get());
+
+    CFShow(hostNames.get());
+    WebResourceCacheManager::clearCFURLCacheForHostNames(hostNames.get());
+#endif
+
+    RunLoop::main().dispatch(WTF::move(completionHandler));
+}
+
 void NetworkProcess::deleteWebsiteDataForOrigins(SessionID sessionID, uint64_t websiteDataTypes, const Vector<SecurityOriginData>& origins, const Vector<String>& cookieHostNames, uint64_t callbackID)
 {
@@ -380 +425 @@
     };
 
+    if ((websiteDataTypes & WebsiteDataTypeDiskCache) && !sessionID.isEphemeral()) {
+        clearDiskCacheEntries(origins, WTF::move(completionHandler));
+        return;
+    }
+
     completionHandler();
 }