Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Side by Side Diff: components/nacl/common/nacl_messages.h

Issue 1125043002: NaCl: Stop sending resource FDs with NaClProcessMsg_Start (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: git rebase master Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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(prefetched_resource_files)
21 IPC_STRUCT_TRAITS_MEMBER(imc_bootstrap_handle) 20 IPC_STRUCT_TRAITS_MEMBER(imc_bootstrap_handle)
22 IPC_STRUCT_TRAITS_MEMBER(irt_handle) 21 IPC_STRUCT_TRAITS_MEMBER(irt_handle)
23 #if defined(OS_MACOSX) 22 #if defined(OS_MACOSX)
24 IPC_STRUCT_TRAITS_MEMBER(mac_shm_fd) 23 IPC_STRUCT_TRAITS_MEMBER(mac_shm_fd)
25 #endif 24 #endif
26 #if defined(OS_POSIX) 25 #if defined(OS_POSIX)
27 IPC_STRUCT_TRAITS_MEMBER(debug_stub_server_bound_socket) 26 IPC_STRUCT_TRAITS_MEMBER(debug_stub_server_bound_socket)
28 #endif 27 #endif
29 IPC_STRUCT_TRAITS_MEMBER(validation_cache_enabled) 28 IPC_STRUCT_TRAITS_MEMBER(validation_cache_enabled)
30 IPC_STRUCT_TRAITS_MEMBER(validation_cache_key) 29 IPC_STRUCT_TRAITS_MEMBER(validation_cache_key)
(...skipping 10 matching lines...) Expand all
41 IPC_STRUCT_TRAITS_MEMBER(file_key) 40 IPC_STRUCT_TRAITS_MEMBER(file_key)
42 IPC_STRUCT_TRAITS_END() 41 IPC_STRUCT_TRAITS_END()
43 42
44 //----------------------------------------------------------------------------- 43 //-----------------------------------------------------------------------------
45 // NaClProcess messages 44 // NaClProcess messages
46 // These are messages sent between the browser and the NaCl process. 45 // These are messages sent between the browser and the NaCl process.
47 // Tells the NaCl process to start. 46 // Tells the NaCl process to start.
48 IPC_MESSAGE_CONTROL1(NaClProcessMsg_Start, 47 IPC_MESSAGE_CONTROL1(NaClProcessMsg_Start,
49 nacl::NaClStartParams /* params */) 48 nacl::NaClStartParams /* params */)
50 49
50 // Sends prefetched resource files to a NaCl loader process.
Mark Seaborn 2015/05/08 00:35:36 Can you document the ordering here? Which message
Yusuke Sato 2015/05/08 15:12:35 Done.
51 IPC_MESSAGE_CONTROL1(NaClProcessMsg_SetPrefetchedResource,
Mark Seaborn 2015/05/08 00:35:36 Naming nit: How about "Add" rather than "Set"?
Yusuke Sato 2015/05/08 15:12:35 Done.
52 std::vector<nacl::NaClResourcePrefetchResult>)
53
51 #if defined(OS_WIN) 54 #if defined(OS_WIN)
52 // Tells the NaCl broker to launch a NaCl loader process. 55 // Tells the NaCl broker to launch a NaCl loader process.
53 IPC_MESSAGE_CONTROL1(NaClProcessMsg_LaunchLoaderThroughBroker, 56 IPC_MESSAGE_CONTROL1(NaClProcessMsg_LaunchLoaderThroughBroker,
54 std::string /* channel ID for the loader */) 57 std::string /* channel ID for the loader */)
55 58
56 // Notify the browser process that the loader was launched successfully. 59 // Notify the browser process that the loader was launched successfully.
57 IPC_MESSAGE_CONTROL2(NaClProcessMsg_LoaderLaunched, 60 IPC_MESSAGE_CONTROL2(NaClProcessMsg_LoaderLaunched,
58 std::string, /* channel ID for the loader */ 61 std::string, /* channel ID for the loader */
59 base::ProcessHandle /* loader process handle */) 62 base::ProcessHandle /* loader process handle */)
60 63
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 IPC::PlatformFileForTransit, /* fd */ 114 IPC::PlatformFileForTransit, /* fd */
112 base::FilePath /* Path opened to get fd */) 115 base::FilePath /* Path opened to get fd */)
113 116
114 // Notify the browser process that the server side of the PPAPI channel was 117 // Notify the browser process that the server side of the PPAPI channel was
115 // created successfully. 118 // created successfully.
116 IPC_MESSAGE_CONTROL4(NaClProcessHostMsg_PpapiChannelsCreated, 119 IPC_MESSAGE_CONTROL4(NaClProcessHostMsg_PpapiChannelsCreated,
117 IPC::ChannelHandle, /* browser_channel_handle */ 120 IPC::ChannelHandle, /* browser_channel_handle */
118 IPC::ChannelHandle, /* ppapi_renderer_channel_handle */ 121 IPC::ChannelHandle, /* ppapi_renderer_channel_handle */
119 IPC::ChannelHandle, /* trusted_renderer_channel_handle */ 122 IPC::ChannelHandle, /* trusted_renderer_channel_handle */
120 IPC::ChannelHandle /* manifest_service_channel_handle */) 123 IPC::ChannelHandle /* manifest_service_channel_handle */)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698