Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1186)

Unified Diff: content/browser/utility_process_host.cc

Issue 8770025: Zygote most of the uses of the utility process on Linux (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased and adjusted comment in use_linux_zygote flag declaration. Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/utility_process_host.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/utility_process_host.cc
diff --git a/content/browser/utility_process_host.cc b/content/browser/utility_process_host.cc
index 998f8a511bc85aa6013aeee3b5b3a04c28e87227..4498c79b964fd23b44cc2bc3f5690a0f3b797c8b 100644
--- a/content/browser/utility_process_host.cc
+++ b/content/browser/utility_process_host.cc
@@ -43,8 +43,10 @@ UtilityProcessHost::UtilityProcessHost(Client* client,
no_sandbox_(false),
#if defined(OS_LINUX)
child_flags_(ChildProcessHost::CHILD_ALLOW_SELF),
+ use_linux_zygote_(true),
#else
child_flags_(ChildProcessHost::CHILD_NORMAL),
+ use_linux_zygote_(false),
#endif
started_(false) {
}
@@ -115,8 +117,7 @@ bool UtilityProcessHost::StartProcess() {
cmd_line->AppendSwitch(switches::kDebugPluginLoading);
#if defined(OS_POSIX)
- // TODO(port): Sandbox this on Linux. Also, zygote this to work with
- // Linux updating.
+ // TODO(port): Sandbox extension unpacking on Linux.
bool has_cmd_prefix = browser_command_line.HasSwitch(
switches::kUtilityCmdPrefix);
if (has_cmd_prefix) {
@@ -129,11 +130,17 @@ bool UtilityProcessHost::StartProcess() {
cmd_line->AppendSwitchPath(switches::kUtilityProcessAllowedDir, exposed_dir_);
#endif
+ bool use_zygote = false;
+
+#if defined(OS_LINUX)
+ use_zygote = !no_sandbox_ && use_linux_zygote_;
+#endif
+
Launch(
#if defined(OS_WIN)
exposed_dir_,
#elif defined(OS_POSIX)
- false,
+ use_zygote,
env_,
#endif
cmd_line);
« no previous file with comments | « content/browser/utility_process_host.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698