Non-SFI NaCl: Batch-open resource files

ppapi/c/private/ppb_nacl_private.h

Index: ppapi/c/private/ppb_nacl_private.h
diff --git a/ppapi/c/private/ppb_nacl_private.h b/ppapi/c/private/ppb_nacl_private.h
index 764b853f35138d8b146e5122147daf8c6c4c33cb..26f8a2940ccd61433031b840bf46c8c7274bf2ac 100644
--- a/ppapi/c/private/ppb_nacl_private.h
+++ b/ppapi/c/private/ppb_nacl_private.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* From private/ppb_nacl_private.idl modified Wed Oct  1 15:54:15 2014. */
+/* From private/ppb_nacl_private.idl modified Mon Nov  3 17:52:33 2014. */
 
 #ifndef PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_
 #define PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_
@@ -191,14 +191,21 @@ typedef void (*PP_OpenResourceCompletionCallback)(void* user_data,
  * @addtogroup Structs
  * @{
  */
-/* Corresponds to NaClFileInfo in
- * native_client/src/trusted/validator/nacl_file_info.h */
+/* Corresponds to NaClFileInfo in native_client/src/public/nacl_file_info.h */
 struct PP_NaClFileInfo {
   PP_FileHandle handle;
   /* See NaClFileToken comment in nacl_file_info.h */
   uint64_t token_lo;
   uint64_t token_hi;
 };
+
+struct PP_NaClResourceFileHandle {
+  PP_FileHandle handle;
+  /* See NaClFileToken comment in nacl_file_info.h */
+  uint64_t token_lo;
+  uint64_t token_hi;
+  char* key;
+};
 /**
  * @}
  */
@@ -219,15 +226,18 @@ struct PPB_NaCl_Private_1_0 {
    * The |uses_nonsfi_mode| flag indicates whether or not nonsfi-mode should
    * be used with the binary pointed by the url.
    */
-  void (*LaunchSelLdr)(PP_Instance instance,
-                       PP_Bool main_service_runtime,
-                       const char* alleged_url,
-                       const struct PP_NaClFileInfo* nexe_file_info,
-                       PP_Bool uses_nonsfi_mode,
-                       PP_Bool enable_ppapi_dev,
-                       PP_NaClAppProcessType process_type,
-                       void* imc_handle,
-                       struct PP_CompletionCallback callback);
+  void (*LaunchSelLdr)(
+      PP_Instance instance,
+      PP_Bool main_service_runtime,
+      const char* alleged_url,
+      const struct PP_NaClFileInfo* nexe_file_info,
+      const struct PP_NaClResourceFileHandle resource_file_handles[],
+      uint32_t resource_file_handles_len,
+      PP_Bool uses_nonsfi_mode,
+      PP_Bool enable_ppapi_dev,
+      PP_NaClAppProcessType process_type,
+      void* imc_handle,
+      struct PP_CompletionCallback callback);
   /* This function starts the IPC proxy so the nexe can communicate with the
    * browser.
    */
@@ -352,10 +362,14 @@ struct PPB_NaCl_Private_1_0 {
    * If metadata for identity-based validation caching is available
    * then it sets token information in |file_info| (otherwise left untouched).
    */
-  void (*DownloadNexe)(PP_Instance instance,
-                       const char* url,
-                       struct PP_NaClFileInfo* file_info,
-                       struct PP_CompletionCallback callback);
+  void (*DownloadNexe)(
+      PP_Instance instance,
+      const char* url,
+      PP_Bool download_resource_files,
+      struct PP_NaClFileInfo* file_info,
+      struct PP_NaClResourceFileHandle** resource_file_handles,
+      uint32_t* resource_file_handles_len,
+      struct PP_CompletionCallback callback);
   /* Reports the status of sel_ldr for UMA reporting.
    * |max_status| has to be provided because the implementation of this
    * interface can't access the NaClErrorCode enum.