Non-SFI NaCl: Batch-open resource files

ppapi/c/private/ppb_nacl_private.h

 /* Copyright (c) 2012 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.
  */
 
-/* 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_
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_macros.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/pp_var.h"
@@ skipping 167 matching lines @@
 typedef void (*PP_OpenResourceCompletionCallback)(void* user_data,
                                                   PP_FileHandle file_handle);
 /**
  * @}
  */
 
 /**
  * @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;
+};
 /**
  * @}
  */
 
 /**
  * @addtogroup Interfaces
  * @{
  */
 /* PPB_NaCl_Private */
 struct PPB_NaCl_Private_1_0 {
   /* Launches NaCl's sel_ldr process.  Returns PP_EXTERNAL_PLUGIN_OK on success
    * and writes a NaClHandle to imc_handle. Returns PP_EXTERNAL_PLUGIN_FAILED on
    * failure. The |enable_ppapi_dev| parameter controls whether GetInterface
    * returns 'Dev' interfaces to the NaCl plugin.
    * The |nexe_file_info| is currently used only in non-SFI mode. It is the
    * file handle for the main nexe file, which should be initially loaded.
    * LaunchSelLdr takes the ownership of the file handle.
    * 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.
    */
   PP_Bool (*StartPpapiProxy)(PP_Instance instance);
   /* On POSIX systems, this function returns the file descriptor of
    * /dev/urandom.  On non-POSIX systems, this function returns 0.
    */
   int32_t (*UrandomFD)(void);
   /* Whether the Pepper 3D interfaces should be disabled in the NaCl PPAPI
    * proxy. This is so paranoid admins can effectively prevent untrusted shader
@@ skipping 104 matching lines @@
   /* PP_Var string of attributes describing the CPU features supported
    * by the current architecture. The string is a comma-delimited list
    * of attributes supported by LLVM in its -mattr= option:
    *   http://llvm.org/docs/CommandGuide/llc.html#cmdoption-mattr */
   struct PP_Var (*GetCpuFeatureAttrs)(void);
   /* Downloads the .nexe file at the given URL to a file, and sets |file_info|
    * to information for a handle to a file containing its contents.
    * 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.
    */
   void (*ReportSelLdrStatus)(PP_Instance instance,
                              int32_t load_status,
                              int32_t max_status);
   /* Logs time taken by an operation to UMA histograms.
    * This function is safe to call on any thread.
    */
@@ skipping 27 matching lines @@
                      void* stream_handler_user_data);
 };
 
 typedef struct PPB_NaCl_Private_1_0 PPB_NaCl_Private;
 /**
  * @}
  */
 
 #endif  /* PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_ */