Pepper: Nexe downloading out of the trusted plugin.

ppapi/native_client/src/trusted/plugin/plugin.h

 // -*- c++ -*-
 // 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.
 
 // The portable representation of an instance and root scriptable object.
 // The PPAPI version of the plugin instantiates a subclass of this class.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
@@ skipping 263 matching lines @@
 
   void SetExitStatusOnMainThread(int32_t pp_error, int exit_status);
 
   // Keep track of the NaCl module subprocess that was spun up in the plugin.
   NaClSubprocess main_subprocess_;
 
   bool uses_nonsfi_mode_;
 
   nacl::DescWrapperFactory* wrapper_factory_;
 
-  // File download support.  |nexe_downloader_| can be opened with a specific
-  // callback to run when the file has been downloaded and is opened for
-  // reading.  We use one downloader for all URL downloads to prevent issuing
-  // multiple GETs that might arrive out of order.  For example, this will
-  // prevent a GET of a NaCl manifest while a .nexe GET is pending.  Note that
-  // this will also prevent simultaneous handling of multiple .nexes on a page.
-  FileDownloader nexe_downloader_;
+  // Original URL (without resolution) for the .nexe program to load.

[bbudge, 2014/05/14 21:46:18]

How about 'Original, unresolved URL for ...' ?

[teravest, 2014/05/15 19:12:21]

Done.

+  std::string program_url_;
+
   pp::CompletionCallbackFactory<Plugin> callback_factory_;
 
   nacl::scoped_ptr<PnaclCoordinator> pnacl_coordinator_;
 
   // Keep track of the FileDownloaders created to fetch urls.
   std::set<FileDownloader*> url_downloaders_;
   // Keep track of file descriptors opened by StreamAsFile().
   // These are owned by the browser.
   std::map<nacl::string, NaClFileInfoAutoCloser*> url_file_info_map_;
 
   // Callback to receive .nexe and .dso download progress notifications.
   static void UpdateDownloadProgress(
       PP_Instance pp_instance,
       PP_Resource pp_resource,
       int64_t bytes_sent,
       int64_t total_bytes_to_be_sent,
       int64_t bytes_received,
       int64_t total_bytes_to_be_received);
 
   // Finds the file downloader which owns the given URL loader. This is used
   // in UpdateDownloadProgress to map a url loader back to the URL being
   // downloaded.
   const FileDownloader* FindFileDownloader(PP_Resource url_loader) const;
 
   int64_t time_of_last_progress_event_;
   int exit_status_;
 
-  // Open times are in microseconds.
-  int64_t nexe_open_time_;
-
   PP_Var manifest_data_var_;
   int32_t manifest_id_;
 
+  PP_FileHandle nexe_handle_;
+
   const PPB_NaCl_Private* nacl_interface_;
   pp::UMAPrivate uma_interface_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_