| 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 #ifndef COMPONENTS_NACL_COMMON_NACL_TYPES_H_ | 5 #ifndef COMPONENTS_NACL_COMMON_NACL_TYPES_H_ |
| 6 #define COMPONENTS_NACL_COMMON_NACL_TYPES_H_ | 6 #define COMPONENTS_NACL_COMMON_NACL_TYPES_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 uint32 permission_bits; | 82 uint32 permission_bits; |
| 83 bool uses_irt; | 83 bool uses_irt; |
| 84 bool uses_nonsfi_mode; | 84 bool uses_nonsfi_mode; |
| 85 bool enable_dyncode_syscalls; | 85 bool enable_dyncode_syscalls; |
| 86 bool enable_exception_handling; | 86 bool enable_exception_handling; |
| 87 bool enable_crash_throttling; | 87 bool enable_crash_throttling; |
| 88 }; | 88 }; |
| 89 | 89 |
| 90 struct NaClLaunchResult { | 90 struct NaClLaunchResult { |
| 91 NaClLaunchResult(); | 91 NaClLaunchResult(); |
| 92 NaClLaunchResult(FileDescriptor imc_channel_handle, | 92 NaClLaunchResult( |
| 93 const IPC::ChannelHandle& ppapi_ipc_channel_handle, | 93 FileDescriptor imc_channel_handle, |
| 94 const IPC::ChannelHandle& trusted_ipc_channel_handle, | 94 const IPC::ChannelHandle& ppapi_ipc_channel_handle, |
| 95 base::ProcessId plugin_pid, | 95 const IPC::ChannelHandle& trusted_ipc_channel_handle, |
| 96 int plugin_child_id); | 96 const IPC::ChannelHandle& embedder_service_ipc_channel_handle, |
| 97 base::ProcessId plugin_pid, |
| 98 int plugin_child_id); |
| 97 ~NaClLaunchResult(); | 99 ~NaClLaunchResult(); |
| 98 | 100 |
| 99 // For plugin loader <-> renderer IMC communication. | 101 // For plugin loader <-> renderer IMC communication. |
| 100 FileDescriptor imc_channel_handle; | 102 FileDescriptor imc_channel_handle; |
| 101 | 103 |
| 102 // For plugin <-> renderer PPAPI communication. | 104 // For plugin <-> renderer PPAPI communication. |
| 103 IPC::ChannelHandle ppapi_ipc_channel_handle; | 105 IPC::ChannelHandle ppapi_ipc_channel_handle; |
| 104 | 106 |
| 105 // For plugin loader <-> renderer control communication (loading and | 107 // For plugin loader <-> renderer control communication (loading and |
| 106 // starting nexe). | 108 // starting nexe). |
| 107 IPC::ChannelHandle trusted_ipc_channel_handle; | 109 IPC::ChannelHandle trusted_ipc_channel_handle; |
| 110 |
| 111 // For plugin <-> renderer EmbedderService communication. |
| 112 IPC::ChannelHandle embedder_service_ipc_channel_handle; |
| 113 |
| 108 base::ProcessId plugin_pid; | 114 base::ProcessId plugin_pid; |
| 109 int plugin_child_id; | 115 int plugin_child_id; |
| 110 }; | 116 }; |
| 111 | 117 |
| 112 } // namespace nacl | 118 } // namespace nacl |
| 113 | 119 |
| 114 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ | 120 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ |
| OLD | NEW |