| 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 // notified via ReportTranslationFinished. If it is not set before | 197 // notified via ReportTranslationFinished. If it is not set before |
| 198 // plugin/coordinator destruction, the destructor will call | 198 // plugin/coordinator destruction, the destructor will call |
| 199 // ReportTranslationFinished. | 199 // ReportTranslationFinished. |
| 200 bool translation_finished_reported_; | 200 bool translation_finished_reported_; |
| 201 // Threadsafety is required to support file lookups. | 201 // Threadsafety is required to support file lookups. |
| 202 pp::CompletionCallbackFactory<PnaclCoordinator, | 202 pp::CompletionCallbackFactory<PnaclCoordinator, |
| 203 pp::ThreadSafeThreadTraits> callback_factory_; | 203 pp::ThreadSafeThreadTraits> callback_factory_; |
| 204 | 204 |
| 205 // The manifest used by resource loading and ld + llc's reverse service | 205 // The manifest used by resource loading and ld + llc's reverse service |
| 206 // to look up objects and libraries. | 206 // to look up objects and libraries. |
| 207 nacl::scoped_ptr<const Manifest> manifest_; | 207 int32_t manifest_id_; |
| 208 // An auxiliary class that manages downloaded resources (llc and ld nexes). | 208 // An auxiliary class that manages downloaded resources (llc and ld nexes). |
| 209 nacl::scoped_ptr<PnaclResources> resources_; | 209 nacl::scoped_ptr<PnaclResources> resources_; |
| 210 | 210 |
| 211 // The URL for the pexe file. | 211 // The URL for the pexe file. |
| 212 nacl::string pexe_url_; | 212 nacl::string pexe_url_; |
| 213 // Options for translation. | 213 // Options for translation. |
| 214 PP_PNaClOptions pnacl_options_; | 214 PP_PNaClOptions pnacl_options_; |
| 215 | 215 |
| 216 // Object file, produced by the translator and consumed by the linker. | 216 // Object file, produced by the translator and consumed by the linker. |
| 217 std::vector<TempFile*> obj_files_; | 217 std::vector<TempFile*> obj_files_; |
| (...skipping 27 matching lines...) Expand all Loading... |
| 245 // The helper thread used to do translations via SRPC. | 245 // The helper thread used to do translations via SRPC. |
| 246 // It accesses fields of PnaclCoordinator so it must have a | 246 // It accesses fields of PnaclCoordinator so it must have a |
| 247 // shorter lifetime. | 247 // shorter lifetime. |
| 248 nacl::scoped_ptr<PnaclTranslateThread> translate_thread_; | 248 nacl::scoped_ptr<PnaclTranslateThread> translate_thread_; |
| 249 }; | 249 }; |
| 250 | 250 |
| 251 //---------------------------------------------------------------------- | 251 //---------------------------------------------------------------------- |
| 252 | 252 |
| 253 } // namespace plugin; | 253 } // namespace plugin; |
| 254 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_ | 254 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_ |
| OLD | NEW |