OLD | NEW |
1 /* -*- c++ -*- */ | 1 /* -*- c++ -*- */ |
2 /* | 2 /* |
3 * Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 * Copyright (c) 2012 The Chromium Authors. All rights reserved. |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 | 7 |
8 // A class containing information regarding a socket connection to a | 8 // A class containing information regarding a socket connection to a |
9 // service runtime instance. | 9 // service runtime instance. |
10 | 10 |
(...skipping 18 matching lines...) Expand all Loading... |
29 struct NaClFileInfo; | 29 struct NaClFileInfo; |
30 | 30 |
31 namespace nacl { | 31 namespace nacl { |
32 class DescWrapper; | 32 class DescWrapper; |
33 } // namespace | 33 } // namespace |
34 | 34 |
35 namespace plugin { | 35 namespace plugin { |
36 | 36 |
37 class ErrorInfo; | 37 class ErrorInfo; |
38 class Plugin; | 38 class Plugin; |
| 39 class SelLdrLauncherChrome; |
39 class SrpcClient; | 40 class SrpcClient; |
40 class ServiceRuntime; | 41 class ServiceRuntime; |
41 | 42 |
42 // Struct of params used by StartSelLdr. Use a struct so that callback | 43 // Struct of params used by StartSelLdr. Use a struct so that callback |
43 // creation templates aren't overwhelmed with too many parameters. | 44 // creation templates aren't overwhelmed with too many parameters. |
44 struct SelLdrStartParams { | 45 struct SelLdrStartParams { |
45 SelLdrStartParams(const nacl::string& url, | 46 SelLdrStartParams(const nacl::string& url, |
46 const PP_NaClFileInfo& file_info, | 47 const PP_NaClFileInfo& file_info, |
47 bool uses_irt, | 48 bool uses_irt, |
48 bool uses_ppapi, | 49 bool uses_ppapi, |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 void ReapLogs(); | 213 void ReapLogs(); |
213 | 214 |
214 void ReportLoadError(const ErrorInfo& error_info); | 215 void ReportLoadError(const ErrorInfo& error_info); |
215 | 216 |
216 NaClSrpcChannel command_channel_; | 217 NaClSrpcChannel command_channel_; |
217 Plugin* plugin_; | 218 Plugin* plugin_; |
218 PP_Instance pp_instance_; | 219 PP_Instance pp_instance_; |
219 bool main_service_runtime_; | 220 bool main_service_runtime_; |
220 bool uses_nonsfi_mode_; | 221 bool uses_nonsfi_mode_; |
221 nacl::ReverseService* reverse_service_; | 222 nacl::ReverseService* reverse_service_; |
222 nacl::scoped_ptr<nacl::SelLdrLauncherBase> subprocess_; | 223 nacl::scoped_ptr<SelLdrLauncherChrome> subprocess_; |
223 | 224 |
224 nacl::WeakRefAnchor* anchor_; | 225 nacl::WeakRefAnchor* anchor_; |
225 | 226 |
226 PluginReverseInterface* rev_interface_; | 227 PluginReverseInterface* rev_interface_; |
227 | 228 |
228 // Mutex and CondVar to protect start_sel_ldr_done_ and nexe_started_. | 229 // Mutex and CondVar to protect start_sel_ldr_done_ and nexe_started_. |
229 NaClMutex mu_; | 230 NaClMutex mu_; |
230 NaClCondVar cond_; | 231 NaClCondVar cond_; |
231 bool start_sel_ldr_done_; | 232 bool start_sel_ldr_done_; |
232 bool start_nexe_done_; | 233 bool start_nexe_done_; |
233 bool nexe_started_ok_; | 234 bool nexe_started_ok_; |
| 235 |
| 236 NaClHandle bootstrap_channel_; |
234 }; | 237 }; |
235 | 238 |
236 } // namespace plugin | 239 } // namespace plugin |
237 | 240 |
238 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_ | 241 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_ |
OLD | NEW |