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

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

Issue 332333003: Remove redundant use_nonsfi_mode from SelLdrStartParams. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« no previous file with comments | « no previous file | ppapi/native_client/src/trusted/plugin/service_runtime.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2dffec6928d3d49a4332b71c774a189bdcaee6d1..ffdfc6352a56867669ccac2e05931f7a200a62de 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin.cc
+++ b/ppapi/native_client/src/trusted/plugin/plugin.cc
@@ -72,7 +72,9 @@ bool Plugin::LoadNaClModuleFromBackgroundThread(
const SelLdrStartParams& params) {
CHECK(!pp::Module::Get()->core()->IsMainThread());
ServiceRuntime* service_runtime =
- new ServiceRuntime(this, false, uses_nonsfi_mode_,
+ new ServiceRuntime(this,
+ false, // No main_service_runtime.
+ false, // No non-SFI mode (i.e. in SFI-mode).
Mark Seaborn 2014/06/17 15:16:55 It's not obvious why it's OK to change this to 'fa
hidehiko 2014/06/17 16:47:03 Renamed the method name as Justin suggested. Also
pp::BlockUntilComplete(), pp::BlockUntilComplete());
subprocess->set_service_runtime(service_runtime);
PLUGIN_PRINTF(("Plugin::LoadNaClModuleFromBackgroundThread "
@@ -170,14 +172,12 @@ void Plugin::LoadNaClModule(PP_NaClFileInfo file_info,
SelLdrStartParams params(manifest_base_url_str,
true /* uses_irt */,
true /* uses_ppapi */,
- uses_nonsfi_mode,
enable_dyncode_syscalls,
enable_exception_handling,
enable_crash_throttling);
ErrorInfo error_info;
- ServiceRuntime* service_runtime =
- new ServiceRuntime(this, true, uses_nonsfi_mode,
- init_done_cb, crash_cb);
+ ServiceRuntime* service_runtime = new ServiceRuntime(
+ this, true, uses_nonsfi_mode, init_done_cb, crash_cb);
main_subprocess_.set_service_runtime(service_runtime);
PLUGIN_PRINTF(("Plugin::LoadNaClModule (service_runtime=%p)\n",
static_cast<void*>(service_runtime)));
@@ -251,7 +251,6 @@ NaClSubprocess* Plugin::LoadHelperNaClModule(const nacl::string& helper_url,
SelLdrStartParams params(helper_url,
false /* uses_irt */,
false /* uses_ppapi */,
- false /* uses_nonsfi_mode */,
false /* enable_dyncode_syscalls */,
false /* enable_exception_handling */,
true /* enable_crash_throttling */);
« no previous file with comments | « no previous file | ppapi/native_client/src/trusted/plugin/service_runtime.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698