Non-SFI NaCl: Batch-open resource files

components/nacl/browser/nacl_host_message_filter.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/nacl/browser/nacl_host_message_filter.h"
 
 #include "base/sys_info.h"
 #include "components/nacl/browser/nacl_browser.h"
 #include "components/nacl/browser/nacl_file_host.h"
 #include "components/nacl/browser/nacl_process_host.h"
@@ skipping 80 matching lines @@
     IPC_MESSAGE_HANDLER_DELAY_REPLY(NaClHostMsg_GetReadonlyPnaclFD,
                                     OnGetReadonlyPnaclFd)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(NaClHostMsg_NaClCreateTemporaryFile,
                                     OnNaClCreateTemporaryFile)
     IPC_MESSAGE_HANDLER(NaClHostMsg_NexeTempFileRequest,
                         OnGetNexeFd)
     IPC_MESSAGE_HANDLER(NaClHostMsg_ReportTranslationFinished,
                         OnTranslationFinished)
     IPC_MESSAGE_HANDLER(NaClHostMsg_MissingArchError,
                         OnMissingArchError)
-    IPC_MESSAGE_HANDLER_DELAY_REPLY(NaClHostMsg_OpenNaClExecutable,
-                                    OnOpenNaClExecutable)
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(NaClHostMsg_OpenNaClResources,
+                                    OnOpenNaClResources)
     IPC_MESSAGE_HANDLER(NaClHostMsg_NaClGetNumProcessors,
                         OnNaClGetNumProcessors)
     IPC_MESSAGE_HANDLER(NaClHostMsg_NaClDebugEnabledForURL,
                         OnNaClDebugEnabledForURL)
 #endif
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
@@ skipping 32 matching lines @@
 void NaClHostMessageFilter::LaunchNaClContinuation(
     const nacl::NaClLaunchParams& launch_params,
     IPC::Message* reply_msg,
     ppapi::PpapiPermissions permissions) {
   NaClFileToken nexe_token = {
       launch_params.nexe_token_lo,  // lo
       launch_params.nexe_token_hi   // hi
   };
 
   base::PlatformFile nexe_file;
+  scoped_ptr<nacl::ResourceFileInfo[]> resource_files_info;
 #if defined(OS_WIN)
   // Duplicate the nexe file handle from the renderer process into the browser
   // process.
   if (!::DuplicateHandle(PeerHandle(),
                          launch_params.nexe_file,
                          base::GetCurrentProcessHandle(),
                          &nexe_file,
                          0,  // Unused, given DUPLICATE_SAME_ACCESS.
                          FALSE,
                          DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) {
     NaClHostMsg_LaunchNaCl::WriteReplyParams(
         reply_msg,
         NaClLaunchResult(),
         std::string("Failed to duplicate nexe file handle"));
     Send(reply_msg);
     return;
   }
+  // TODO(yusukes): Support pre-opening resource files.

[Mark Seaborn, 2015/02/09 04:48:34]

Nit: Add "on Windows"?

[Yusuke Sato, 2015/02/11 05:54:20]

Done.

 #elif defined(OS_POSIX)
   nexe_file =
       IPC::PlatformFileForTransitToPlatformFile(launch_params.nexe_file);
+  resource_files_info.reset(new nacl::ResourceFileInfo[
+      launch_params.resource_files_info.size()]);
+  for (size_t i = 0; i < launch_params.resource_files_info.size(); ++i) {
+    base::File file(IPC::PlatformFileForTransitToPlatformFile(
+        launch_params.resource_files_info[i].file_info.file));
+    NaClFileToken token = {
+        launch_params.resource_files_info[i].file_info.file_token_lo,
+        launch_params.resource_files_info[i].file_info.file_token_hi
+    };
+    resource_files_info[i] = nacl::ResourceFileInfo(
+        file.Pass(), token, launch_params.resource_files_info[i].file_key);
+  }
 #else
 #error Unsupported platform.
 #endif
 
   NaClProcessHost* host = new NaClProcessHost(
       GURL(launch_params.manifest_url),
       base::File(nexe_file),
       nexe_token,
+      resource_files_info.Pass(),
+      launch_params.resource_files_info.size(),
       permissions,
       launch_params.render_view_id,
       launch_params.permission_bits,
       launch_params.uses_nonsfi_mode,
       off_the_record_,
       launch_params.process_type,
       profile_directory_);
   GURL manifest_url(launch_params.manifest_url);
   base::FilePath manifest_path;
   // We're calling MapUrlToLocalFilePath with the non-blocking API
@@ skipping 84 matching lines @@
 void NaClHostMessageFilter::OnTranslationFinished(int instance, bool success) {
   pnacl::PnaclHost::GetInstance()->TranslationFinished(
       render_process_id_, instance, success);
 }
 
 void NaClHostMessageFilter::OnMissingArchError(int render_view_id) {
   nacl::NaClBrowser::GetDelegate()->
       ShowMissingArchInfobar(render_process_id_, render_view_id);
 }
 
-void NaClHostMessageFilter::OnOpenNaClExecutable(
+void NaClHostMessageFilter::OnOpenNaClResources(
     int render_view_id,
-    const GURL& file_url,
+    const std::vector<GURL>& resource_urls,
     bool enable_validation_caching,
     IPC::Message* reply_msg) {
-  nacl_file_host::OpenNaClExecutable(this,
-                                     render_view_id,
-                                     file_url,
-                                     enable_validation_caching,
-                                     reply_msg);
+  nacl_file_host::OpenNaClResources(this,
+                                    render_view_id,
+                                    resource_urls,
+                                    enable_validation_caching,
+                                    reply_msg);
 }
 
 void NaClHostMessageFilter::OnNaClDebugEnabledForURL(const GURL& nmf_url,
                                                      bool* should_debug) {
   *should_debug =
       nacl::NaClBrowser::GetDelegate()->URLMatchesDebugPatterns(nmf_url);
 }
 
 }  // namespace nacl