Changeset 127967 in webkit

Timestamp:

Sep 8, 2012 3:50:37 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Fix CoreIPC setup between ProcessLauncher and WebProcessMain on Windows
​https://bugs.webkit.org/show_bug.cgi?id=96179

Patch by Simon Hausmann <​simon.hausmann@nokia.com> on 2012-09-08
Reviewed by Kenneth Rohde Christiansen.

• UIProcess/Launcher/qt/ProcessLauncherQt.cpp:

(WebKit::ProcessLauncher::launchProcess): Hide Unixy platform specific code
and includes behind appropriate platform #ifdefs and use
CoreIPC::Connection::createServerAndClientIdentifiers to set up the IPC pipes.
We also need to tell Windows about our intent of using the client handle in
the child web process.

• WebProcess/qt/WebProcessMainQt.cpp:

(WebKit::WebProcessMainQt): After retrieving the IPC identifier we call
WebKit::WebProcess::shared().initialize with it. That function actually
cares a CIPC::Connection::Identifier as argument, which happens to be an
int on Unix, but it's actually a HANDLE on Windows. Change the parameter
type according to and a reinterpret_cast from the converted unsigned integer,
similar to WebProcessMainWin.cpp.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Launcher/qt/ProcessLauncherQt.cpp (modified) (5 diffs)
• WebProcess/qt/WebProcessMainQt.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-09-08  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Fix CoreIPC setup between ProcessLauncher and WebProcessMain on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=96179
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
+        (WebKit::ProcessLauncher::launchProcess): Hide Unixy platform specific code
+        and includes behind appropriate platform #ifdefs and use
+        CoreIPC::Connection::createServerAndClientIdentifiers to set up the IPC pipes.
+        We also need to tell Windows about our intent of using the client handle in
+        the child web process.
+        * WebProcess/qt/WebProcessMainQt.cpp:
+        (WebKit::WebProcessMainQt): After retrieving the IPC identifier we call
+        WebKit::WebProcess::shared().initialize with it. That function actually
+        cares a CIPC::Connection::Identifier as argument, which happens to be an
+        int on Unix, but it's actually a HANDLE on Windows. Change the parameter
+        type according to and a reinterpret_cast from the converted unsigned integer,
+        similar to WebProcessMainWin.cpp.
+
 2012-09-08  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp

@@ -39 +39 @@
 #include <WebCore/NotImplemented.h>
 #include <WebCore/RunLoop.h>
+#include <wtf/HashSet.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/Threading.h>
+#include <wtf/text/WTFString.h>
+
+#if defined(Q_OS_UNIX)
 #include <errno.h>
 #include <fcntl.h>
@@ -46 +52 @@
 #include <sys/socket.h>
 #include <unistd.h>
-#include <wtf/HashSet.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/Threading.h>
-#include <wtf/text/WTFString.h>
+#endif
 
 #if defined(Q_OS_LINUX)
 #include <sys/prctl.h>
 #include <signal.h>
+#endif
+
+#if OS(WINDOWS)
+#include <windows.h>
 #endif
 
@@ -128 +135 @@
 
     commandLine = commandLine.arg(serviceName);
+#elif OS(WINDOWS)
+    CoreIPC::Connection::Identifier connector, clientIdentifier;
+    if (!CoreIPC::Connection::createServerAndClientIdentifiers(connector, clientIdentifier)) {
+        // FIXME: What should we do here?
+        ASSERT_NOT_REACHED();
+    }
+    commandLine = commandLine.arg(qulonglong(clientIdentifier));
+    // Ensure that the child process inherits the client identifier.
+    ::SetHandleInformation(clientIdentifier, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT);
 #else
     int sockets[2];
@@ -154 +170 @@
     webProcess->start(commandLine);
 
-#if !OS(DARWIN)
+#if OS(UNIX) && !OS(DARWIN)
     // Don't expose the web socket to possible future web processes
     while (fcntl(sockets[0], F_SETFD, FD_CLOEXEC) == -1) {
@@ -176 +192 @@
     }
 
+#if OS(UNIX)
     setpriority(PRIO_PROCESS, webProcess->pid(), 10);
+#endif
 
     RunLoop::main()->dispatch(bind(&WebKit::ProcessLauncher::didFinishLaunchingProcess, this, webProcess, connector));

trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp

@@ -173 +173 @@
 #else
     bool wasNumber = false;
-    int identifier = app->arguments().at(1).toInt(&wasNumber, 10);
+    qulonglong id = app->arguments().at(1).toULongLong(&wasNumber, 10);
     if (!wasNumber) {
         qDebug() << "Error: connection identifier wrong.";
         return 1;
     }
+    CoreIPC::Connection::Identifier identifier;
+#if OS(WINDOWS)
+    // Convert to HANDLE
+    identifier = reinterpret_cast<CoreIPC::Connection::Identifier>(id);
+#else
+    // Convert to int
+    identifier = static_cast<CoreIPC::Connection::Identifier>(id);
+#endif
 #endif
 #if USE(ACCELERATED_COMPOSITING)