Add ability to load pnacl resources from DIR_PNACL_COMPONENT.

ppapi/native_client/src/trusted/plugin/pnacl_resources.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.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_
 
 #include <map>
 #include <vector>
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "native_client/src/trusted/plugin/delayed_callback.h"
 #include "native_client/src/trusted/plugin/nexe_arch.h"
 #include "native_client/src/trusted/plugin/plugin_error.h"
+
 #include "ppapi/utility/completion_callback_factory.h"
+#include "ppapi/c/private/pp_file_handle.h"
 
 namespace plugin {
 
 class Manifest;
 class Plugin;
 class PnaclCoordinator;
 
+// Constants for loading LLC and LD.
 class PnaclUrls {
  public:
-  static nacl::string GetExtensionUrl() {
-    return nacl::string(kExtensionOrigin) + GetSandboxISA() + "/";
-  }
+  static bool UsePnaclExtension(const Plugin* plugin);
+  static nacl::string GetBaseUrl(bool use_extension);
+  static bool IsPnaclComponent(const nacl::string& full_url);
+  static nacl::string StripPnaclComponentPrefix(const nacl::string& full_url);
   static const nacl::string GetLlcUrl() { return nacl::string(kLlcUrl); }
   static const nacl::string GetLdUrl() { return nacl::string(kLdUrl); }
  private:
   static const char kExtensionOrigin[];
+  static const char kPnaclComponentID[];
   static const char kLlcUrl[];
   static const char kLdUrl[];
 };
 
-// Loads a list of remote resources, providing a way to get file descriptors for
-// thse resources.  All URLs in relative to resource_base_url_.
+// Loads a list of resources, providing a way to get file descriptors
+// these resources.  URLs for resources are resolved by the manifest

[robertm, 2012/08/08 21:51:11]

some typo

[jvoung - send to chromium..., 2012/08/08 22:47:04]

Done.

+// and may point to filesystem resources.
 class PnaclResources {
  public:
   PnaclResources(Plugin* plugin,
                  PnaclCoordinator* coordinator,
                  const Manifest* manifest,
                  const std::vector<nacl::string>& resource_urls,
                  const pp::CompletionCallback& all_loaded_callback)
       : plugin_(plugin),
         coordinator_(coordinator),
         manifest_(manifest),
         resource_urls_(resource_urls),
         all_loaded_callback_(all_loaded_callback) {
     callback_factory_.Initialize(this);
   }
-
   virtual ~PnaclResources();
 
-  // Start fetching the URLs.  After construction, this is the first step.
-  void StartDownloads();
-  // Get the wrapper for the downloaded resource.
-  // Only valid after all_loaded_callback_ has been run.
+  // Start loading the resources.  After construction, this is the first step.
+  virtual void StartLoad();
+  // Get file descs by name. Only valid after all_loaded_callback_ has been run.

[robertm, 2012/08/08 21:51:11]

would CHECK( resource_wrappers_.size() != 0)
be too brutal?

[jvoung - send to chromium..., 2012/08/08 22:47:04]

Probably good to know.  Could also/instead check that it can find a mapping for
the URL instead?

   nacl::DescWrapper* WrapperForUrl(const nacl::string& url) {
     return resource_wrappers_[url];
   }
 
+  static int32_t GetPnaclFD(Plugin* plugin, const char* filename);
+
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(PnaclResources);
 
   // Callback invoked each time one resource has been loaded.
   void ResourceReady(int32_t pp_error,
                      const nacl::string& url,
                      const nacl::string& full_url);
 
   // The plugin requesting the resource loading.
   Plugin* plugin_;
@@ skipping 11 matching lines @@
   // Because we may be loading multiple resources, we need a callback that
   // is invoked each time a resource arrives, and finally invokes
   // all_loaded_callback_ when done.
   nacl::scoped_ptr<DelayedCallback> delayed_callback_;
   // Factory for ready callbacks, etc.
   pp::CompletionCallbackFactory<PnaclResources> callback_factory_;
 };
 
 }  // namespace plugin;
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_