From 0dd71c40535335affe93bbde0543b81be796f03e Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Thu, 12 Dec 2013 10:07:42 +0100 Subject: Fix the utility process launching. This would cause a crash of the render process while loading facebook.com since the utility process would try to use /proc/self/exe on linux. Bring back the kBrowserSubprocessPath switch to specify our subprocess executable. Change-Id: I4822d43f4a2b5ee86b941721da5ebb47d7a97c5d Reviewed-by: Arvid Nilsson Reviewed-by: Andras Becsi --- src/core/web_engine_context.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/core/web_engine_context.cpp') diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 5dbb653cd..3f2bbc06d 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -59,6 +59,7 @@ #include "content_client_qt.h" #include "content_main_delegate_qt.h" #include "type_conversion.h" +#include "web_engine_library_info.h" #include #include #include @@ -115,6 +116,7 @@ WebEngineContext::WebEngineContext(WebContentsAdapterClient::RenderingMode rende CommandLine* parsedCommandLine = CommandLine::ForCurrentProcess(); parsedCommandLine->AppendSwitchASCII(switches::kUserAgent, webkit_glue::BuildUserAgentFromProduct("QtWebEngine/0.1")); + parsedCommandLine->AppendSwitchASCII(switches::kBrowserSubprocessPath, WebEngineLibraryInfo::subProcessPath().value().c_str()); parsedCommandLine->AppendSwitch(switches::kNoSandbox); parsedCommandLine->AppendSwitch(switches::kDisablePlugins); -- cgit v1.2.3