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 // Multiply-included file, no traditional include guard. | 5 // Multiply-included file, no traditional include guard. |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/process/process.h" | 10 #include "base/process/process.h" |
11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
12 #include "components/nacl/common/nacl_types.h" | 12 #include "components/nacl/common/nacl_types.h" |
13 #include "components/nacl/common/pnacl_types.h" | 13 #include "components/nacl/common/pnacl_types.h" |
14 #include "content/public/common/common_param_traits.h" | 14 #include "content/public/common/common_param_traits.h" |
15 #include "ipc/ipc_channel_handle.h" | 15 #include "ipc/ipc_channel_handle.h" |
16 #include "ipc/ipc_message_macros.h" | 16 #include "ipc/ipc_message_macros.h" |
17 #include "ipc/ipc_platform_file.h" | 17 #include "ipc/ipc_platform_file.h" |
18 #include "url/gurl.h" | 18 #include "url/gurl.h" |
19 | 19 |
20 #define IPC_MESSAGE_START NaClHostMsgStart | 20 #define IPC_MESSAGE_START NaClHostMsgStart |
21 | 21 |
22 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchParams) | 22 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchParams) |
23 IPC_STRUCT_TRAITS_MEMBER(manifest_url) | 23 IPC_STRUCT_TRAITS_MEMBER(manifest_url) |
24 IPC_STRUCT_TRAITS_MEMBER(render_view_id) | 24 IPC_STRUCT_TRAITS_MEMBER(render_view_id) |
25 IPC_STRUCT_TRAITS_MEMBER(permission_bits) | 25 IPC_STRUCT_TRAITS_MEMBER(permission_bits) |
26 IPC_STRUCT_TRAITS_MEMBER(uses_irt) | 26 IPC_STRUCT_TRAITS_MEMBER(uses_irt) |
27 IPC_STRUCT_TRAITS_MEMBER(enable_dyncode_syscalls) | 27 IPC_STRUCT_TRAITS_MEMBER(enable_dyncode_syscalls) |
28 IPC_STRUCT_TRAITS_MEMBER(enable_exception_handling) | 28 IPC_STRUCT_TRAITS_MEMBER(enable_exception_handling) |
29 IPC_STRUCT_TRAITS_MEMBER(enable_crash_throttling) | 29 IPC_STRUCT_TRAITS_MEMBER(enable_crash_throttling) |
30 IPC_STRUCT_TRAITS_MEMBER(enable_nonsfi) | |
Mark Seaborn
2014/02/27 17:10:22
Can we call this "enable_nonsfi_mode", to match th
hidehiko
2014/02/28 06:41:54
Renamed to uses_nonsfi_mode
| |
30 IPC_STRUCT_TRAITS_END() | 31 IPC_STRUCT_TRAITS_END() |
31 | 32 |
32 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchResult) | 33 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchResult) |
33 IPC_STRUCT_TRAITS_MEMBER(imc_channel_handle) | 34 IPC_STRUCT_TRAITS_MEMBER(imc_channel_handle) |
34 IPC_STRUCT_TRAITS_MEMBER(ppapi_ipc_channel_handle) | 35 IPC_STRUCT_TRAITS_MEMBER(ppapi_ipc_channel_handle) |
35 IPC_STRUCT_TRAITS_MEMBER(trusted_ipc_channel_handle) | 36 IPC_STRUCT_TRAITS_MEMBER(trusted_ipc_channel_handle) |
36 IPC_STRUCT_TRAITS_MEMBER(plugin_pid) | 37 IPC_STRUCT_TRAITS_MEMBER(plugin_pid) |
37 IPC_STRUCT_TRAITS_MEMBER(plugin_child_id) | 38 IPC_STRUCT_TRAITS_MEMBER(plugin_child_id) |
38 IPC_STRUCT_TRAITS_END() | 39 IPC_STRUCT_TRAITS_END() |
39 | 40 |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
98 // open a NaCl executable file from an installed application directory. | 99 // open a NaCl executable file from an installed application directory. |
99 IPC_SYNC_MESSAGE_CONTROL2_3(NaClHostMsg_OpenNaClExecutable, | 100 IPC_SYNC_MESSAGE_CONTROL2_3(NaClHostMsg_OpenNaClExecutable, |
100 int /* render_view_id */, | 101 int /* render_view_id */, |
101 GURL /* URL of NaCl executable file */, | 102 GURL /* URL of NaCl executable file */, |
102 IPC::PlatformFileForTransit /* output file */, | 103 IPC::PlatformFileForTransit /* output file */, |
103 uint64 /* file_token_lo */, | 104 uint64 /* file_token_lo */, |
104 uint64 /* file_token_hi */) | 105 uint64 /* file_token_hi */) |
105 | 106 |
106 IPC_SYNC_MESSAGE_CONTROL0_1(NaClHostMsg_NaClGetNumProcessors, | 107 IPC_SYNC_MESSAGE_CONTROL0_1(NaClHostMsg_NaClGetNumProcessors, |
107 int /* Number of processors */) | 108 int /* Number of processors */) |
109 | |
110 IPC_SYNC_MESSAGE_CONTROL0_1(NaClHostMsg_NaClIsNonSFIEnabled, | |
111 bool /* enabled */) | |
OLD | NEW |