Changeset 233807 in webkit

Timestamp:

Jul 13, 2018 11:28:09 AM (6 years ago)

Author:

chris.reid@sony.com

Message:

[WinCairo] Add windows storage process connection implementation
​https://bugs.webkit.org/show_bug.cgi?id=187531

Reviewed by Fujii Hironori.

• NetworkProcess/NetworkProcess.cpp:
• Platform/IPC/Attachment.h:
• StorageProcess/StorageProcess.cpp:
• UIProcess/Storage/StorageProcessProxy.cpp:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (1 diff)
• Platform/IPC/Attachment.h (modified) (1 diff)
• StorageProcess/StorageProcess.cpp (modified) (1 diff)
• UIProcess/Storage/StorageProcessProxy.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-07-13  Christopher Reid  <chris.reid@sony.com>
+
+        [WinCairo] Add windows storage process connection implementation
+        https://bugs.webkit.org/show_bug.cgi?id=187531
+
+        Reviewed by Fujii Hironori.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        * Platform/IPC/Attachment.h:
+        * StorageProcess/StorageProcess.cpp:
+        * UIProcess/Storage/StorageProcessProxy.cpp:
+
 2018-07-13  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -340 +340 @@
 #elif OS(WINDOWS)
     IPC::Connection::Identifier serverIdentifier, clientIdentifier;
-    if (!IPC::Connection::createServerAndClientIdentifiers(serverIdentifier, clientIdentifier))
-        return;
+    if (!IPC::Connection::createServerAndClientIdentifiers(serverIdentifier, clientIdentifier)) {
+        LOG_ERROR("Failed to create server and client identifiers");
+        CRASH();
+    }
 
     auto connection = NetworkConnectionToWebProcess::create(serverIdentifier);

trunk/Source/WebKit/Platform/IPC/Attachment.h

@@ -83 +83 @@
     mach_msg_type_name_t disposition() const { return m_disposition; }
 #elif OS(WINDOWS)
-    HANDLE handle() { return m_handle; }
+    HANDLE handle() const { return m_handle; }
 #endif
 

trunk/Source/WebKit/StorageProcess/StorageProcess.cpp

@@ -263 +263 @@
     IPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
     parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateStorageToWebProcessConnection(clientPort), 0);
+#elif OS(WINDOWS)
+    IPC::Connection::Identifier serverIdentifier, clientIdentifier;
+    if (!IPC::Connection::createServerAndClientIdentifiers(serverIdentifier, clientIdentifier)) {
+        LOG_ERROR("Failed to create server and client identifiers");
+        CRASH();
+    }
+
+    auto connection = StorageToWebProcessConnection::create(serverIdentifier);
+    m_storageToWebProcessConnections.append(WTFMove(connection));
+
+    IPC::Attachment clientSocket(clientIdentifier);
+    parentProcessConnection()->send(Messages::StorageProcessProxy::DidCreateStorageToWebProcessConnection(clientSocket), 0);
 #else
     notImplemented();

trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp

@@ -164 +164 @@
 #elif OS(DARWIN)
         reply(IPC::Attachment(0, MACH_MSG_TYPE_MOVE_SEND));
+#elif OS(WINDOWS)
+        reply(IPC::Attachment());
 #else
         notImplemented();
@@ -196 +198 @@
 #elif OS(DARWIN)
     reply(IPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND));
+#elif OS(WINDOWS)
+    reply(connectionIdentifier.handle());
 #else
     notImplemented();