Changeset 245670 in webkit

Timestamp:

May 22, 2019, 7:17:52 PM (7 years ago)

Author:

youenn@apple.com

Message:

Use modern async IPC for EngineRepresentationCompleted and ClearMemoryRepresentationCompleted
​https://bugs.webkit.org/show_bug.cgi?id=198134

Reviewed by Alex Christensen.

• NetworkProcess/cache/CacheStorageEngineConnection.cpp:

(WebKit::CacheStorageEngineConnection::clearMemoryRepresentation):
(WebKit::CacheStorageEngineConnection::engineRepresentation):

• NetworkProcess/cache/CacheStorageEngineConnection.h:
• NetworkProcess/cache/CacheStorageEngineConnection.messages.in:
• WebProcess/Cache/WebCacheStorageConnection.cpp:

(WebKit::WebCacheStorageConnection::clearMemoryRepresentation):
(WebKit::WebCacheStorageConnection::engineRepresentation):
(WebKit::WebCacheStorageConnection::clearMemoryRepresentationCompleted): Deleted.
(WebKit::WebCacheStorageConnection::engineRepresentationCompleted): Deleted.

• WebProcess/Cache/WebCacheStorageConnection.h:
• WebProcess/Cache/WebCacheStorageConnection.messages.in:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/CacheStorageEngineConnection.cpp (modified) (1 diff)
• NetworkProcess/cache/CacheStorageEngineConnection.h (modified) (1 diff)
• NetworkProcess/cache/CacheStorageEngineConnection.messages.in (modified) (1 diff)
• WebProcess/Cache/WebCacheStorageConnection.cpp (modified) (1 diff)
• WebProcess/Cache/WebCacheStorageConnection.h (modified) (1 diff)
• WebProcess/Cache/WebCacheStorageConnection.messages.in (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-22  Youenn Fablet  <youenn@apple.com>
+
+        Use modern async IPC for EngineRepresentationCompleted and ClearMemoryRepresentationCompleted
+        https://bugs.webkit.org/show_bug.cgi?id=198134
+
+        Reviewed by Alex Christensen.
+
+        * NetworkProcess/cache/CacheStorageEngineConnection.cpp:
+        (WebKit::CacheStorageEngineConnection::clearMemoryRepresentation):
+        (WebKit::CacheStorageEngineConnection::engineRepresentation):
+        * NetworkProcess/cache/CacheStorageEngineConnection.h:
+        * NetworkProcess/cache/CacheStorageEngineConnection.messages.in:
+        * WebProcess/Cache/WebCacheStorageConnection.cpp:
+        (WebKit::WebCacheStorageConnection::clearMemoryRepresentation):
+        (WebKit::WebCacheStorageConnection::engineRepresentation):
+        (WebKit::WebCacheStorageConnection::clearMemoryRepresentationCompleted): Deleted.
+        (WebKit::WebCacheStorageConnection::engineRepresentationCompleted): Deleted.
+        * WebProcess/Cache/WebCacheStorageConnection.h:
+        * WebProcess/Cache/WebCacheStorageConnection.messages.in:
+
 2019-05-22  Ryosuke Niwa  <rniwa@webkit.org>
 

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

@@ -150 +150 @@
 }
 
-void CacheStorageEngineConnection::clearMemoryRepresentation(PAL::SessionID sessionID, uint64_t requestIdentifier, WebCore::ClientOrigin&& origin)
+void CacheStorageEngineConnection::clearMemoryRepresentation(PAL::SessionID sessionID, WebCore::ClientOrigin&& origin, CompletionHandler<void(Optional<Error>&&)>&& completionHandler)
 {
-    Engine::clearMemoryRepresentation(m_connection.networkProcess(), sessionID, WTFMove(origin), [connection = makeRef(m_connection.connection()), sessionID, requestIdentifier] (Optional<Error>&& error) {
-        connection->send(Messages::WebCacheStorageConnection::ClearMemoryRepresentationCompleted(requestIdentifier, error), sessionID.sessionID());
-    });
+    Engine::clearMemoryRepresentation(m_connection.networkProcess(), sessionID, WTFMove(origin), WTFMove(completionHandler));
 }
 
-void CacheStorageEngineConnection::engineRepresentation(PAL::SessionID sessionID, uint64_t requestIdentifier)
+void CacheStorageEngineConnection::engineRepresentation(PAL::SessionID sessionID , CompletionHandler<void(String&&)>&& completionHandler)
 {
-    Engine::representation(m_connection.networkProcess(), sessionID, [connection = makeRef(m_connection.connection()), sessionID, requestIdentifier] (auto&& representation) {
-        connection->send(Messages::WebCacheStorageConnection::EngineRepresentationCompleted { requestIdentifier, representation }, sessionID.sessionID());
-    });
+    Engine::representation(m_connection.networkProcess(), sessionID, WTFMove(completionHandler));
 }
 

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

