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

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

Issue 1051243002: Non-SFI: move socketpair() from plugin process to browser process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 bool enable_ipc_proxy; 96 bool enable_ipc_proxy;
97 97
98 // Enables plugin code to use Mojo APIs. See mojo/nacl for details. 98 // Enables plugin code to use Mojo APIs. See mojo/nacl for details.
99 bool enable_mojo; 99 bool enable_mojo;
100 100
101 NaClAppProcessType process_type; 101 NaClAppProcessType process_type;
102 102
103 // For NaCl <-> renderer crash information reporting. 103 // For NaCl <-> renderer crash information reporting.
104 base::SharedMemoryHandle crash_info_shmem_handle; 104 base::SharedMemoryHandle crash_info_shmem_handle;
105 105
106 // In Non-SFI mode, to be more secure we cannot create socket pairs in the
107 // nacl_helper process. Instead, we create them in the browser process,
108 // and pass them to the plugin process.
109 FileDescriptor browser_server_ppapi_fd;
Mark Seaborn 2015/04/15 20:52:05 base::FileDescriptor doesn't have a destructor...
hidehiko 2015/05/12 18:47:51 Ack. On 2015/04/15 20:52:05, Mark Seaborn wrote:
110 FileDescriptor browser_client_ppapi_fd;
111 FileDescriptor renderer_server_ppapi_fd;
112 FileDescriptor renderer_client_ppapi_fd;
113 FileDescriptor manifest_service_server_fd;
114 FileDescriptor manifest_service_client_fd;
115 FileDescriptor trusted_channel_server_fd;
116 FileDescriptor trusted_channel_client_fd;
117
106 // NOTE: Any new fields added here must also be added to the IPC 118 // NOTE: Any new fields added here must also be added to the IPC
107 // serialization in nacl_messages.h and (for POD fields) the constructor 119 // serialization in nacl_messages.h and (for POD fields) the constructor
108 // in nacl_types.cc. 120 // in nacl_types.cc.
109 }; 121 };
110 122
111 // Parameters sent to the browser process to have it launch a NaCl process. 123 // Parameters sent to the browser process to have it launch a NaCl process.
112 // 124 //
113 // If you change this, you will also need to update the IPC serialization in 125 // If you change this, you will also need to update the IPC serialization in
114 // nacl_host_messages.h. 126 // nacl_host_messages.h.
115 struct NaClLaunchParams { 127 struct NaClLaunchParams {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 base::ProcessId plugin_pid; 184 base::ProcessId plugin_pid;
173 int plugin_child_id; 185 int plugin_child_id;
174 186
175 // For NaCl <-> renderer crash information reporting. 187 // For NaCl <-> renderer crash information reporting.
176 base::SharedMemoryHandle crash_info_shmem_handle; 188 base::SharedMemoryHandle crash_info_shmem_handle;
177 }; 189 };
178 190
179 } // namespace nacl 191 } // namespace nacl
180 192
181 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ 193 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698