From 715be629d51174233403237bfc563cf150087dc8 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 25 Sep 2012 13:02:02 +0200 Subject: Imported WebKit commit ce614b0924ba46f78d4435e28ff93c8525fbb7cc (http://svn.webkit.org/repository/webkit/trunk@129485) New snapshot that includes MingW build fixes --- Source/WebKit2/UIProcess/WebProcessProxy.cpp | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'Source/WebKit2/UIProcess/WebProcessProxy.cpp') diff --git a/Source/WebKit2/UIProcess/WebProcessProxy.cpp b/Source/WebKit2/UIProcess/WebProcessProxy.cpp index 13ca474f3..579783eed 100644 --- a/Source/WebKit2/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit2/UIProcess/WebProcessProxy.cpp @@ -108,21 +108,8 @@ void WebProcessProxy::connect() ProcessLauncher::LaunchOptions launchOptions; launchOptions.processType = ProcessLauncher::WebProcess; - -#if PLATFORM(MAC) - // We want the web process to match the architecture of the UI process. - launchOptions.architecture = ProcessLauncher::LaunchOptions::MatchCurrentArchitecture; - launchOptions.executableHeap = false; -#if HAVE(XPC) - launchOptions.useXPC = getenv("WEBKIT_USE_XPC_SERVICE_FOR_WEB_PROCESS"); -#endif -#endif -#ifndef NDEBUG - const char* webProcessCmdPrefix = getenv("WEB_PROCESS_CMD_PREFIX"); - if (webProcessCmdPrefix && *webProcessCmdPrefix) - launchOptions.processCmdPrefix = String::fromUTF8(webProcessCmdPrefix); -#endif - + platformConnect(launchOptions); + m_processLauncher = ProcessLauncher::create(this, launchOptions); } -- cgit v1.2.1