Title: [137004] trunk/Source/WebKit2
- Revision
- 137004
- Author
- [email protected]
- Date
- 2012-12-07 17:19:51 -0800 (Fri, 07 Dec 2012)
Log Message
[wk2] WebProcessServiceForWebKitDevelopment should forward stdout and stderr to the UIProcess
https://bugs.webkit.org/show_bug.cgi?id=104418
Reviewed by Simon Fraser.
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
(WebKit::connectToWebProcessServiceForWebKitDevelopment): Send stdout and stderr file descriptors to the WebProcess.
* WebProcessServiceForWebKitDevelopment/WebProcessServiceForWebKitDevelopmentMain.mm:
(WebProcessServiceForWebKitDevelopmentEventHandler): Replace the WebProcess' stdout and stderr with those from the UIProcess.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (137003 => 137004)
--- trunk/Source/WebKit2/ChangeLog 2012-12-08 01:17:36 UTC (rev 137003)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-08 01:19:51 UTC (rev 137004)
@@ -1,3 +1,15 @@
+2012-12-07 Tim Horton <[email protected]>
+
+ [wk2] WebProcessServiceForWebKitDevelopment should forward stdout and stderr to the UIProcess
+ https://bugs.webkit.org/show_bug.cgi?id=104418
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::connectToWebProcessServiceForWebKitDevelopment): Send stdout and stderr file descriptors to the WebProcess.
+ * WebProcessServiceForWebKitDevelopment/WebProcessServiceForWebKitDevelopmentMain.mm:
+ (WebProcessServiceForWebKitDevelopmentEventHandler): Replace the WebProcess' stdout and stderr with those from the UIProcess.
+
2012-12-07 Sheriff Bot <[email protected]>
Unreviewed, rolling out r136993.
Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (137003 => 137004)
--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2012-12-08 01:17:36 UTC (rev 137003)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2012-12-08 01:19:51 UTC (rev 137004)
@@ -164,6 +164,8 @@
xpc_dictionary_set_mach_send(bootstrapMessage, "server-port", listeningPort);
xpc_dictionary_set_string(bootstrapMessage, "client-identifier", clientIdentifier.data());
xpc_dictionary_set_string(bootstrapMessage, "ui-process-name", [[[NSProcessInfo processInfo] processName] UTF8String]);
+ xpc_dictionary_set_fd(bootstrapMessage, "stdout", STDOUT_FILENO);
+ xpc_dictionary_set_fd(bootstrapMessage, "stderr", STDERR_FILENO);
that->ref();
Modified: trunk/Source/WebKit2/WebProcessServiceForWebKitDevelopment/WebProcessServiceForWebKitDevelopmentMain.mm (137003 => 137004)
--- trunk/Source/WebKit2/WebProcessServiceForWebKitDevelopment/WebProcessServiceForWebKitDevelopmentMain.mm 2012-12-08 01:17:36 UTC (rev 137003)
+++ trunk/Source/WebKit2/WebProcessServiceForWebKitDevelopment/WebProcessServiceForWebKitDevelopmentMain.mm 2012-12-08 01:19:51 UTC (rev 137004)
@@ -131,6 +131,9 @@
xpc_connection_send_message(xpc_dictionary_get_remote_connection(event), reply);
xpc_release(reply);
+ dup2(xpc_dictionary_dup_fd(event, "stdout"), STDOUT_FILENO);
+ dup2(xpc_dictionary_dup_fd(event, "stderr"), STDERR_FILENO);
+
initializeWebProcessFunctionPtr(xpc_dictionary_get_string(event, "client-identifier"), peer, xpc_dictionary_copy_mach_send(event, "server-port"), xpc_dictionary_get_string(event, "ui-process-name"));
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
