Change pnacl to read all resources from the extension.

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

 // 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.
 
 #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/plugin_error.h"
 
 #include "ppapi/cpp/completion_callback.h"
 
 namespace plugin {
 
+class Manifest;
 class Plugin;
 class PnaclCoordinator;
 
 
 // Loads a list of remote resources, providing a way to get file descriptors for
 // thse resources.  All URLs in relative to resource_base_url_.
 class PnaclResources {
  public:
   PnaclResources(Plugin* plugin,
                  PnaclCoordinator* coordinator,
-                 const nacl::string& resource_base_url,
+                 const Manifest* manifest,
                  const std::vector<nacl::string>& resource_urls,
                  const pp::CompletionCallback& all_loaded_callback)
       : plugin_(plugin),
         coordinator_(coordinator),
-        resource_base_url_(resource_base_url),
+        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.
   nacl::DescWrapper* WrapperForUrl(const nacl::string& url) {
     return resource_wrappers_[url];
   }
 
  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_;
   // The coordinator responsible for reporting errors, etc.
   PnaclCoordinator* coordinator_;
-  // The base url for looking up resources.
-  nacl::string resource_base_url_;
+  // The manifest url for looking up resources.

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

Comment about "url" may be stale?

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

Thanks.  Done.

+  const Manifest* manifest_;
   // The list of resource URLs (relative to resource_base_url_) to load.
   std::vector<nacl::string> resource_urls_;
   // Callback to be invoked when all resources can be guaranteed available.
   pp::CompletionCallback all_loaded_callback_;
   // The descriptor wrappers for the downloaded URLs.  Only valid
   // once all_loaded_callback_ has been invoked.
   std::map<nacl::string, nacl::DescWrapper*> resource_wrappers_;
   // 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_