diff options
| author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 23:50:40 +0000 |
|---|---|---|
| committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 23:50:40 +0000 |
| commit | 5b99724ed67011e9ef4231ec2796a5237cdf8e88 (patch) | |
| tree | f463db20eff57bcb29e32564610b0389597ea1a2 /content/browser/child_process_launcher.cc | |
| parent | 95343df7917bc58e87e6455449fbfa2461ceb37c (diff) | |
| download | chromium_src-5b99724ed67011e9ef4231ec2796a5237cdf8e88.zip chromium_src-5b99724ed67011e9ef4231ec2796a5237cdf8e88.tar.gz chromium_src-5b99724ed67011e9ef4231ec2796a5237cdf8e88.tar.bz2 | |
New NaCl zygote implementation 2, in which Chrome zygote forks a NaCl helper.
This patch can launch earth_c.html with and without the SUID sandbox. It is enabled with the environment variable NACL_NEW_ZYGOTE.
BUG=nativeclient:480
TEST=nativeclient in-browser tests on Linux, ChromeOS
Review URL: http://codereview.chromium.org/6995121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90681 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/child_process_launcher.cc')
| -rw-r--r-- | content/browser/child_process_launcher.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc index 8d0ac12..3ba9d8a 100644 --- a/content/browser/child_process_launcher.cc +++ b/content/browser/child_process_launcher.cc @@ -127,8 +127,9 @@ class ChildProcessLauncher::Context mapping.push_back(std::pair<uint32_t, int>(kCrashDumpSignal, crash_signal_fd)); } - handle = ZygoteHost::GetInstance()->ForkRenderer(cmd_line->argv(), - mapping); + handle = ZygoteHost::GetInstance()->ForkRequest(cmd_line->argv(), + mapping, + process_type); } else // Fall through to the normal posix case below when we're not zygoting. #endif @@ -374,4 +375,3 @@ void ChildProcessLauncher::SetTerminateChildOnShutdown( if (context_) context_->set_terminate_child_on_shutdown(terminate_on_shutdown); } - |