Changeset 223141 in webkit

Timestamp:

Oct 10, 2017 2:03:04 PM (7 years ago)

Author:

beidson@apple.com

Message:

Random StorageProcess and SWServer cleanup.
​https://bugs.webkit.org/show_bug.cgi?id=178141

Reviewed by Andy Estes.

-StorageProcess should own the set of SWServers
-Some renaming and cleanup

• StorageProcess/StorageProcess.cpp:

(WebKit::StorageProcess::createStorageToWebProcessConnection):
(WebKit::StorageProcess::swServerForSession):

• StorageProcess/StorageProcess.h:

(WebKit::StorageProcess::queue):

• StorageProcess/StorageToWebProcessConnection.cpp:

(WebKit::StorageToWebProcessConnection::establishSWServerConnection):

• StorageProcess/StorageToWebProcessConnection.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• StorageProcess/StorageProcess.cpp (modified) (3 diffs)
• StorageProcess/StorageProcess.h (modified) (5 diffs)
• StorageProcess/StorageToWebProcessConnection.cpp (modified) (2 diffs)
• StorageProcess/StorageToWebProcessConnection.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-10-10  Brady Eidson  <beidson@apple.com>
+
+        Random StorageProcess and SWServer cleanup.
+        https://bugs.webkit.org/show_bug.cgi?id=178141
+
+        Reviewed by Andy Estes.
+
+        -StorageProcess should own the set of SWServers
+        -Some renaming and cleanup
+
+        * StorageProcess/StorageProcess.cpp:
+        (WebKit::StorageProcess::createStorageToWebProcessConnection):
+        (WebKit::StorageProcess::swServerForSession):
+        * StorageProcess/StorageProcess.h:
+        (WebKit::StorageProcess::queue):
+
+        * StorageProcess/StorageToWebProcessConnection.cpp:
+        (WebKit::StorageToWebProcessConnection::establishSWServerConnection):
+        * StorageProcess/StorageToWebProcessConnection.h:
+
 2017-10-10  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebKit/StorageProcess/StorageProcess.cpp

@@ -165 +165 @@
 #if USE(UNIX_DOMAIN_SOCKETS)
     IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
-    m_databaseToWebProcessConnections.append(StorageToWebProcessConnection::create(socketPair.server));
+    m_storageToWebProcessConnections.append(StorageToWebProcessConnection::create(socketPair.server));
     parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateStorageToWebProcessConnection(IPC::Attachment(socketPair.client)), 0);
 #elif OS(DARWIN)
@@ -173 +173 @@
 
     // Create a listening connection.
-    m_databaseToWebProcessConnections.append(StorageToWebProcessConnection::create(IPC::Connection::Identifier(listeningPort)));
+    m_storageToWebProcessConnections.append(StorageToWebProcessConnection::create(IPC::Connection::Identifier(listeningPort)));
 
     IPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
@@ -307 +307 @@
 #endif
 
+#if ENABLE(SERVICE_WORKER)
+SWServer& StorageProcess::swServerForSession(PAL::SessionID sessionID)
+{
+    auto result = m_swServers.add(sessionID, nullptr);
+    if (result.isNewEntry)
+        result.iterator->value = std::make_unique<SWServer>();
+
+    ASSERT(result.iterator->value);
+    return *result.iterator->value;
+}
+#endif
+
 #if !PLATFORM(COCOA)
 void StorageProcess::initializeProcess(const ChildProcessInitializationParameters&)

trunk/Source/WebKit/StorageProcess/StorageProcess.h

@@ -36 +36 @@
 
 namespace WebCore {
+class SWServer;
 struct SecurityOriginData;
 }
@@ -56 +57 @@
     ~StorageProcess();
 
-#if ENABLE(INDEXED_DATABASE)
-    WebCore::IDBServer::IDBServer& idbServer(PAL::SessionID);
-#endif
-
     WorkQueue& queue() { return m_queue.get(); }
-
     void postStorageTask(CrossThreadTask&&);
 
 #if ENABLE(INDEXED_DATABASE)
+    WebCore::IDBServer::IDBServer& idbServer(PAL::SessionID);
+
     // WebCore::IDBServer::IDBBackingStoreFileHandler
     void prepareForAccessToTemporaryFile(const String& path) final;
@@ -72 +70 @@
 #if ENABLE(SANDBOX_EXTENSIONS)
     void getSandboxExtensionsForBlobFiles(const Vector<String>& filenames, WTF::Function<void (SandboxExtension::HandleArray&&)>&& completionHandler);
+#endif
+
+#if ENABLE(SERVICE_WORKER)
+    WebCore::SWServer& swServerForSession(PAL::SessionID);
 #endif
 
@@ -109 +111 @@
     void ensurePathExists(const String&);
 
-    Vector<RefPtr<StorageToWebProcessConnection>> m_databaseToWebProcessConnections;
+    Vector<RefPtr<StorageToWebProcessConnection>> m_storageToWebProcessConnections;
 
     Ref<WorkQueue> m_queue;
@@ -122 +124 @@
     Deque<CrossThreadTask> m_storageTasks;
     Lock m_storageTaskMutex;
+    
+#if ENABLE(SERVICE_WORKER)
+    HashMap<PAL::SessionID, std::unique_ptr<WebCore::SWServer>> m_swServers;
+#endif
 };
 

trunk/Source/WebKit/StorageProcess/StorageToWebProcessConnection.cpp

@@ -28 +28 @@
 
 #include "Logging.h"
+#include "StorageProcess.h"
 #include "StorageToWebProcessConnectionMessages.h"
 #include "WebIDBConnectionToClient.h"
@@ -137 +138 @@
     ASSERT(!m_swConnections.contains(serverConnectionIdentifier));
 
-    auto result = m_swServers.add(sessionID, nullptr);
-    if (result.isNewEntry)
-        result.iterator->value = std::make_unique<SWServer>();
-
-    ASSERT(result.iterator->value);
-
-    m_swConnections.set(serverConnectionIdentifier, std::make_unique<WebSWServerConnection>(*result.iterator->value, m_connection.get(), serverConnectionIdentifier, sessionID));
+    auto& server = StorageProcess::singleton().swServerForSession(sessionID);
+    m_swConnections.set(serverConnectionIdentifier, std::make_unique<WebSWServerConnection>(server, m_connection.get(), serverConnectionIdentifier, sessionID));
 }
 

trunk/Source/WebKit/StorageProcess/StorageToWebProcessConnection.h

@@ -71 +71 @@
     void establishSWServerConnection(PAL::SessionID, uint64_t& serverConnectionIdentifier);
     void removeSWServerConnection(uint64_t serverConnectionIdentifier);
-    HashMap<PAL::SessionID, std::unique_ptr<WebCore::SWServer>> m_swServers;
     HashMap<uint64_t, std::unique_ptr<WebSWServerConnection>> m_swConnections;
 #endif