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

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

Issue 11761025: When launching PNaCl helper nexes, explicitly disable IRT loading. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 12 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/plugin.cc
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.cc b/ppapi/native_client/src/trusted/plugin/plugin.cc
index c8c919420ac3daeae0f6b37a37d7cfc6aba04dfc..0475c78957c51d22b7c5d403e38adae4fbdf1b47 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin.cc
+++ b/ppapi/native_client/src/trusted/plugin/plugin.cc
@@ -545,6 +545,7 @@ bool Plugin::LoadNaClModuleCommon(nacl::DescWrapper* wrapper,
const Manifest* manifest,
bool should_report_uma,
bool uses_ppapi,
+ bool uses_irt,
ErrorInfo* error_info,
pp::CompletionCallback init_done_cb,
pp::CompletionCallback crash_cb) {
@@ -566,6 +567,7 @@ bool Plugin::LoadNaClModuleCommon(nacl::DescWrapper* wrapper,
manifest_base_url(),
uses_ppapi,
enable_dev_interfaces_,
+ uses_irt,
crash_cb);
PLUGIN_PRINTF(("Plugin::LoadNaClModuleCommon (service_runtime_started=%d)\n",
service_runtime_started));
@@ -587,6 +589,7 @@ bool Plugin::LoadNaClModule(nacl::DescWrapper* wrapper,
if (!LoadNaClModuleCommon(wrapper, &main_subprocess_, manifest_.get(),
true /* should_report_uma */,
true /* uses_ppapi */,
+ true /* uses_irt */,
error_info, init_done_cb, crash_cb)) {
return false;
}
@@ -650,6 +653,7 @@ NaClSubprocess* Plugin::LoadHelperNaClModule(nacl::DescWrapper* wrapper,
if (!LoadNaClModuleCommon(wrapper, nacl_subprocess.get(), manifest,
false /* should_report_uma */,
false /* uses_ppapi */,
+ false /* uses_irt */,
Mark Seaborn 2013/01/04 00:05:41 Maybe comment that the PNaCl translator isn't buil
jvoung (off chromium) 2013/01/04 17:09:23 Done.
error_info,
pp::BlockUntilComplete(),
pp::BlockUntilComplete())) {

Powered by Google App Engine
This is Rietveld 408576698