Non-SFI NaCl: Batch-open resource files

components/nacl/common/nacl_host_messages.h

 // 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.
 
 // Multiply-included file, no traditional include guard.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/process/process.h"
 #include "build/build_config.h"
 #include "components/nacl/common/nacl_types.h"
 #include "components/nacl/common/nacl_types_param_traits.h"
 #include "components/nacl/common/pnacl_types.h"
 #include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
 #include "url/gurl.h"
 
 #define IPC_MESSAGE_START NaClHostMsgStart
 
 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchParams)
   IPC_STRUCT_TRAITS_MEMBER(manifest_url)
   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::NaClLaunchResult)
   IPC_STRUCT_TRAITS_MEMBER(imc_channel_handle)
   IPC_STRUCT_TRAITS_MEMBER(ppapi_ipc_channel_handle)
   IPC_STRUCT_TRAITS_MEMBER(trusted_ipc_channel_handle)
   IPC_STRUCT_TRAITS_MEMBER(manifest_service_ipc_channel_handle)
   IPC_STRUCT_TRAITS_MEMBER(plugin_pid)
   IPC_STRUCT_TRAITS_MEMBER(plugin_child_id)
   IPC_STRUCT_TRAITS_MEMBER(crash_info_shmem_handle)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(nacl::PnaclCacheInfo)
   IPC_STRUCT_TRAITS_MEMBER(pexe_url)
   IPC_STRUCT_TRAITS_MEMBER(abi_version)
   IPC_STRUCT_TRAITS_MEMBER(opt_level)
   IPC_STRUCT_TRAITS_MEMBER(last_modified)
   IPC_STRUCT_TRAITS_MEMBER(etag)
   IPC_STRUCT_TRAITS_MEMBER(has_no_store_header)
   IPC_STRUCT_TRAITS_MEMBER(sandbox_isa)
   IPC_STRUCT_TRAITS_MEMBER(extra_flags)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(nacl::NaClResourceFileInfo)
+  IPC_STRUCT_TRAITS_MEMBER(file)
+  IPC_STRUCT_TRAITS_MEMBER(file_token_lo)
+  IPC_STRUCT_TRAITS_MEMBER(file_token_hi)
+  IPC_STRUCT_TRAITS_MEMBER(key)
+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
 // be valid if the NaCl IPC proxy is enabled.
 IPC_SYNC_MESSAGE_CONTROL1_2(NaClHostMsg_LaunchNaCl,
                             nacl::NaClLaunchParams /* launch_params */,
                             nacl::NaClLaunchResult /* launch_result */,
                             std::string /* error_message */)
 
 // 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,
                             std::string /* name of requested PNaCl file */,
                             bool /* is_executable */,
                             IPC::PlatformFileForTransit /* output file */,

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

reverted to the original code

                             uint64_t /* file_token_lo */,
-                            uint64_t /* file_token_hi */)
+                            uint64_t /* file_token_hi */);

[Mark Seaborn, 2015/02/12 03:57:33]

Nit: remove stray semicolon

[Yusuke Sato, 2015/02/13 23:01:16]

Done.

 
 // A renderer sends this to the browser process when it wants to
 // create a temporary file.
 IPC_SYNC_MESSAGE_CONTROL0_1(NaClHostMsg_NaClCreateTemporaryFile,
                             IPC::PlatformFileForTransit /* out file */)
 
 // A renderer sends this to the browser to request a file descriptor for
 // a translated nexe.
 IPC_MESSAGE_CONTROL3(NaClHostMsg_NexeTempFileRequest,
                      int /* render_view_id */,
@@ skipping 13 matching lines @@
 IPC_MESSAGE_CONTROL2(NaClHostMsg_ReportTranslationFinished,
                      int /* instance */,
                      bool /* success */)
 
 // A renderer sends this to the browser process to report when the client
 // architecture is not listed in the manifest.
 IPC_MESSAGE_CONTROL1(NaClHostMsg_MissingArchError,
                      int /* render_view_id */)
 
 // A renderer sends this to the browser process when it wants to
 // open a NaCl executable file from an installed application directory.

[Mark Seaborn, 2015/02/12 03:57:33]

I think this comment needs updating.

[Yusuke Sato, 2015/02/13 23:01:16]

Done (reverted to the original IPC definition)

-IPC_SYNC_MESSAGE_CONTROL3_3(NaClHostMsg_OpenNaClExecutable,
-                            int /* render_view_id */,
-                            GURL /* URL of NaCl executable file */,
-                            bool /* enable_validation_caching */,
-                            IPC::PlatformFileForTransit /* output file */,
-                            uint64 /* file_token_lo */,
-                            uint64 /* file_token_hi */)
+IPC_SYNC_MESSAGE_CONTROL3_1(
+    NaClHostMsg_OpenNaClResources,
+    int /* render_view_id */,
+    std::vector<GURL> /* URLs of NaCl resource files */,
+    bool /* enable_validation_caching */,
+    std::vector<nacl::NaClResourceFileInfo> /* open_result */)
 
 // A renderer sends this to the browser process to determine how many
 // processors are online.
 IPC_SYNC_MESSAGE_CONTROL0_1(NaClHostMsg_NaClGetNumProcessors,
                             int /* Number of processors */)
 
 // A renderer sends this to the browser process to determine if the
 // NaCl application started from the given NMF URL will be debugged.
 // If not (filtered out by commandline flags), it sets should_debug to false.
 IPC_SYNC_MESSAGE_CONTROL1_1(NaClHostMsg_NaClDebugEnabledForURL,
                             GURL /* alleged URL of NMF file */,
                             bool /* should debug */)