Change pnacl to read all resources from the extension.

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

 // -*- c++ -*-
 // Copyright (c) 2011 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 280 matching lines @@
   // Getter for PPAPI proxy interface.
   ppapi_proxy::BrowserPpp* ppapi_proxy() const { return ppapi_proxy_; }
 
   // Called back by CallOnMainThread.  Dispatches the first enqueued progress
   // event.
   void DispatchProgressEvent(int32_t result);
 
   // Requests a URL asynchronously resulting in a call to pp_callback with
   // a PP_Error indicating status. On success an open file descriptor
   // corresponding to the url body is recorded for further lookup.
   // This is used by SRPC-based StreamAsFile().

[jvoung - send to chromium..., 2011/12/19 21:37:08]

Perhaps add a comment about permits_extension_urls.

[sehr (please use chromium), 2011/12/20 01:48:38]

Done.

-  bool StreamAsFile(const nacl::string& url, PP_CompletionCallback pp_callback);
+  bool StreamAsFile(const nacl::string& url,
+                    bool permits_extension_urls,
+                    PP_CompletionCallback pp_callback);
   // Returns an open POSIX file descriptor retrieved by StreamAsFile()
   // or NACL_NO_FILE_DESC. The caller must take ownership of the descriptor.
   int32_t GetPOSIXFileDesc(const nacl::string& url);
 
   // A helper function that gets the scheme type for |url|. Uses URLUtil_Dev
   // interface which this class has as a member.
   UrlSchemeType GetUrlScheme(const std::string& url);
 
   // Get the text description of the last error reported by the plugin.
   const nacl::string& last_error_string() const { return last_error_string_; }
   void set_last_error_string(const nacl::string& error) {
     last_error_string_ = error;
   }
 
   // The MIME type used to instantiate this instance of the NaCl plugin.
   // Typically, the MIME type will be application/x-nacl.  However, if the NEXE
   // is being used as a content type handler for another content type (such as
   // PDF), then this function will return that type.
   const nacl::string& mime_type() const { return mime_type_; }
   // The default MIME type for the NaCl plugin.
   static const char* const kNaClMIMEType;
-  // Tests if the MIME type is not a NaCl MIME type.
-  bool IsForeignMIMEType() const;
   // Returns true if PPAPI Dev interfaces should be allowed.
   bool enable_dev_interfaces() { return enable_dev_interfaces_; }
 
   Manifest const* manifest() const { return manifest_.get(); }
   const pp::URLUtil_Dev* url_util() const { return url_util_; }
 
   // Extracts the exit status from the (main) service runtime.
   int exit_status() const {
     if (NULL == main_service_runtime()) {
       return -1;
@@ skipping 110 matching lines @@
                                     bool* is_portable);
 
   // Logs timing information to a UMA histogram, and also logs the same timing
   // information divided by the size of the nexe to another histogram.
   void HistogramStartupTimeSmall(const std::string& name, float dt);
   void HistogramStartupTimeMedium(const std::string& name, float dt);
 
   // Determines the appropriate nexe for the sandbox and requests a load.
   void RequestNexeLoad();
 
+  // This NEXE is being used as a content type handler rather than directly by
+  // an HTML document.
+  bool NexeIsContentHandler() const;
+
   // Callback used when loading a URL for SRPC-based StreamAsFile().
   void UrlDidOpenForStreamAsFile(int32_t pp_error,
                                  FileDownloader*& url_downloader,
                                  PP_CompletionCallback pp_callback);
 
   // Shuts down the proxy for PPAPI nexes.
   void ShutdownProxy();  // Nexe shutdown + proxy deletion.
 
   BrowserInterface* browser_interface_;
   ScriptableHandle* scriptable_handle_;
@@ skipping 96 matching lines @@
   // 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_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_