| 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 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_ | 5 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_ |
| 6 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_ | 6 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 // Set to true when the translation (if applicable) is finished and the nexe | 194 // Set to true when the translation (if applicable) is finished and the nexe |
| 195 // file is loaded, (or when there was an error), and the browser has been | 195 // file is loaded, (or when there was an error), and the browser has been |
| 196 // notified via ReportTranslationFinished. If it is not set before | 196 // notified via ReportTranslationFinished. If it is not set before |
| 197 // plugin/coordinator destruction, the destructor will call | 197 // plugin/coordinator destruction, the destructor will call |
| 198 // ReportTranslationFinished. | 198 // ReportTranslationFinished. |
| 199 bool translation_finished_reported_; | 199 bool translation_finished_reported_; |
| 200 // Threadsafety is required to support file lookups. | 200 // Threadsafety is required to support file lookups. |
| 201 pp::CompletionCallbackFactory<PnaclCoordinator, | 201 pp::CompletionCallbackFactory<PnaclCoordinator, |
| 202 pp::ThreadSafeThreadTraits> callback_factory_; | 202 pp::ThreadSafeThreadTraits> callback_factory_; |
| 203 | 203 |
| 204 // The manifest used by resource loading and ld + llc's reverse service | |
| 205 // to look up objects and libraries. | |
| 206 int32_t manifest_id_; | |
| 207 // An auxiliary class that manages downloaded resources (llc and ld nexes). | 204 // An auxiliary class that manages downloaded resources (llc and ld nexes). |
| 208 nacl::scoped_ptr<PnaclResources> resources_; | 205 nacl::scoped_ptr<PnaclResources> resources_; |
| 209 | 206 |
| 210 // The URL for the pexe file. | 207 // The URL for the pexe file. |
| 211 nacl::string pexe_url_; | 208 nacl::string pexe_url_; |
| 212 // Options for translation. | 209 // Options for translation. |
| 213 PP_PNaClOptions pnacl_options_; | 210 PP_PNaClOptions pnacl_options_; |
| 214 // Architecture-specific attributes used for translation. These are | 211 // Architecture-specific attributes used for translation. These are |
| 215 // supplied by Chrome, not the developer, and are therefore different | 212 // supplied by Chrome, not the developer, and are therefore different |
| 216 // from PNaCl options. | 213 // from PNaCl options. |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 // The helper thread used to do translations via SRPC. | 245 // The helper thread used to do translations via SRPC. |
| 249 // It accesses fields of PnaclCoordinator so it must have a | 246 // It accesses fields of PnaclCoordinator so it must have a |
| 250 // shorter lifetime. | 247 // shorter lifetime. |
| 251 nacl::scoped_ptr<PnaclTranslateThread> translate_thread_; | 248 nacl::scoped_ptr<PnaclTranslateThread> translate_thread_; |
| 252 }; | 249 }; |
| 253 | 250 |
| 254 //---------------------------------------------------------------------- | 251 //---------------------------------------------------------------------- |
| 255 | 252 |
| 256 } // namespace plugin; | 253 } // namespace plugin; |
| 257 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_ | 254 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_ |
| OLD | NEW |