Changeset 197180 in webkit

Timestamp:

Feb 26, 2016, 10:44:17 AM (11 years ago)

Author:

andersca@apple.com

Message:

Cache::traverse should pass the record info to its traversal handler
​https://bugs.webkit.org/show_bug.cgi?id=154695

Reviewed by Antti Koivisto.

• NetworkProcess/NetworkProcess.cpp:

(WebKit::fetchDiskCacheEntries):
(WebKit::clearDiskCacheEntries):

• NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::Cache::traverse):

• NetworkProcess/cache/NetworkCache.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (3 diffs)
• NetworkProcess/cache/NetworkCache.cpp (modified) (2 diffs)
• NetworkProcess/cache/NetworkCache.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-02-25  Anders Carlsson  <andersca@apple.com>
+
+        Cache::traverse should pass the record info to its traversal handler
+        https://bugs.webkit.org/show_bug.cgi?id=154695
+
+        Reviewed by Antti Koivisto.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::fetchDiskCacheEntries):
+        (WebKit::clearDiskCacheEntries):
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::Cache::traverse):
+        * NetworkProcess/cache/NetworkCache.h:
+
 2016-02-25  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp

@@ -286 +286 @@
         auto* origins = new HashSet<RefPtr<SecurityOrigin>>();
 
-        NetworkCache::singleton().traverse([completionHandler, origins](const NetworkCache::Entry *entry) {
-            if (!entry) {
+        NetworkCache::singleton().traverse([completionHandler, origins](const NetworkCache::Cache::TraversalEntry *traversalEntry) {
+            if (!traversalEntry) {
                 Vector<WebsiteData::Entry> entries;
 
@@ -302 +302 @@
             }
 
-            origins->add(SecurityOrigin::create(entry->response().url()));
+            origins->add(SecurityOrigin::create(traversalEntry->entry.response().url()));
         });
 
@@ -398 +398 @@
         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->key());
+        NetworkCache::singleton().traverse([completionHandler, originsToDelete, cacheKeysToDelete](const NetworkCache::Cache::TraversalEntry *traversalEntry) {
+
+            if (traversalEntry) {
+                if (originsToDelete->contains(SecurityOrigin::create(traversalEntry->entry.response().url())))
+                    cacheKeysToDelete->append(traversalEntry->entry.key());
                 return;
             }

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp

@@ -521 +521 @@
 }
 
-void Cache::traverse(std::function<void (const Entry*)>&& traverseHandler)
+void Cache::traverse(const std::function<void (const TraversalEntry*)>& traverseHandler)
 {
     ASSERT(isEnabled());
 
-    m_storage->traverse(resourceType(), 0, [traverseHandler](const Storage::Record* record, const Storage::RecordInfo&) {
+    m_storage->traverse(resourceType(), 0, [traverseHandler](const Storage::Record* record, const Storage::RecordInfo& recordInfo) {
         if (!record) {
             traverseHandler(nullptr);
@@ -535 +535 @@
             return;
 
-        traverseHandler(entry.get());
+        TraversalEntry traversalEntry { *entry, recordInfo };
+        traverseHandler(&traversalEntry);
     });
 }

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h

@@ -109 +109 @@
     std::unique_ptr<Entry> update(const WebCore::ResourceRequest&, const GlobalFrameID&, const Entry&, const WebCore::ResourceResponse& validatingResponse);
 
-    void traverse(std::function<void (const Entry*)>&&);
+    struct TraversalEntry {
+        const Entry& entry;
+        const Storage::RecordInfo& recordInfo;
+    };
+    void traverse(const std::function<void (const TraversalEntry*)>&);
     void remove(const Key&);
     void remove(const WebCore::ResourceRequest&);