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 "ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.h" | 5 #include "components/nacl/renderer/plugin/pnacl_translate_thread.h" |
6 | 6 |
7 #include <iterator> | 7 #include <iterator> |
8 #include <sstream> | 8 #include <sstream> |
9 | 9 |
| 10 #include "components/nacl/renderer/plugin/plugin.h" |
| 11 #include "components/nacl/renderer/plugin/plugin_error.h" |
| 12 #include "components/nacl/renderer/plugin/pnacl_resources.h" |
| 13 #include "components/nacl/renderer/plugin/srpc_params.h" |
| 14 #include "components/nacl/renderer/plugin/temporary_file.h" |
| 15 #include "components/nacl/renderer/plugin/utility.h" |
10 #include "native_client/src/shared/platform/nacl_check.h" | 16 #include "native_client/src/shared/platform/nacl_check.h" |
11 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" | 17 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" |
12 #include "ppapi/cpp/var.h" | 18 #include "ppapi/cpp/var.h" |
13 #include "ppapi/native_client/src/trusted/plugin/plugin.h" | |
14 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h" | |
15 #include "ppapi/native_client/src/trusted/plugin/pnacl_resources.h" | |
16 #include "ppapi/native_client/src/trusted/plugin/srpc_params.h" | |
17 #include "ppapi/native_client/src/trusted/plugin/temporary_file.h" | |
18 #include "ppapi/native_client/src/trusted/plugin/utility.h" | |
19 | 19 |
20 namespace plugin { | 20 namespace plugin { |
21 namespace { | 21 namespace { |
22 | 22 |
23 template <typename Val> | 23 template <typename Val> |
24 std::string MakeCommandLineArg(const char* key, const Val val) { | 24 std::string MakeCommandLineArg(const char* key, const Val val) { |
25 std::stringstream ss; | 25 std::stringstream ss; |
26 ss << key << val; | 26 ss << key << val; |
27 return ss.str(); | 27 return ss.str(); |
28 } | 28 } |
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
434 AbortSubprocesses(); | 434 AbortSubprocesses(); |
435 if (translate_thread_ != NULL) | 435 if (translate_thread_ != NULL) |
436 NaClThreadJoin(translate_thread_.get()); | 436 NaClThreadJoin(translate_thread_.get()); |
437 PLUGIN_PRINTF(("~PnaclTranslateThread joined\n")); | 437 PLUGIN_PRINTF(("~PnaclTranslateThread joined\n")); |
438 NaClCondVarDtor(&buffer_cond_); | 438 NaClCondVarDtor(&buffer_cond_); |
439 NaClMutexDtor(&cond_mu_); | 439 NaClMutexDtor(&cond_mu_); |
440 NaClMutexDtor(&subprocess_mu_); | 440 NaClMutexDtor(&subprocess_mu_); |
441 } | 441 } |
442 | 442 |
443 } // namespace plugin | 443 } // namespace plugin |
OLD | NEW |