Changeset 221085 in webkit

Timestamp:

Aug 23, 2017 10:52:56 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

CacheStorageEngine readCachesFromDisk callback should return the read Caches
​https://bugs.webkit.org/show_bug.cgi?id=175882

Patch by Youenn Fablet <​youenn@apple.com> on 2017-08-23
Reviewed by Alex Christensen.

Callback of readCachesFromDisk takes now a Caches or error parameter.

• NetworkProcess/cache/CacheStorageEngine.cpp:

(WebKit::CacheStorageEngine::open):
(WebKit::CacheStorageEngine::retrieveCaches):
(WebKit::CacheStorageEngine::readCachesFromDisk):

• NetworkProcess/cache/CacheStorageEngine.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/CacheStorageEngine.cpp (modified) (4 diffs)
• NetworkProcess/cache/CacheStorageEngine.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-08-23  Youenn Fablet  <youenn@apple.com>
+
+        CacheStorageEngine readCachesFromDisk callback should return the read Caches
+        https://bugs.webkit.org/show_bug.cgi?id=175882
+
+        Reviewed by Alex Christensen.
+
+        Callback of readCachesFromDisk takes now a Caches or error parameter.
+
+        * NetworkProcess/cache/CacheStorageEngine.cpp:
+        (WebKit::CacheStorageEngine::open):
+        (WebKit::CacheStorageEngine::retrieveCaches):
+        (WebKit::CacheStorageEngine::readCachesFromDisk):
+        * NetworkProcess/cache/CacheStorageEngine.h:
+
 2017-08-23  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp

@@ -65 +65 @@
 void CacheStorageEngine::open(const String& origin, const String& cacheName, CacheIdentifierCallback&& callback)
 {
-    readCachesFromDisk([this, origin, cacheName, callback = WTFMove(callback)](std::optional<Error>&& error) mutable {
-        if (error) {
-            callback(makeUnexpected(error.value()));
-            return;
-        }
-
-        auto& caches = m_caches.ensure(origin, [] {
-            return Vector<Cache>();
-        }).iterator->value;
+    readCachesFromDisk(origin, [this, cacheName, callback = WTFMove(callback)](CachesOrError&& cachesOrError) mutable {
+        if (!cachesOrError.hasValue()) {
+            callback(makeUnexpected(cachesOrError.error()));
+            return;
+        }
+
+        auto& caches = cachesOrError.value().get();
 
         auto position = caches.findMatching([&](const auto& item) { return item.name == cacheName; });
@@ -119 +117 @@
 void CacheStorageEngine::retrieveCaches(const String& origin, CacheInfosCallback&& callback)
 {
-    readCachesFromDisk([this, origin, callback = WTFMove(callback)](std::optional<Error>&& error) mutable {
-        if (error) {
-            callback(makeUnexpected(error.value()));
-            return;
-        }
-        callback(caches(origin));
+    readCachesFromDisk(origin, [this, callback = WTFMove(callback)](CachesOrError&& cachesOrError) mutable {
+        if (!cachesOrError.hasValue()) {
+            callback(makeUnexpected(cachesOrError.error()));
+            return;
+        }
+
+        auto& caches = cachesOrError.value().get();
+
+        Vector<WebCore::CacheStorageConnection::CacheInfo> cachesInfo;
+        cachesInfo.reserveInitialCapacity(caches.size());
+        for (auto& cache : caches)
+            cachesInfo.uncheckedAppend(WebCore::CacheStorageConnection::CacheInfo { cache.identifier, cache.name});
+
+        callback(WTFMove(cachesInfo));
     });
 }
@@ -231 +237 @@
 }
 
-void CacheStorageEngine::readCachesFromDisk(CompletionCallback&& callback)
+void CacheStorageEngine::readCachesFromDisk(const String& origin, CachesCallback&& callback)
 {
     // FIXME: Implement reading.
-    callback(std::nullopt);
+
+    auto& caches = m_caches.ensure(origin, [] {
+        return Vector<Cache>();
+    }).iterator->value;
+
+    callback(std::reference_wrapper<Vector<Cache>> { caches });
 }
 
@@ -278 +289 @@
 }
 
-Vector<WebCore::CacheStorageConnection::CacheInfo> CacheStorageEngine::caches(const String& origin) const
-{
-    auto iterator = m_caches.find(origin);
-    if (iterator == m_caches.end())
-        return { };
-
-    Vector<WebCore::CacheStorageConnection::CacheInfo> cachesInfo;
-    cachesInfo.reserveInitialCapacity(iterator->value.size());
-    for (auto& cache : iterator->value)
-        cachesInfo.uncheckedAppend(WebCore::CacheStorageConnection::CacheInfo { cache.identifier, cache.name});
-
-    return cachesInfo;
-}
-
 Vector<uint64_t> CacheStorageEngine::queryCache(const Vector<Record>& records, const WebCore::ResourceRequest& request, const WebCore::CacheQueryOptions& options)
 {

trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.h

@@ -80 +80 @@
     static CacheStorageEngine& defaultEngine();
 
-    void writeCachesToDisk(CompletionCallback&&);
-    void readCachesFromDisk(CompletionCallback&&);
-
     struct Cache {
         uint64_t identifier;
@@ -90 +87 @@
     };
 
+    void writeCachesToDisk(CompletionCallback&&);
+
+    using CachesOrError = Expected<std::reference_wrapper<Vector<Cache>>, Error>;
+    using CachesCallback = Function<void(CachesOrError&&)>;
+    void readCachesFromDisk(const String& origin, Function<void(CachesOrError&&)>&&);
+
     using CacheOrError = Expected<std::reference_wrapper<Cache>, Error>;
     using CacheCallback = Function<void(CacheOrError&&)>;
-
-    Vector<WebCore::CacheStorageConnection::CacheInfo> caches(const String& origin) const;
 
     void readCache(uint64_t cacheIdentifier, CacheCallback&&);