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

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

Issue 177113009: Support non-SFI mode in NaCl manifest file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 9 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.h
diff --git a/ppapi/native_client/src/trusted/plugin/service_runtime.h b/ppapi/native_client/src/trusted/plugin/service_runtime.h
index 42b55ab63cdfa8b948077929c1498d51ba5f25e8..532375fe13051a9a583b36b748a7916f1ef46dc7 100644
--- a/ppapi/native_client/src/trusted/plugin/service_runtime.h
+++ b/ppapi/native_client/src/trusted/plugin/service_runtime.h
@@ -51,6 +51,7 @@ struct SelLdrStartParams {
SelLdrStartParams(const nacl::string& url,
bool uses_irt,
bool uses_ppapi,
+ bool uses_nonsfi_mode,
bool enable_dev_interfaces,
bool enable_dyncode_syscalls,
bool enable_exception_handling,
@@ -58,6 +59,7 @@ struct SelLdrStartParams {
: url(url),
uses_irt(uses_irt),
uses_ppapi(uses_ppapi),
+ uses_nonsfi_mode(uses_nonsfi_mode),
enable_dev_interfaces(enable_dev_interfaces),
enable_dyncode_syscalls(enable_dyncode_syscalls),
enable_exception_handling(enable_exception_handling),
@@ -66,6 +68,7 @@ struct SelLdrStartParams {
nacl::string url;
bool uses_irt;
bool uses_ppapi;
+ bool uses_nonsfi_mode;
bool enable_dev_interfaces;
bool enable_dyncode_syscalls;
bool enable_exception_handling;
@@ -211,6 +214,7 @@ class ServiceRuntime {
ServiceRuntime(Plugin* plugin,
const Manifest* manifest,
bool main_service_runtime,
+ bool uses_nonsfi_mode,
pp::CompletionCallback init_done_cb,
pp::CompletionCallback crash_cb);
// The destructor terminates the sel_ldr process.
@@ -266,6 +270,7 @@ class ServiceRuntime {
NaClSrpcChannel command_channel_;
Plugin* plugin_;
bool main_service_runtime_;
+ bool uses_nonsfi_mode_;
nacl::ReverseService* reverse_service_;
nacl::scoped_ptr<nacl::SelLdrLauncherBase> subprocess_;

Powered by Google App Engine
This is Rietveld 408576698