@@ -62 +62 @@
     void dereference(PAL::SessionID, uint64_t cacheIdentifier);
 
-    void clearMemoryRepresentation(PAL::SessionID, uint64_t requestIdentifier, WebCore::ClientOrigin&&);
-    void engineRepresentation(PAL::SessionID, uint64_t requestIdentifier);
+    void clearMemoryRepresentation(PAL::SessionID, WebCore::ClientOrigin&&, CompletionHandler<void(Optional<WebCore::DOMCacheEngine::Error>&&)>&&);
+    void engineRepresentation(PAL::SessionID, CompletionHandler<void(String&&)>&&);
 
     NetworkConnectionToWebProcess& m_connection;

trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngineConnection.messages.in

@@ -29 +29 @@
     Caches(PAL::SessionID sessionID, uint64_t requestIdentifier, struct WebCore::ClientOrigin origin, uint64_t updateCounter);
 
-    ClearMemoryRepresentation(PAL::SessionID sessionID, uint64_t requestIdentifier, struct WebCore::ClientOrigin origin);
-    EngineRepresentation(PAL::SessionID sessionID, uint64_t requestIdentifier);
+    ClearMemoryRepresentation(PAL::SessionID sessionID, struct WebCore::ClientOrigin origin) -> (Optional<WebCore::DOMCacheEngine::Error> error) Async
+    EngineRepresentation(PAL::SessionID sessionID) -> (String representation) Async
 
     RetrieveRecords(PAL::SessionID sessionID, uint64_t requestIdentifier, uint64_t cacheIdentifier, URL url);

trunk/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp

@@ -129 +129 @@
 void WebCacheStorageConnection::clearMemoryRepresentation(const WebCore::ClientOrigin& origin, CompletionCallback&& callback)
 {
-    uint64_t requestIdentifier = ++m_engineRepresentationNextIdentifier;
-    m_clearRepresentationCallbacks.set(requestIdentifier, WTFMove(callback));
-    connection().send(Messages::CacheStorageEngineConnection::ClearMemoryRepresentation(m_sessionID, requestIdentifier, origin), 0);
-}
-
-void WebCacheStorageConnection::clearMemoryRepresentationCompleted(uint64_t requestIdentifier, Optional<Error>&& result)
-{
-    if (auto callback = m_clearRepresentationCallbacks.take(requestIdentifier))
-        callback(WTFMove(result));
+    connection().sendWithAsyncReply(Messages::CacheStorageEngineConnection::ClearMemoryRepresentation { m_sessionID, origin }, WTFMove(callback));
 }
 
 void WebCacheStorageConnection::engineRepresentation(WTF::Function<void(const String&)>&& callback)
 {
-    uint64_t requestIdentifier = ++m_engineRepresentationNextIdentifier;
-    m_engineRepresentationCallbacks.set(requestIdentifier, WTFMove(callback));
-    connection().send(Messages::CacheStorageEngineConnection::EngineRepresentation(m_sessionID, requestIdentifier), 0);
-}
-
-void WebCacheStorageConnection::engineRepresentationCompleted(uint64_t requestIdentifier, const String& result)
-{
-    if (auto callback = m_engineRepresentationCallbacks.take(requestIdentifier))
-        callback(result);
+    connection().sendWithAsyncReply(Messages::CacheStorageEngineConnection::EngineRepresentation { m_sessionID }, WTFMove(callback));
 }
 

trunk/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.h

@@ -76 +76 @@
     void putRecordsCompleted(uint64_t requestIdentifier, WebCore::DOMCacheEngine::RecordIdentifiersOrError&&);
 
-    void engineRepresentationCompleted(uint64_t requestIdentifier, const String& representation);
-    void clearMemoryRepresentationCompleted(uint64_t requestIdentifier, Optional<WebCore::DOMCacheEngine::Error>&&);
-
     WebCacheStorageProvider& m_provider;
     PAL::SessionID m_sessionID;
-    uint64_t m_engineRepresentationNextIdentifier { 0 };
-    HashMap<uint64_t, WTF::Function<void(const String&)>> m_engineRepresentationCallbacks;
-    HashMap<uint64_t, WebCore::DOMCacheEngine::CompletionCallback> m_clearRepresentationCallbacks;
 };
 

trunk/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.messages.in

@@ -29 +29 @@
     DeleteRecordsCompleted(uint64_t requestIdentifier, WebCore::DOMCacheEngine::RecordIdentifiersOrError result);
     PutRecordsCompleted(uint64_t requestIdentifier, WebCore::DOMCacheEngine::RecordIdentifiersOrError result);
-
-    EngineRepresentationCompleted(uint64_t requestIdentifier, String representation);
-    ClearMemoryRepresentationCompleted(uint64_t requestIdentifier, Optional<WebCore::DOMCacheEngine::Error> error);
 }