OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 * Copyright (c) 2012 The Chromium Authors. All rights reserved. |
3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
5 */ | 5 */ |
6 | 6 |
7 #define NACL_LOG_MODULE_NAME "Plugin_ServiceRuntime" | 7 #define NACL_LOG_MODULE_NAME "Plugin_ServiceRuntime" |
8 | 8 |
9 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h" | 9 #include "components/nacl/renderer/plugin/service_runtime.h" |
10 | 10 |
11 #include <string.h> | 11 #include <string.h> |
12 #include <string> | 12 #include <string> |
13 #include <utility> | 13 #include <utility> |
14 | 14 |
15 #include "base/compiler_specific.h" | 15 #include "base/compiler_specific.h" |
16 | 16 #include "components/nacl/renderer/plugin/plugin.h" |
| 17 #include "components/nacl/renderer/plugin/plugin_error.h" |
| 18 #include "components/nacl/renderer/plugin/pnacl_resources.h" |
| 19 #include "components/nacl/renderer/plugin/sel_ldr_launcher_chrome.h" |
| 20 #include "components/nacl/renderer/plugin/srpc_client.h" |
| 21 #include "components/nacl/renderer/plugin/utility.h" |
| 22 #include "native_client/src/include/nacl_macros.h" |
| 23 #include "native_client/src/include/nacl_scoped_ptr.h" |
17 #include "native_client/src/include/portability_io.h" | 24 #include "native_client/src/include/portability_io.h" |
18 #include "native_client/src/include/portability_string.h" | 25 #include "native_client/src/include/portability_string.h" |
19 #include "native_client/src/include/nacl_macros.h" | 26 #include "native_client/src/public/imc_types.h" |
20 #include "native_client/src/include/nacl_scoped_ptr.h" | 27 #include "native_client/src/public/nacl_file_info.h" |
21 #include "native_client/src/shared/platform/nacl_check.h" | 28 #include "native_client/src/shared/platform/nacl_check.h" |
22 #include "native_client/src/shared/platform/nacl_log.h" | 29 #include "native_client/src/shared/platform/nacl_log.h" |
23 #include "native_client/src/shared/platform/nacl_sync.h" | 30 #include "native_client/src/shared/platform/nacl_sync.h" |
24 #include "native_client/src/shared/platform/nacl_sync_checked.h" | 31 #include "native_client/src/shared/platform/nacl_sync_checked.h" |
25 #include "native_client/src/shared/platform/nacl_sync_raii.h" | 32 #include "native_client/src/shared/platform/nacl_sync_raii.h" |
26 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h" | 33 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h" |
27 | |
28 #include "native_client/src/public/imc_types.h" | |
29 #include "native_client/src/public/nacl_file_info.h" | |
30 #include "native_client/src/trusted/service_runtime/nacl_error_code.h" | 34 #include "native_client/src/trusted/service_runtime/nacl_error_code.h" |
31 | |
32 #include "ppapi/c/pp_errors.h" | 35 #include "ppapi/c/pp_errors.h" |
| 36 #include "ppapi/cpp/completion_callback.h" |
33 #include "ppapi/cpp/core.h" | 37 #include "ppapi/cpp/core.h" |
34 #include "ppapi/cpp/completion_callback.h" | |
35 | |
36 #include "ppapi/native_client/src/trusted/plugin/plugin.h" | |
37 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h" | |
38 #include "ppapi/native_client/src/trusted/plugin/pnacl_resources.h" | |
39 #include "ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h" | |
40 #include "ppapi/native_client/src/trusted/plugin/srpc_client.h" | |
41 #include "ppapi/native_client/src/trusted/plugin/utility.h" | |
42 | 38 |
43 namespace plugin { | 39 namespace plugin { |
44 | 40 |
45 ServiceRuntime::ServiceRuntime(Plugin* plugin, | 41 ServiceRuntime::ServiceRuntime(Plugin* plugin, |
46 PP_Instance pp_instance, | 42 PP_Instance pp_instance, |
47 bool main_service_runtime, | 43 bool main_service_runtime, |
48 bool uses_nonsfi_mode) | 44 bool uses_nonsfi_mode) |
49 : plugin_(plugin), | 45 : plugin_(plugin), |
50 pp_instance_(pp_instance), | 46 pp_instance_(pp_instance), |
51 main_service_runtime_(main_service_runtime), | 47 main_service_runtime_(main_service_runtime), |
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
296 NaClLog(4, "ServiceRuntime::~ServiceRuntime (this=%p)\n", | 292 NaClLog(4, "ServiceRuntime::~ServiceRuntime (this=%p)\n", |
297 static_cast<void*>(this)); | 293 static_cast<void*>(this)); |
298 // We do this just in case Shutdown() was not called. | 294 // We do this just in case Shutdown() was not called. |
299 subprocess_.reset(NULL); | 295 subprocess_.reset(NULL); |
300 | 296 |
301 NaClCondVarDtor(&cond_); | 297 NaClCondVarDtor(&cond_); |
302 NaClMutexDtor(&mu_); | 298 NaClMutexDtor(&mu_); |
303 } | 299 } |
304 | 300 |
305 } // namespace plugin | 301 } // namespace plugin |
OLD | NEW |