bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge revision 1278 changes:

Browse Source 
- Linux: Force use of the sub-process executable path for the zygote process (issue #980).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1453@1279 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-06-10 18:48:31 +00:00
parent 9687d51b04
commit 7c00da5da5
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cef3/libcef/browser/content_browser_client.cc
View File

@@ -435,7 +435,7 @@ void CefContentBrowserClient::AppendExtraCommandLineSwitches(
arraysize(kSwitchNames)); arraysize(kSwitchNames));
} }
std::string process_type = const std::string& process_type =
command_line->GetSwitchValueASCII(switches::kProcessType); command_line->GetSwitchValueASCII(switches::kProcessType);
if (process_type == switches::kRendererProcess) { if (process_type == switches::kRendererProcess) {
// Propagate the following switches to the renderer command line (along with // Propagate the following switches to the renderer command line (along with
@@ -451,6 +451,17 @@ void CefContentBrowserClient::AppendExtraCommandLineSwitches(
arraysize(kSwitchNames)); arraysize(kSwitchNames));
} }
#if defined(OS_LINUX)
if (process_type == switches::kZygoteProcess &&
command_line->HasSwitch(switches::kBrowserSubprocessPath)) {
// Force use of the sub-process executable path for the zygote process.
const base::FilePath& subprocess_path =
command_line->GetSwitchValuePath(switches::kBrowserSubprocessPath);
if (!subprocess_path.empty())
command_line->SetProgram(subprocess_path);
}
#endif // defined(OS_LINUX)
CefRefPtr<CefApp> app = _Context->application(); CefRefPtr<CefApp> app = _Context->application();
if (app.get()) { if (app.get()) {
CefRefPtr<CefBrowserProcessHandler> handler = CefRefPtr<CefBrowserProcessHandler> handler =