Pepper: Move StreamAsFile out of trusted plugin.

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 May 21 13:23:26 2014. */
+/* From private/ppb_nacl_private.idl modified Fri May 23 08:51:49 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 180 matching lines @@
   /* Called when irt_open_resource() is invoked in the NaCl plugin.
    * Upon completion, callback will be invoked with given callback_user_data
    * and the result file handle (or PP_kInvalidFileHandle on error). */
   PP_Bool (*OpenResource)(void* user_data,
                           const char* entry_key,
                           PP_OpenResourceCompletionCallback callback,
                           void* callback_user_data);
 };
 
 typedef struct PPP_ManifestService_1_0 PPP_ManifestService;
+/**
+ * @}
+ */
 
+/**
+ * @addtogroup Structs
+ * @{
+ */
+/* Corresponds to NaClFileInfo in
+ * native_client/src/trusted/validator/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;
+};
+/**
+ * @}
+ */
+
+/**
+ * @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 |uses_ppapi| flag
    * indicates that the nexe run by sel_ldr will use the PPAPI APIs.
    * This implies that LaunchSelLdr is run from the main thread.  If a nexe
    * does not need PPAPI, then it can run off the main thread.
    * The |uses_irt| flag indicates whether the IRT should be loaded in this
@@ skipping 84 matching lines @@
   /* Report to the browser that translation of the pexe for |instance|
    * has finished, or aborted with an error. If |success| is true, the
    * browser may then store the translation in the cache. The renderer
    * must first have called GetNexeFd for the same instance. (The browser is
    * not guaranteed to store the nexe even if |success| is true; if there is
    * an error on the browser side, or the file is too big for the cache, or
    * the browser is in incognito mode, no notification will be delivered to
    * the plugin.)
    */
   void (*ReportTranslationFinished)(PP_Instance instance, PP_Bool success);
-  /* Opens a NaCl executable file in the application's extension directory
-   * corresponding to the file URL and returns a file descriptor, or an invalid
-   * handle on failure. |metadata| is left unchanged on failure.
-   */
-  PP_FileHandle (*OpenNaClExecutable)(PP_Instance instance,
-                                      const char* file_url,
-                                      uint64_t* file_token_lo,
-                                      uint64_t* file_token_hi);
   /* Dispatch a progress event on the DOM element where the given instance is
    * embedded.
    */
   void (*DispatchEvent)(PP_Instance instance,
                         PP_NaClEventType event_type,
                         const char* resource_url,
                         PP_Bool length_is_computable,
                         uint64_t loaded_bytes,
                         uint64_t total_bytes);
   /* Report that the nexe loaded successfully. */
@@ skipping 40 matching lines @@
                            const char* argn[],
                            const char* argv[]);
   /* Returns the size of the nexe. */
   int64_t (*GetNexeSize)(PP_Instance instance);
   /* Performs accounting for requesting the NaCl manifest at the given URL. */
   void (*RequestNaClManifest)(PP_Instance instance,
                               const char* manifest_url,
                               int32_t* manifest_id,
                               struct PP_CompletionCallback callback);
   struct PP_Var (*GetManifestBaseURL)(PP_Instance instance);
-  PP_Bool (*ResolvesRelativeToPluginBaseUrl)(PP_Instance instance,
-                                             const char* url);
   /* Processes the NaCl manifest once it's been retrieved.
    * TODO(teravest): Move the rest of the supporting logic out of the trusted
    * plugin.
    */
   void (*ProcessNaClManifest)(PP_Instance instance, const char* program_url);
   /* Returns the manifest url as passed as a plugin argument. */
   struct PP_Var (*GetManifestURLArgument)(PP_Instance instance);
   PP_Bool (*DevInterfacesEnabled)(PP_Instance instance);
   int32_t (*CreatePnaclManifest)(PP_Instance instance);
   void (*DestroyManifest)(PP_Instance instance, int32_t manifest_id);
@@ skipping 27 matching lines @@
    * to a handle to a file containing its contents.
    * If metadata for identity-based validation caching is available
    * then it sets file_token_lo and file_token_lo (otherwise left untouched).
    */
   void (*DownloadNexe)(PP_Instance instance,
                        const char* url,
                        PP_FileHandle* handle,
                        uint64_t* file_token_lo,
                        uint64_t* file_token_hi,
                        struct PP_CompletionCallback callback);
+  /* Downloads a non-nexe file specified in the manifest, and sets |file_info|
+   * to corresponding information about the file. */
+  void (*DownloadFile)(PP_Instance instance,
+                       const char* url,
+                       struct PP_NaClFileInfo* file_info,
+                       struct PP_CompletionCallback callback);
 };
 
 typedef struct PPB_NaCl_Private_1_0 PPB_NaCl_Private;
 /**
  * @}
  */
 
 #endif  /* PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_ */