Non-SFI NaCl: Batch-open resource files

components/nacl/common/nacl_host_messages.h

Index: components/nacl/common/nacl_host_messages.h
diff --git a/components/nacl/common/nacl_host_messages.h b/components/nacl/common/nacl_host_messages.h
index b57ff1d56aa13239d201911d4e2b72bc00a2b70b..3d624e4993aac59f1994863613599c981ecd90e4 100644
--- a/components/nacl/common/nacl_host_messages.h
+++ b/components/nacl/common/nacl_host_messages.h
@@ -25,12 +25,18 @@ IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchParams)
   IPC_STRUCT_TRAITS_MEMBER(nexe_file)
   IPC_STRUCT_TRAITS_MEMBER(nexe_token_lo)
   IPC_STRUCT_TRAITS_MEMBER(nexe_token_hi)
+  IPC_STRUCT_TRAITS_MEMBER(resource_files_info)
   IPC_STRUCT_TRAITS_MEMBER(render_view_id)
   IPC_STRUCT_TRAITS_MEMBER(permission_bits)
   IPC_STRUCT_TRAITS_MEMBER(uses_nonsfi_mode)
   IPC_STRUCT_TRAITS_MEMBER(process_type)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchParams::ResourceFileInfo)
+  IPC_STRUCT_TRAITS_MEMBER(file_info)
+  IPC_STRUCT_TRAITS_MEMBER(file_key)
+IPC_STRUCT_TRAITS_END()
+
 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchResult)
   IPC_STRUCT_TRAITS_MEMBER(imc_channel_handle)
   IPC_STRUCT_TRAITS_MEMBER(ppapi_ipc_channel_handle)
@@ -52,6 +58,12 @@ IPC_STRUCT_TRAITS_BEGIN(nacl::PnaclCacheInfo)
   IPC_STRUCT_TRAITS_MEMBER(extra_flags)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(nacl::NaClFileInfo)
+  IPC_STRUCT_TRAITS_MEMBER(file)
+  IPC_STRUCT_TRAITS_MEMBER(file_token_lo)
+  IPC_STRUCT_TRAITS_MEMBER(file_token_hi)
+IPC_STRUCT_TRAITS_END()
+
 // A renderer sends this to the browser process when it wants to start
 // a new instance of the Native Client process. The browser will launch
 // the process and return an IPC channel handle. This handle will only
@@ -63,12 +75,10 @@ IPC_SYNC_MESSAGE_CONTROL1_2(NaClHostMsg_LaunchNaCl,
 
 // A renderer sends this to the browser process when it wants to
 // open a file for from the Pnacl component directory.
-IPC_SYNC_MESSAGE_CONTROL2_3(NaClHostMsg_GetReadonlyPnaclFD,
+IPC_SYNC_MESSAGE_CONTROL2_1(NaClHostMsg_GetReadonlyPnaclFD,
                             std::string /* name of requested PNaCl file */,
                             bool /* is_executable */,
-                            IPC::PlatformFileForTransit /* output file */,
-                            uint64_t /* file_token_lo */,
-                            uint64_t /* file_token_hi */)
+                            nacl::NaClFileInfo /* output */);
 
 // A renderer sends this to the browser process when it wants to
 // create a temporary file.
@@ -103,13 +113,11 @@ IPC_MESSAGE_CONTROL1(NaClHostMsg_MissingArchError,
 
 // A renderer sends this to the browser process when it wants to
 // open a NaCl executable file from an installed application directory.
-IPC_SYNC_MESSAGE_CONTROL3_3(NaClHostMsg_OpenNaClExecutable,
+IPC_SYNC_MESSAGE_CONTROL3_1(NaClHostMsg_OpenNaClResources,

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

Since this is a synchronous IPC message, is it going to introduce any renderer
jank if the renderer is waiting for the browser to open ~128 files?  Hmm, still,
I suppose that is better than the current situation of doing ~128 synchronous
IPC messages.

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

On low-end Chromebooks, opening ~128 files seems to take ~50ms. So this could
cause a slight UI jank. But yes, I think this still reduces the total sync IPC
time.

                             int /* render_view_id */,
-                            GURL /* URL of NaCl executable file */,
+                            std::vector<GURL> /* URLs of NaCl resource files */,
                             bool /* enable_validation_caching */,
-                            IPC::PlatformFileForTransit /* output file */,
-                            uint64 /* file_token_lo */,
-                            uint64 /* file_token_hi */)
+                            std::vector<nacl::NaClFileInfo> /* open_result */)
 
 // A renderer sends this to the browser process to determine how many
 // processors are online.