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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/child_process_launcher.cc

Issue 6995121: New NaCl zygote implementation 2 (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Follow #define conventions Created 9 years, 6 months 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
« chrome/nacl/nacl_main.cc ('K') | « chrome/nacl/nacl_main.cc ('k') | content/browser/zygote_host_linux.h » ('j') | content/browser/zygote_host_linux.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/child_process_launcher.cc
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
index a23dd057015ddfd1102dd837415331d7de02a460..083a78dda3372707248b5f6915f8ad0415bf3eef 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);
}
-
« chrome/nacl/nacl_main.cc ('K') | « chrome/nacl/nacl_main.cc ('k') | content/browser/zygote_host_linux.h » ('j') | content/browser/zygote_host_linux.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698