Changeset 250046 in webkit

Timestamp:

Sep 18, 2019, 11:38:25 AM (6 years ago)

Author:

Chris Dumez

Message:

Stop passing sessionIDs to NetworkProcessConnection methods
​https://bugs.webkit.org/show_bug.cgi?id=201886

Reviewed by Geoffrey Garen.

Stop passing sessionIDs to NetworkProcessConnection methods. This is no longer
necessary now that we have a single session per WebProcess.

• NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::tryStoreAsCacheEntry):

• WebProcess/Databases/WebDatabaseProvider.cpp:

(WebKit::WebDatabaseProvider::idbConnectionToServerForSession):

• WebProcess/FileAPI/BlobRegistryProxy.cpp:

(WebKit::BlobRegistryProxy::writeBlobsToTemporaryFiles):

• WebProcess/Network/NetworkProcessConnection.cpp:

(WebKit::NetworkProcessConnection::writeBlobsToTemporaryFiles):
(WebKit::NetworkProcessConnection::didCacheResource):
(WebKit::NetworkProcessConnection::idbConnectionToServer):
(WebKit::NetworkProcessConnection::idbConnectionToServerForSession): Deleted.

• WebProcess/Network/NetworkProcessConnection.h:
• WebProcess/Network/NetworkProcessConnection.messages.in:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkResourceLoader.cpp (modified) (1 diff)
• WebProcess/Databases/WebDatabaseProvider.cpp (modified) (1 diff)
• WebProcess/FileAPI/BlobRegistryProxy.cpp (modified) (1 diff)
• WebProcess/Network/NetworkProcessConnection.cpp (modified) (3 diffs)
• WebProcess/Network/NetworkProcessConnection.h (modified) (3 diffs)
• WebProcess/Network/NetworkProcessConnection.messages.in (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-18  Chris Dumez  <cdumez@apple.com>
+
+        Stop passing sessionIDs to NetworkProcessConnection methods
+        https://bugs.webkit.org/show_bug.cgi?id=201886
+
+        Reviewed by Geoffrey Garen.
+
+        Stop passing sessionIDs to NetworkProcessConnection methods. This is no longer
+        necessary now that we have a single session per WebProcess.
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::tryStoreAsCacheEntry):
+        * WebProcess/Databases/WebDatabaseProvider.cpp:
+        (WebKit::WebDatabaseProvider::idbConnectionToServerForSession):
+        * WebProcess/FileAPI/BlobRegistryProxy.cpp:
+        (WebKit::BlobRegistryProxy::writeBlobsToTemporaryFiles):
+        * WebProcess/Network/NetworkProcessConnection.cpp:
+        (WebKit::NetworkProcessConnection::writeBlobsToTemporaryFiles):
+        (WebKit::NetworkProcessConnection::didCacheResource):
+        (WebKit::NetworkProcessConnection::idbConnectionToServer):
+        (WebKit::NetworkProcessConnection::idbConnectionToServerForSession): Deleted.
+        * WebProcess/Network/NetworkProcessConnection.h:
+        * WebProcess/Network/NetworkProcessConnection.messages.in:
+
 2019-09-18  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp

@@ -847 +847 @@
             return;
         LOG(NetworkCache, "(NetworkProcess) sending DidCacheResource");
-        loader->send(Messages::NetworkProcessConnection::DidCacheResource(loader->originalRequest(), mappedBody.shareableResourceHandle, loader->sessionID()));
+        loader->send(Messages::NetworkProcessConnection::DidCacheResource(loader->originalRequest(), mappedBody.shareableResourceHandle));
 #endif
     });

trunk/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp

@@ -70 +70 @@
 WebCore::IDBClient::IDBConnectionToServer& WebDatabaseProvider::idbConnectionToServerForSession(const PAL::SessionID&)
 {
-    return WebProcess::singleton().ensureNetworkProcessConnection().idbConnectionToServerForSession().coreConnectionToServer();
+    return WebProcess::singleton().ensureNetworkProcessConnection().idbConnectionToServer().coreConnectionToServer();
 }
 #endif

trunk/Source/WebKit/WebProcess/FileAPI/BlobRegistryProxy.cpp

