Chromium Code Reviews| Index: ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc |
| diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc |
| index 860a67ebacd78d359e5433ea9f2d949c0d562184..0bc8b8ec07a75eccc45cc9604c9974d35bbc02be 100644 |
| --- a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc |
| +++ b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc |
| @@ -426,30 +426,6 @@ void PnaclCoordinator::NexeReadDidOpen(int32_t pp_error) { |
| translate_notify_callback_.Run(pp_error); |
| } |
| -void PnaclCoordinator::DidCheckPnaclInstalled(int32_t pp_error) { |
| - if (pp_error != PP_OK) { |
| - ReportNonPpapiError( |
| - ERROR_PNACL_RESOURCE_FETCH, |
| - nacl::string("The Portable Native Client (pnacl) component is not " |
| - "installed. Please consult chrome://components for more " |
| - "information.")); |
| - return; |
| - } |
| - |
| - // Loading resources (e.g. llc and ld nexes) is done with PnaclResources. |
| - resources_.reset(new PnaclResources(plugin_, |
| - this, |
| - this->manifest_.get())); |
| - CHECK(resources_ != NULL); |
| - |
| - // The first step of loading resources: read the resource info file. |
| - pp::CompletionCallback resource_info_read_cb = |
| - callback_factory_.NewCallback( |
| - &PnaclCoordinator::ResourceInfoWasRead); |
| - resources_->ReadResourceInfo(PnaclUrls::GetResourceInfoUrl(), |
|
cpu_(ooo_6.6-7.5)
2013/11/01 17:28:59
don't know where this moved to, just pointing it o
jvoung (off chromium)
2013/11/01 21:56:13
This was moved to line 527 (where it originally st
|
| - resource_info_read_cb); |
| -} |
| - |
| void PnaclCoordinator::ResourceInfoWasRead(int32_t pp_error) { |
| PLUGIN_PRINTF(("PluginCoordinator::ResourceInfoWasRead (pp_error=%" |
| NACL_PRId32 ")\n", pp_error)); |
| @@ -539,14 +515,17 @@ void PnaclCoordinator::BitcodeStreamDidOpen(int32_t pp_error) { |
| return; |
| } |
| - // Now that we've started the url request for the response headers and |
| - // for tickling the component updater's On-Demand API, check that the |
| - // compiler is present, or block until it is present or an error is hit. |
| - pp::CompletionCallback pnacl_installed_cb = |
| - callback_factory_.NewCallback(&PnaclCoordinator::DidCheckPnaclInstalled); |
| - plugin_->nacl_interface()->EnsurePnaclInstalled( |
| - plugin_->pp_instance(), |
| - pnacl_installed_cb.pp_completion_callback()); |
| + // The component updater's resource throttles + OnDemand update/install |
| + // should block the URL request until the compiler is present. Now we |
| + // can load the resources (e.g. llc and ld nexes). |
| + resources_.reset(new PnaclResources(plugin_, this, this->manifest_.get())); |
| + CHECK(resources_ != NULL); |
| + |
| + // The first step of loading resources: read the resource info file. |
| + pp::CompletionCallback resource_info_read_cb = |
| + callback_factory_.NewCallback(&PnaclCoordinator::ResourceInfoWasRead); |
| + resources_->ReadResourceInfo(PnaclUrls::GetResourceInfoUrl(), |
| + resource_info_read_cb); |
| } |
| void PnaclCoordinator::NexeFdDidOpen(int32_t pp_error) { |