| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/nacl/renderer/plugin/pnacl_resources.h" | 5 #include "components/nacl/renderer/plugin/pnacl_resources.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 pp::Var ld_tool_name(pp::PASS_REF, pp_ld_tool_name_var); | 70 pp::Var ld_tool_name(pp::PASS_REF, pp_ld_tool_name_var); |
| 71 pp::Var subzero_tool_name(pp::PASS_REF, pp_subzero_tool_name_var); | 71 pp::Var subzero_tool_name(pp::PASS_REF, pp_subzero_tool_name_var); |
| 72 resources_[LLC].tool_name = GetFullUrl(llc_tool_name.AsString()); | 72 resources_[LLC].tool_name = GetFullUrl(llc_tool_name.AsString()); |
| 73 resources_[LD].tool_name = GetFullUrl(ld_tool_name.AsString()); | 73 resources_[LD].tool_name = GetFullUrl(ld_tool_name.AsString()); |
| 74 resources_[SUBZERO].tool_name = GetFullUrl(subzero_tool_name.AsString()); | 74 resources_[SUBZERO].tool_name = GetFullUrl(subzero_tool_name.AsString()); |
| 75 return true; | 75 return true; |
| 76 } | 76 } |
| 77 | 77 |
| 78 | 78 |
| 79 bool PnaclResources::StartLoad() { | 79 bool PnaclResources::StartLoad() { |
| 80 PLUGIN_PRINTF(("PnaclResources::StartLoad\n")); | |
| 81 | |
| 82 // Do a blocking load of each of the resources. | 80 // Do a blocking load of each of the resources. |
| 83 std::vector<ResourceType> to_load; | 81 std::vector<ResourceType> to_load; |
| 84 if (use_subzero_) { | 82 if (use_subzero_) { |
| 85 to_load.push_back(SUBZERO); | 83 to_load.push_back(SUBZERO); |
| 86 } else { | 84 } else { |
| 87 to_load.push_back(LLC); | 85 to_load.push_back(LLC); |
| 88 } | 86 } |
| 89 to_load.push_back(LD); | 87 to_load.push_back(LD); |
| 90 bool all_valid = true; | 88 bool all_valid = true; |
| 91 for (ResourceType t : to_load) { | 89 for (ResourceType t : to_load) { |
| 92 plugin_->nacl_interface()->GetReadExecPnaclFd( | 90 plugin_->nacl_interface()->GetReadExecPnaclFd( |
| 93 resources_[t].tool_name.c_str(), &resources_[t].file_info); | 91 resources_[t].tool_name.c_str(), &resources_[t].file_info); |
| 94 all_valid = | 92 all_valid = |
| 95 all_valid && resources_[t].file_info.handle != PP_kInvalidFileHandle; | 93 all_valid && resources_[t].file_info.handle != PP_kInvalidFileHandle; |
| 96 } | 94 } |
| 97 return all_valid; | 95 return all_valid; |
| 98 } | 96 } |
| 99 | 97 |
| 100 } // namespace plugin | 98 } // namespace plugin |
| OLD | NEW |