OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/common/nacl_types.h" | 5 #include "components/nacl/common/nacl_types.h" |
6 #include "ipc/ipc_platform_file.h" | 6 #include "ipc/ipc_platform_file.h" |
7 | 7 |
8 namespace nacl { | 8 namespace nacl { |
9 | 9 |
10 NaClStartParams::NaClStartParams() | 10 NaClStartParams::NaClStartParams() |
11 : nexe_file(IPC::InvalidPlatformFileForTransit()), | 11 : nexe_file(IPC::InvalidPlatformFileForTransit()), |
12 nexe_token_lo(0), | 12 nexe_token_lo(0), |
13 nexe_token_hi(0), | 13 nexe_token_hi(0), |
14 validation_cache_enabled(false), | 14 validation_cache_enabled(false), |
15 enable_exception_handling(false), | 15 enable_exception_handling(false), |
16 enable_debug_stub(false), | 16 enable_debug_stub(false), |
17 enable_ipc_proxy(false), | 17 enable_ipc_proxy(false), |
18 uses_irt(false), | 18 uses_irt(false), |
19 enable_dyncode_syscalls(false) { | 19 enable_dyncode_syscalls(false), |
| 20 crash_info_shmem_handle(base::SharedMemory::NULLHandle()) { |
20 } | 21 } |
21 | 22 |
22 NaClStartParams::~NaClStartParams() { | 23 NaClStartParams::~NaClStartParams() { |
23 } | 24 } |
24 | 25 |
25 NaClLaunchParams::NaClLaunchParams() | 26 NaClLaunchParams::NaClLaunchParams() |
26 : nexe_file(IPC::InvalidPlatformFileForTransit()), | 27 : nexe_file(IPC::InvalidPlatformFileForTransit()), |
27 nexe_token_lo(0), | 28 nexe_token_lo(0), |
28 nexe_token_hi(0), | 29 nexe_token_hi(0), |
29 render_view_id(0), | 30 render_view_id(0), |
(...skipping 30 matching lines...) Expand all Loading... |
60 } | 61 } |
61 | 62 |
62 NaClLaunchParams::~NaClLaunchParams() { | 63 NaClLaunchParams::~NaClLaunchParams() { |
63 } | 64 } |
64 | 65 |
65 NaClLaunchResult::NaClLaunchResult() | 66 NaClLaunchResult::NaClLaunchResult() |
66 : imc_channel_handle(IPC::InvalidPlatformFileForTransit()), | 67 : imc_channel_handle(IPC::InvalidPlatformFileForTransit()), |
67 ppapi_ipc_channel_handle(), | 68 ppapi_ipc_channel_handle(), |
68 trusted_ipc_channel_handle(), | 69 trusted_ipc_channel_handle(), |
69 plugin_pid(base::kNullProcessId), | 70 plugin_pid(base::kNullProcessId), |
70 plugin_child_id(0) { | 71 plugin_child_id(0), |
| 72 crash_info_shmem_handle(base::SharedMemory::NULLHandle()) { |
71 } | 73 } |
72 | 74 |
73 NaClLaunchResult::NaClLaunchResult( | 75 NaClLaunchResult::NaClLaunchResult( |
74 FileDescriptor imc_channel_handle, | 76 FileDescriptor imc_channel_handle, |
75 const IPC::ChannelHandle& ppapi_ipc_channel_handle, | 77 const IPC::ChannelHandle& ppapi_ipc_channel_handle, |
76 const IPC::ChannelHandle& trusted_ipc_channel_handle, | 78 const IPC::ChannelHandle& trusted_ipc_channel_handle, |
77 const IPC::ChannelHandle& manifest_service_ipc_channel_handle, | 79 const IPC::ChannelHandle& manifest_service_ipc_channel_handle, |
78 base::ProcessId plugin_pid, | 80 base::ProcessId plugin_pid, |
79 int plugin_child_id) | 81 int plugin_child_id, |
| 82 base::SharedMemoryHandle crash_info_shmem_handle) |
80 : imc_channel_handle(imc_channel_handle), | 83 : imc_channel_handle(imc_channel_handle), |
81 ppapi_ipc_channel_handle(ppapi_ipc_channel_handle), | 84 ppapi_ipc_channel_handle(ppapi_ipc_channel_handle), |
82 trusted_ipc_channel_handle(trusted_ipc_channel_handle), | 85 trusted_ipc_channel_handle(trusted_ipc_channel_handle), |
83 manifest_service_ipc_channel_handle(manifest_service_ipc_channel_handle), | 86 manifest_service_ipc_channel_handle(manifest_service_ipc_channel_handle), |
84 plugin_pid(plugin_pid), | 87 plugin_pid(plugin_pid), |
85 plugin_child_id(plugin_child_id) { | 88 plugin_child_id(plugin_child_id), |
| 89 crash_info_shmem_handle(crash_info_shmem_handle) { |
86 } | 90 } |
87 | 91 |
88 NaClLaunchResult::~NaClLaunchResult() { | 92 NaClLaunchResult::~NaClLaunchResult() { |
89 } | 93 } |
90 | 94 |
91 } // namespace nacl | 95 } // namespace nacl |
OLD | NEW |