Import WebKit commit 3ca7a25a550e473d60bbbe321475c6c0ef114b31

Change-Id: I480668a0cb8114dccf7a1195190a993282875759
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 9 insertions, 1 deletions

diff --git a/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp b/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp
index e267130e8..dbd85b631 100644
--- a/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp
+++ b/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp
@@ -175,6 +175,14 @@ void DatabaseProcess::createDatabaseToWebProcessConnection()
     IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
     m_databaseToWebProcessConnections.append(DatabaseToWebProcessConnection::create(socketPair.server));
     parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidCreateDatabaseToWebProcessConnection(IPC::Attachment(socketPair.client)), 0);
+#elif OS(WINDOWS)
+    IPC::Connection::Identifier serverIdentifier, clientIdentifier;
+    if (!IPC::Connection::createServerAndClientIdentifiers(serverIdentifier, clientIdentifier)) {
+        // log it?
+        return;
+    }
+    m_databaseToWebProcessConnections.append(DatabaseToWebProcessConnection::create(serverIdentifier));
+    parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidCreateDatabaseToWebProcessConnection(IPC::Attachment(clientIdentifier)), 0);
 #elif OS(DARWIN)
     // Create the listening port.
     mach_port_t listeningPort;
diff --git a/Source/WebKit2/DatabaseProcess/DatabaseProcess.h b/Source/WebKit2/DatabaseProcess/DatabaseProcess.h
index d87966c92..f3f3deaa2 100644
--- a/Source/WebKit2/DatabaseProcess/DatabaseProcess.h
+++ b/Source/WebKit2/DatabaseProcess/DatabaseProcess.h
@@ -65,9 +65,9 @@ public:
 
     void postDatabaseTask(std::unique_ptr<WebCore::CrossThreadTask>);
 
-private:
     DatabaseProcess();
 
+private:
     // ChildProcess
     virtual void initializeProcess(const ChildProcessInitializationParameters&) override;
     virtual void initializeProcessName(const ChildProcessInitializationParameters&) override;