Change pnacl to read all resources from the extension.

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

 // 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.
 
 #include "native_client/src/trusted/plugin/pnacl_resources.h"
 
 #include <utility>
 #include <vector>
 
 #include "native_client/src/include/portability_io.h"
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "native_client/src/trusted/plugin/browser_interface.h"
+#include "native_client/src/trusted/plugin/manifest.h"
 #include "native_client/src/trusted/plugin/plugin.h"
 #include "native_client/src/trusted/plugin/plugin_error.h"
 #include "native_client/src/trusted/plugin/pnacl_coordinator.h"
 #include "native_client/src/trusted/plugin/utility.h"
 
 #include "ppapi/c/pp_errors.h"
 
 namespace plugin {
 
 class Plugin;
@@ skipping 12 matching lines @@
   PLUGIN_PRINTF(("PnaclResources::StartDownloads\n"));
   // Create a counter (barrier) callback to track when all of the resources
   // are loaded.
   uint32_t resource_count = static_cast<uint32_t>(resource_urls_.size());
   delayed_callback_.reset(
       new DelayedCallback(all_loaded_callback_, resource_count));
 
   // Schedule the downloads.
   CHECK(resource_urls_.size() > 0);
   for (size_t i = 0; i < resource_urls_.size(); ++i) {
-    const nacl::string& full_url = resource_base_url_ + resource_urls_[i];
+    nacl::string full_url;
+    ErrorInfo error_info;
+    if (!manifest_->ResolveURL(resource_urls_[i], &full_url, &error_info)) {
+      coordinator_->ReportNonPpapiError(
+          nacl::string("failed to download ") + resource_urls_[i] + "\n");

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

maybe incorporate the error_info string as well.

[elijahtaylor (use chromium), 2011/12/19 21:42:52]

s/download/resolve/  ?

Also, does this need a break like below?

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

Done.

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

Agreed on the "resolve".  I tried to harmonize the line break style also.

+    }
     pp::CompletionCallback ready_callback =
         callback_factory_.NewCallback(&PnaclResources::ResourceReady,
                                       resource_urls_[i],
                                       full_url);
     if (!plugin_->StreamAsFile(full_url,
+                               manifest_->PermitsExtensionUrls(),
                                ready_callback.pp_completion_callback())) {
       coordinator_->ReportNonPpapiError(
           nacl::string("failed to download ") + resource_urls_[i] + "\n");
       break;
     }
   }
 }
 
 void PnaclResources::ResourceReady(int32_t pp_error,
                                    const nacl::string& url,
                                    const nacl::string& full_url) {
   PLUGIN_PRINTF(("PnaclResources::ResourceReady (pp_error=%"
                  NACL_PRId32", url=%s)\n", pp_error, url.c_str()));
   // pp_error is checked by GetLoadedFileDesc.
   int32_t fd = coordinator_->GetLoadedFileDesc(pp_error,
                                                full_url,
                                                "resource " + url);
   if (fd < 0) {
     coordinator_->ReportPpapiError(pp_error,
                                    "PnaclResources::ResourceReady failed.\n");
   } else {
     resource_wrappers_[url] =
         plugin_->wrapper_factory()->MakeFileDesc(fd, O_RDONLY);
     delayed_callback_->RunIfTime();
   }
 }
 
 }  // namespace plugin