@@ -84 +84 @@
 void BlobRegistryProxy::writeBlobsToTemporaryFiles(PAL::SessionID sessionID, const Vector<String>& blobURLs, CompletionHandler<void(Vector<String>&& filePaths)>&& completionHandler)
 {
-    WebProcess::singleton().ensureNetworkProcessConnection().writeBlobsToTemporaryFiles(sessionID, blobURLs, WTFMove(completionHandler));
+    ASSERT_UNUSED(sessionID, sessionID == WebProcess::singleton().sessionID());
+    WebProcess::singleton().ensureNetworkProcessConnection().writeBlobsToTemporaryFiles(blobURLs, WTFMove(completionHandler));
 }
 

trunk/Source/WebKit/WebProcess/Network/NetworkProcessConnection.cpp

@@ -208 +208 @@
 }
 
-void NetworkProcessConnection::writeBlobsToTemporaryFiles(PAL::SessionID, const Vector<String>& blobURLs, CompletionHandler<void(Vector<String>&& filePaths)>&& completionHandler)
+void NetworkProcessConnection::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, CompletionHandler<void(Vector<String>&& filePaths)>&& completionHandler)
 {
     WebProcess::singleton().ensureNetworkProcessConnection().connection().sendWithAsyncReply(Messages::NetworkConnectionToWebProcess::WriteBlobsToTemporaryFiles(blobURLs), WTFMove(completionHandler));
@@ -229 +229 @@
 
 #if ENABLE(SHAREABLE_RESOURCE)
-void NetworkProcessConnection::didCacheResource(const ResourceRequest& request, const ShareableResource::Handle& handle, PAL::SessionID sessionID)
-{
-    CachedResource* resource = MemoryCache::singleton().resourceForRequest(request, sessionID);
+void NetworkProcessConnection::didCacheResource(const ResourceRequest& request, const ShareableResource::Handle& handle)
+{
+    auto* resource = MemoryCache::singleton().resourceForRequest(request, WebProcess::singleton().sessionID());
     if (!resource)
         return;
@@ -246 +246 @@
 
 #if ENABLE(INDEXED_DATABASE)
-WebIDBConnectionToServer& NetworkProcessConnection::idbConnectionToServerForSession()
+WebIDBConnectionToServer& NetworkProcessConnection::idbConnectionToServer()
 {
     if (!m_webIDBConnection)

trunk/Source/WebKit/WebProcess/Network/NetworkProcessConnection.h

@@ -39 +39 @@
 }
 
-namespace PAL {
-class SessionID;
-}
-
 namespace WebCore {
 class ResourceError;
@@ -69 +65 @@
     void didReceiveNetworkProcessConnectionMessage(IPC::Connection&, IPC::Decoder&);
 
-    void writeBlobsToTemporaryFiles(PAL::SessionID, const Vector<String>& blobURLs, CompletionHandler<void(Vector<String>&& filePaths)>&&);
+    void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, CompletionHandler<void(Vector<String>&& filePaths)>&&);
 
 #if ENABLE(INDEXED_DATABASE)
     WebIDBConnectionToServer* existingIDBConnectionToServer() const { return m_webIDBConnection.get(); };
-    WebIDBConnectionToServer& idbConnectionToServerForSession();
+    WebIDBConnectionToServer& idbConnectionToServer();
 #endif
 
@@ -99 +95 @@
 #if ENABLE(SHAREABLE_RESOURCE)
     // Message handlers.
-    void didCacheResource(const WebCore::ResourceRequest&, const ShareableResource::Handle&, PAL::SessionID);
+    void didCacheResource(const WebCore::ResourceRequest&, const ShareableResource::Handle&);
 #endif
 

trunk/Source/WebKit/WebProcess/Network/NetworkProcessConnection.messages.in

@@ -24 +24 @@
 
 #if ENABLE(SHAREABLE_RESOURCE)
-    DidCacheResource(WebCore::ResourceRequest request, WebKit::ShareableResource::Handle resource, PAL::SessionID sessionID)
+    DidCacheResource(WebCore::ResourceRequest request, WebKit::ShareableResource::Handle resource)
 #endif