Chromium Code Reviews Chromium Code Reviews
Issue 1051243002:
Non-SFI: move socketpair() from plugin process to browser process. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| 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 // Defines messages between the browser and NaCl process. | 5 // Defines messages between the browser and NaCl process. |
| 6 | 6 |
| 7 // Multiply-included message file, no traditional include guard. | 7 // Multiply-included message file, no traditional include guard. |
| 8 #include "base/process/process.h" | 8 #include "base/process/process.h" |
| 9 #include "components/nacl/common/nacl_types.h" | 9 #include "components/nacl/common/nacl_types.h" |
| 10 #include "components/nacl/common/nacl_types_param_traits.h" | 10 #include "components/nacl/common/nacl_types_param_traits.h" |
| 11 #include "ipc/ipc_channel_handle.h" | 11 #include "ipc/ipc_channel_handle.h" |
| 12 #include "ipc/ipc_message_macros.h" | 12 #include "ipc/ipc_message_macros.h" |
| 13 #include "ipc/ipc_platform_file.h" | 13 #include "ipc/ipc_platform_file.h" |
| 14 | 14 |
| 15 #define IPC_MESSAGE_START NaClMsgStart | 15 #define IPC_MESSAGE_START NaClMsgStart |
| 16 | 16 |
| 17 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClStartParams) | 17 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClStartParams) |
| 18 IPC_STRUCT_TRAITS_MEMBER(nexe_file) | 18 IPC_STRUCT_TRAITS_MEMBER(nexe_file) |
| 19 IPC_STRUCT_TRAITS_MEMBER(nexe_file_path_metadata) | 19 IPC_STRUCT_TRAITS_MEMBER(nexe_file_path_metadata) |
| 20 IPC_STRUCT_TRAITS_MEMBER(imc_bootstrap_handle) | 20 IPC_STRUCT_TRAITS_MEMBER(imc_bootstrap_handle) |
| 21 IPC_STRUCT_TRAITS_MEMBER(irt_handle) | 21 IPC_STRUCT_TRAITS_MEMBER(irt_handle) |
| 22 #if defined(OS_MACOSX) | 22 #if defined(OS_MACOSX) |
| 23 IPC_STRUCT_TRAITS_MEMBER(mac_shm_fd) | 23 IPC_STRUCT_TRAITS_MEMBER(mac_shm_fd) |
| 24 #endif | 24 #endif |
| 25 #if defined(OS_POSIX) | 25 #if defined(OS_POSIX) |
| 26 IPC_STRUCT_TRAITS_MEMBER(debug_stub_server_bound_socket) | 26 IPC_STRUCT_TRAITS_MEMBER(debug_stub_server_bound_socket) |
| 27 #endif | 27 #endif |
| 28 #if defined(OS_LINUX) || defined(OS_NACL_NONSFI) | |
| 29 IPC_STRUCT_TRAITS_MEMBER(ppapi_browser_channel_handle) | |
| 30 IPC_STRUCT_TRAITS_MEMBER(ppapi_renderer_channel_handle) | |
| 31 IPC_STRUCT_TRAITS_MEMBER(trusted_service_channel_handle) | |
| 32 IPC_STRUCT_TRAITS_MEMBER(manifest_service_channel_handle) | |
| 33 #endif // defined(OS_LINUX) || defined(OS_NACL_NONSFI) | |
|
Mark Seaborn
2015/05/13 06:51:11
Nit: As before, you don't need this comment on suc
hidehiko
2015/05/13 14:44:48
Oh, you meant here, too. Done.
| |
| 28 IPC_STRUCT_TRAITS_MEMBER(validation_cache_enabled) | 34 IPC_STRUCT_TRAITS_MEMBER(validation_cache_enabled) |
| 29 IPC_STRUCT_TRAITS_MEMBER(validation_cache_key) | 35 IPC_STRUCT_TRAITS_MEMBER(validation_cache_key) |
| 30 IPC_STRUCT_TRAITS_MEMBER(version) | 36 IPC_STRUCT_TRAITS_MEMBER(version) |
| 31 IPC_STRUCT_TRAITS_MEMBER(enable_debug_stub) | 37 IPC_STRUCT_TRAITS_MEMBER(enable_debug_stub) |
| 32 IPC_STRUCT_TRAITS_MEMBER(enable_ipc_proxy) | 38 IPC_STRUCT_TRAITS_MEMBER(enable_ipc_proxy) |
| 33 IPC_STRUCT_TRAITS_MEMBER(process_type) | 39 IPC_STRUCT_TRAITS_MEMBER(process_type) |
| 34 IPC_STRUCT_TRAITS_MEMBER(crash_info_shmem_handle) | 40 IPC_STRUCT_TRAITS_MEMBER(crash_info_shmem_handle) |
| 35 IPC_STRUCT_TRAITS_END() | 41 IPC_STRUCT_TRAITS_END() |
| 36 | 42 |
| 37 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClResourcePrefetchResult) | 43 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClResourcePrefetchResult) |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 117 IPC::PlatformFileForTransit, /* fd */ | 123 IPC::PlatformFileForTransit, /* fd */ |
| 118 base::FilePath /* Path opened to get fd */) | 124 base::FilePath /* Path opened to get fd */) |
| 119 | 125 |
| 120 // Notify the browser process that the server side of the PPAPI channel was | 126 // Notify the browser process that the server side of the PPAPI channel was |
| 121 // created successfully. | 127 // created successfully. |
| 122 IPC_MESSAGE_CONTROL4(NaClProcessHostMsg_PpapiChannelsCreated, | 128 IPC_MESSAGE_CONTROL4(NaClProcessHostMsg_PpapiChannelsCreated, |
| 123 IPC::ChannelHandle, /* browser_channel_handle */ | 129 IPC::ChannelHandle, /* browser_channel_handle */ |
| 124 IPC::ChannelHandle, /* ppapi_renderer_channel_handle */ | 130 IPC::ChannelHandle, /* ppapi_renderer_channel_handle */ |
| 125 IPC::ChannelHandle, /* trusted_renderer_channel_handle */ | 131 IPC::ChannelHandle, /* trusted_renderer_channel_handle */ |
| 126 IPC::ChannelHandle /* manifest_service_channel_handle */) | 132 IPC::ChannelHandle /* manifest_service_channel_handle */) |
| OLD | NEW |
