Add ability to load pnacl resources from DIR_PNACL_COMPONENT.

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

Index: ppapi/native_client/src/trusted/plugin/pnacl_resources.cc
diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_resources.cc b/ppapi/native_client/src/trusted/plugin/pnacl_resources.cc
index e720f86eb9db8d2331bdb16d98a5d5dadf3c27cf..cf77cca3c1fe7a6979d792c20ac0893fcf30a1ee 100644
--- a/ppapi/native_client/src/trusted/plugin/pnacl_resources.cc
+++ b/ppapi/native_client/src/trusted/plugin/pnacl_resources.cc
@@ -18,9 +18,38 @@ namespace plugin {
 
 const char PnaclUrls::kExtensionOrigin[] =
     "chrome-extension://gcodniebolpnpaiggndmcmmfpldlknih/";
+const char PnaclUrls::kPnaclComponentID[] =
+    "pnacl-component://";
 const char PnaclUrls::kLlcUrl[] = "llc";
 const char PnaclUrls::kLdUrl[] = "ld";
 
+bool PnaclUrls::UsePnaclExtension(const Plugin* plugin) {
+  // Use the chrome webstore extension for now, if --enable-pnacl is not
+  // explicitly requested.  Eventually we will always behave as if
+  // --enable-pnacl is used and not use the chrome extension.
+  // Some UI work, etc. remains before --enable-pnacl is usable:
+  // http://code.google.com/p/nativeclient/issues/detail?id=2813
+  return !(plugin->nacl_interface()->IsPnaclEnabled());
+}
+
+nacl::string PnaclUrls::GetBaseUrl(bool use_extension) {
+  if (use_extension) {
+    return nacl::string(kExtensionOrigin) + GetSandboxISA() + "/";
+  } else {
+    return nacl::string(kPnaclComponentID) + GetSandboxISA() + "/";
+  }
+}
+
+bool PnaclUrls::IsPnaclComponent(const nacl::string& full_url) {
+  return full_url.find(kPnaclComponentID, 0) == 0;
+}
+
+nacl::string PnaclUrls::StripPnaclComponentPrefix(const nacl::string& full_url) {
+  return full_url.substr(nacl::string(kPnaclComponentID).length());
+}
+
+//////////////////////////////////////////////////////////////////////
+
 PnaclResources::~PnaclResources() {
   for (std::map<nacl::string, nacl::DescWrapper*>::iterator
            i = resource_wrappers_.begin(), e = resource_wrappers_.end();
@@ -31,35 +60,93 @@ PnaclResources::~PnaclResources() {
   resource_wrappers_.clear();
 }
 
-void PnaclResources::StartDownloads() {
-  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) {
-    nacl::string full_url;
-    ErrorInfo error_info;
-    if (!manifest_->ResolveURL(resource_urls_[i], &full_url, &error_info)) {
-      coordinator_->ReportNonPpapiError(nacl::string("failed to resolve ") +
-                                        resource_urls_[i] + ": " +
-                                        error_info.message() + ".");
-      break;
+// static
+int32_t PnaclResources::GetPnaclFD(Plugin* plugin, const char* filename) {
+  PP_FileHandle file_handle =
+      plugin->nacl_interface()->GetReadonlyPnaclFd(filename);
+  if (file_handle == PP_kInvalidFileHandle)
+    return -1;
+
+#if NACL_WINDOWS
+  //////// Now try the posix view.
+  int32_t posix_desc = _open_osfhandle(reinterpret_cast<intptr_t>(file_handle),
+                                       _O_RDONLY | _O_BINARY);
+  if (posix_desc == -1) {
+    PLUGIN_PRINTF((
+        "PnaclResources::GetPnaclFD failed to convert HANDLE to posix\n"));
+    // Close the Windows HANDLE if it can't be converted.
+    CloseHandle(file_handle);
+  }
+  return posix_desc;
+#else
+  return file_handle;
+#endif
+}
+
+void PnaclResources::StartLoad() {
+  PLUGIN_PRINTF(("PnaclResources::StartLoad\n"));
+
+  if (PnaclUrls::UsePnaclExtension(plugin_)) {
+    PLUGIN_PRINTF(("PnaclResources::StartLoad -- PNaCl chrome extension.\n"));
+    // Do a URL fetch.
+    // 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) {
+      nacl::string full_url;
+      ErrorInfo error_info;
+      if (!manifest_->ResolveURL(resource_urls_[i], &full_url, &error_info)) {
+        coordinator_->ReportNonPpapiError(nacl::string("failed to resolve ") +
+                                          resource_urls_[i] + ": " +
+                                          error_info.message() + ".");
+        break;
+      }
+      pp::CompletionCallback ready_callback =
+          callback_factory_.NewCallback(
+              &PnaclResources::ResourceReady,
+              resource_urls_[i],
+              full_url);
+      if (!plugin_->StreamAsFile(full_url,
+                                 ready_callback.pp_completion_callback())) {
+        coordinator_->ReportNonPpapiError(nacl::string("failed to download ") +
+                                          resource_urls_[i] + ".");
+        break;
+      }
     }
-    pp::CompletionCallback ready_callback =
-        callback_factory_.NewCallback(&PnaclResources::ResourceReady,
-                                      resource_urls_[i],
-                                      full_url);
-    if (!plugin_->StreamAsFile(full_url,
-                               ready_callback.pp_completion_callback())) {
-      coordinator_->ReportNonPpapiError(nacl::string("failed to download ") +
-                                        resource_urls_[i] + ".");
-      break;
+  } else {
+    PLUGIN_PRINTF(("PnaclResources::StartLoad -- local install of PNaCl.\n"));
+    // Do a blocking load of each of the resources.
+    CHECK(resource_urls_.size() > 0);
+    for (size_t i = 0; i < resource_urls_.size(); ++i) {
+      const nacl::string& 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 resolve ") +
+                                          url + ": " +
+                                          error_info.message() + ".");
+        break;
+      }
+      full_url = PnaclUrls::StripPnaclComponentPrefix(full_url);
+
+      int32_t fd = PnaclResources::GetPnaclFD(plugin_, full_url.c_str());
+      if (fd < 0) {
+        coordinator_->ReportNonPpapiError(
+            nacl::string("PnaclLocalResources::StartLoad failed for: ") +
+            full_url);

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

why not follow the model above and just break here.

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

Oops, yeah it could.

+      } else {
+        resource_wrappers_[url] =
+            plugin_->wrapper_factory()->MakeFileDesc(fd, O_RDONLY);
+      }
     }
+    // We're done!  Queue the callback.
+    pp::Core* core = pp::Module::Get()->core();
+    core->CallOnMainThread(0, all_loaded_callback_, 0);
   }
 }