| Index: ppapi/native_client/src/trusted/plugin/pnacl_resources.cc
|
| ===================================================================
|
| --- ppapi/native_client/src/trusted/plugin/pnacl_resources.cc (revision 113812)
|
| +++ ppapi/native_client/src/trusted/plugin/pnacl_resources.cc (working copy)
|
| @@ -67,20 +67,20 @@
|
| 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];
|
| + PLUGIN_PRINTF(("PnaclResources::StartDownloads === creating callback\n"));
|
| pp::CompletionCallback ready_callback =
|
| callback_factory_.NewCallback(&PnaclResources::ResourceReady,
|
| resource_urls_[i],
|
| full_url);
|
| + PLUGIN_PRINTF(("PnaclResources::StartDownloads === created callback\n"));
|
| if (!plugin_->StreamAsFile(full_url,
|
| ready_callback.pp_completion_callback())) {
|
| - ErrorInfo error_info;
|
| - error_info.SetReport(ERROR_UNKNOWN,
|
| - "PnaclCoordinator: Failed to download file: " +
|
| - resource_urls_[i] + "\n");
|
| - coordinator_->ReportLoadError(error_info);
|
| - coordinator_->PnaclNonPpapiError();
|
| + coordinator_->ReportNonPpapiError(
|
| + "PnaclCoordinator: Failed to download file: " +
|
| + resource_urls_[i] + "\n");
|
| break;
|
| }
|
| + PLUGIN_PRINTF(("PnaclResources::StartDownloads === invoked SAF\n"));
|
| }
|
| resource_urls_.clear();
|
| }
|
| @@ -95,7 +95,8 @@
|
| full_url,
|
| "resource " + url);
|
| if (fd < 0) {
|
| - coordinator_->PnaclPpapiError(pp_error);
|
| + coordinator_->ReportPpapiError(pp_error,
|
| + "PnaclResources: get fd failed.\n");
|
| } else {
|
| resource_wrappers_[url] =
|
| plugin_->wrapper_factory()->MakeFileDesc(fd, O_RDONLY);
|
|
|