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

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

Issue 177113009: Support non-SFI mode in NaCl manifest file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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 #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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 // Parameters sent to the browser process to have it launch a NaCl process. 66 // Parameters sent to the browser process to have it launch a NaCl process.
67 // 67 //
68 // If you change this, you will also need to update the IPC serialization in 68 // If you change this, you will also need to update the IPC serialization in
69 // nacl_host_messages.h. 69 // nacl_host_messages.h.
70 struct NaClLaunchParams { 70 struct NaClLaunchParams {
71 NaClLaunchParams(); 71 NaClLaunchParams();
72 NaClLaunchParams(const std::string& u, int r, uint32 p, bool uses_irt, 72 NaClLaunchParams(const std::string& u, int r, uint32 p, bool uses_irt,
73 bool enable_dyncode_syscalls, 73 bool enable_dyncode_syscalls,
74 bool enable_exception_handling, 74 bool enable_exception_handling,
75 bool enable_crash_throttling); 75 bool enable_crash_throttling,
76 bool enable_nonsfi);
76 NaClLaunchParams(const NaClLaunchParams& l); 77 NaClLaunchParams(const NaClLaunchParams& l);
77 ~NaClLaunchParams(); 78 ~NaClLaunchParams();
78 79
79 std::string manifest_url; 80 std::string manifest_url;
80 int render_view_id; 81 int render_view_id;
81 uint32 permission_bits; 82 uint32 permission_bits;
82 bool uses_irt; 83 bool uses_irt;
83 bool enable_dyncode_syscalls; 84 bool enable_dyncode_syscalls;
84 bool enable_exception_handling; 85 bool enable_exception_handling;
85 bool enable_crash_throttling; 86 bool enable_crash_throttling;
87 bool enable_nonsfi;
86 }; 88 };
87 89
88 struct NaClLaunchResult { 90 struct NaClLaunchResult {
89 NaClLaunchResult(); 91 NaClLaunchResult();
90 NaClLaunchResult(FileDescriptor imc_channel_handle, 92 NaClLaunchResult(FileDescriptor imc_channel_handle,
91 const IPC::ChannelHandle& ppapi_ipc_channel_handle, 93 const IPC::ChannelHandle& ppapi_ipc_channel_handle,
92 const IPC::ChannelHandle& trusted_ipc_channel_handle, 94 const IPC::ChannelHandle& trusted_ipc_channel_handle,
93 base::ProcessId plugin_pid, 95 base::ProcessId plugin_pid,
94 int plugin_child_id); 96 int plugin_child_id);
95 ~NaClLaunchResult(); 97 ~NaClLaunchResult();
96 98
97 // For plugin loader <-> renderer IMC communication. 99 // For plugin loader <-> renderer IMC communication.
98 FileDescriptor imc_channel_handle; 100 FileDescriptor imc_channel_handle;
99 101
100 // For plugin <-> renderer PPAPI communication. 102 // For plugin <-> renderer PPAPI communication.
101 IPC::ChannelHandle ppapi_ipc_channel_handle; 103 IPC::ChannelHandle ppapi_ipc_channel_handle;
102 104
103 // For plugin loader <-> renderer control communication (loading and 105 // For plugin loader <-> renderer control communication (loading and
104 // starting nexe). 106 // starting nexe).
105 IPC::ChannelHandle trusted_ipc_channel_handle; 107 IPC::ChannelHandle trusted_ipc_channel_handle;
106 base::ProcessId plugin_pid; 108 base::ProcessId plugin_pid;
107 int plugin_child_id; 109 int plugin_child_id;
108 }; 110 };
109 111
110 } // namespace nacl 112 } // namespace nacl
111 113
112 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ 114 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698