Support non-SFI mode in NaCl manifest file.

ppapi/native_client/src/trusted/plugin/plugin.cc

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 894337b01fc03a2518174077c81c5cf0aafadab6..0109d056c187b744395da526370e1cdb604f49e2 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin.cc
+++ b/ppapi/native_client/src/trusted/plugin/plugin.cc
@@ -283,7 +283,7 @@ bool Plugin::LoadNaClModuleFromBackgroundThread(
     const SelLdrStartParams& params) {
   CHECK(!pp::Module::Get()->core()->IsMainThread());
   ServiceRuntime* service_runtime =
-      new ServiceRuntime(this, manifest, false,
+      new ServiceRuntime(this, manifest, false, uses_nonsfi_mode(),
                          pp::BlockUntilComplete(), pp::BlockUntilComplete());
   subprocess->set_service_runtime(service_runtime);
   PLUGIN_PRINTF(("Plugin::LoadNaClModuleFromBackgroundThread "
@@ -339,6 +339,7 @@ void Plugin::SignalStartSelLdrDone(int32_t pp_error,
 }
 
 void Plugin::LoadNaClModule(nacl::DescWrapper* wrapper,
+                            bool uses_nonsfi_mode,
                             bool enable_dyncode_syscalls,
                             bool enable_exception_handling,
                             bool enable_crash_throttling,
@@ -354,13 +355,15 @@ void Plugin::LoadNaClModule(nacl::DescWrapper* wrapper,
   SelLdrStartParams params(manifest_base_url(),
                            true /* uses_irt */,
                            true /* uses_ppapi */,
+                           uses_nonsfi_mode,
                            enable_dev_interfaces_,
                            enable_dyncode_syscalls,
                            enable_exception_handling,
                            enable_crash_throttling);
   ErrorInfo error_info;
   ServiceRuntime* service_runtime =
-      new ServiceRuntime(this, manifest_.get(), true, init_done_cb, crash_cb);
+      new ServiceRuntime(this, manifest_.get(), 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)));
@@ -398,16 +401,18 @@ void Plugin::LoadNexeAndStart(int32_t pp_error,
 }
 
 bool Plugin::LoadNaClModuleContinuationIntern(ErrorInfo* error_info) {
-  if (!main_subprocess_.StartSrpcServices()) {
-    // The NaCl process probably crashed. On Linux, a crash causes this error,
-    // while on other platforms, the error is detected below, when we attempt to
-    // start the proxy. Report a module initialization error here, to make it
-    // less confusing for developers.
-    NaClLog(LOG_ERROR, "LoadNaClModuleContinuationIntern: "
-            "StartSrpcServices failed\n");
-    error_info->SetReport(PP_NACL_ERROR_START_PROXY_MODULE,
-                          "could not initialize module.");
-    return false;
+  if (!uses_nonsfi_mode()) {
+    if (!main_subprocess_.StartSrpcServices()) {
+      // The NaCl process probably crashed. On Linux, a crash causes this
+      // error, while on other platforms, the error is detected below, when we
+      // attempt to start the proxy. Report a module initialization error here,
+      // to make it less confusing for developers.
+      NaClLog(LOG_ERROR, "LoadNaClModuleContinuationIntern: "
+              "StartSrpcServices failed\n");
+      error_info->SetReport(PP_NACL_ERROR_START_PROXY_MODULE,
+                            "could not initialize module.");
+      return false;
+    }
   }
   PP_ExternalPluginResult ipc_result =
       nacl_interface_->StartPpapiProxy(pp_instance());
@@ -455,6 +460,7 @@ NaClSubprocess* Plugin::LoadHelperNaClModule(nacl::DescWrapper* wrapper,
   SelLdrStartParams params(manifest_base_url(),
                            false /* uses_irt */,
                            false /* uses_ppapi */,
+                           false /* uses_nonsfi_mode */,
                            enable_dev_interfaces_,
                            false /* enable_dyncode_syscalls */,
                            false /* enable_exception_handling */,
@@ -586,6 +592,7 @@ bool Plugin::Init(uint32_t argc, const char* argn[], const char* argv[]) {
 Plugin::Plugin(PP_Instance pp_instance)
     : pp::Instance(pp_instance),
       main_subprocess_("main subprocess", NULL, NULL),
+      uses_nonsfi_mode_(false),
       nexe_error_reported_(false),
       wrapper_factory_(NULL),
       enable_dev_interfaces_(false),
@@ -760,6 +767,7 @@ void Plugin::NexeFileDidOpen(int32_t pp_error) {
   NaClLog(4, "NexeFileDidOpen: invoking LoadNaClModule\n");
   LoadNaClModule(
       wrapper.release(),
+      uses_nonsfi_mode(),
       true, /* enable_dyncode_syscalls */
       true, /* enable_exception_handling */
       false, /* enable_crash_throttling */
@@ -877,6 +885,7 @@ void Plugin::BitcodeDidTranslate(int32_t pp_error) {
       wrapper(pnacl_coordinator_.get()->ReleaseTranslatedFD());
   LoadNaClModule(
       wrapper.release(),
+      false, /* uses_nonsfi_mode */
       false, /* enable_dyncode_syscalls */
       false, /* enable_exception_handling */
       true, /* enable_crash_throttling */
@@ -1034,16 +1043,19 @@ void Plugin::NaClManifestFileDidOpen(int32_t pp_error) {
 void Plugin::ProcessNaClManifest(const nacl::string& manifest_json) {
   HistogramSizeKB("NaCl.Perf.Size.Manifest",
                   static_cast<int32_t>(manifest_json.length() / 1024));
-  nacl::string program_url;
-  PnaclOptions pnacl_options;
   ErrorInfo error_info;
   if (!SetManifestObject(manifest_json, &error_info)) {
     ReportLoadError(error_info);
     return;
   }
 
-  if (manifest_->GetProgramURL(&program_url, &pnacl_options, &error_info)) {
+  nacl::string program_url;
+  PnaclOptions pnacl_options;
+  bool uses_nonsfi_mode;
+  if (manifest_->GetProgramURL(
+          &program_url, &pnacl_options, &uses_nonsfi_mode, &error_info)) {
     is_installed_ = GetUrlScheme(program_url) == SCHEME_CHROME_EXTENSION;
+    set_uses_nonsfi_mode(uses_nonsfi_mode);

[Mark Seaborn, 2014/03/05 17:44:32]

Why not:
  uses_nonsfi_mode_ = uses_nonsfi_mode;
Looks like Plugin doesn't need a method for this?

[hidehiko, 2014/03/06 05:31:11]

Done to remove getter/setter, instead, let's access the member directly.

     set_nacl_ready_state(LOADING);
     // Inform JavaScript that we found a nexe URL to load.
     EnqueueProgressEvent(PP_NACL_EVENT_PROGRESS);
@@ -1137,10 +1149,12 @@ bool Plugin::SetManifestObject(const nacl::string& manifest_json,
   // Determine whether lookups should use portable (i.e., pnacl versions)
   // rather than platform-specific files.
   bool is_pnacl = (mime_type() == kPnaclMIMEType);
+  bool nonsfi_enabled = PP_ToBool(nacl_interface_->IsNonSFIEnabled());
   nacl::scoped_ptr<JsonManifest> json_manifest(
       new JsonManifest(url_util_,
                        manifest_base_url(),
-                       (is_pnacl ? kPortableISA : GetSandboxISA())));
+                       (is_pnacl ? kPortableISA : GetSandboxISA()),
+                       nonsfi_enabled));
   if (!json_manifest->Init(manifest_json, error_info)) {
     return false;
   }