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

Unified Diff: ppapi/native_client/src/trusted/plugin/service_runtime.cc

Issue 10214007: Add an IPC channel between the NaCl loader process and the renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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
Index: ppapi/native_client/src/trusted/plugin/service_runtime.cc
===================================================================
--- ppapi/native_client/src/trusted/plugin/service_runtime.cc (revision 136022)
+++ ppapi/native_client/src/trusted/plugin/service_runtime.cc (working copy)
@@ -628,11 +628,12 @@
PLUGIN_PRINTF(("ServiceRuntime::Start (nacl_desc=%p)\n",
reinterpret_cast<void*>(nacl_desc)));
- nacl::scoped_ptr<nacl::SelLdrLauncherBase> tmp_subprocess;
#ifdef NACL_STANDALONE
- tmp_subprocess.reset(new nacl::SelLdrLauncherStandalone());
+ nacl::scoped_ptr<nacl::SelLdrLauncherStandalone>
+ tmp_subprocess(new nacl::SelLdrLauncherStandalone());
#else
- tmp_subprocess.reset(new SelLdrLauncherChrome());
+ nacl::scoped_ptr<SelLdrLauncherChrome>
+ tmp_subprocess(new SelLdrLauncherChrome());
#endif
if (NULL == tmp_subprocess.get()) {
PLUGIN_PRINTF(("ServiceRuntime::Start (subprocess create failed)\n"));
@@ -640,7 +641,13 @@
"ServiceRuntime: failed to create sel_ldr launcher");
return false;
}
- if (!tmp_subprocess->Start(url.c_str())) {
+#ifdef NACL_STANDALONE
+ bool started = tmp_subprocess->Start(url.c_str());
+#else
+ bool started = tmp_subprocess->Start(plugin_->pp_instance(), url.c_str());
+#endif
+ PP_Instance instance = plugin_->pp_instance();
dmichael (off chromium) 2012/05/10 19:38:58 You don't appear to use instance
bbudge 2012/05/11 01:21:16 Done.
+ if (!started) {
PLUGIN_PRINTF(("ServiceRuntime::Start (start failed)\n"));
error_info->SetReport(ERROR_SEL_LDR_LAUNCH,
"ServiceRuntime: failed to start");

Powered by Google App Engine
This is Rietveld 408576698