| 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 27 matching lines...) Expand all Loading... |
| 38 class Plugin; | 38 class Plugin; |
| 39 class SrpcClient; | 39 class SrpcClient; |
| 40 class ServiceRuntime; | 40 class ServiceRuntime; |
| 41 | 41 |
| 42 // Struct of params used by StartSelLdr. Use a struct so that callback | 42 // Struct of params used by StartSelLdr. Use a struct so that callback |
| 43 // creation templates aren't overwhelmed with too many parameters. | 43 // creation templates aren't overwhelmed with too many parameters. |
| 44 struct SelLdrStartParams { | 44 struct SelLdrStartParams { |
| 45 SelLdrStartParams(const nacl::string& url, | 45 SelLdrStartParams(const nacl::string& url, |
| 46 bool uses_irt, | 46 bool uses_irt, |
| 47 bool uses_ppapi, | 47 bool uses_ppapi, |
| 48 bool uses_nonsfi_mode, | |
| 49 bool enable_dyncode_syscalls, | 48 bool enable_dyncode_syscalls, |
| 50 bool enable_exception_handling, | 49 bool enable_exception_handling, |
| 51 bool enable_crash_throttling) | 50 bool enable_crash_throttling) |
| 52 : url(url), | 51 : url(url), |
| 53 uses_irt(uses_irt), | 52 uses_irt(uses_irt), |
| 54 uses_ppapi(uses_ppapi), | 53 uses_ppapi(uses_ppapi), |
| 55 uses_nonsfi_mode(uses_nonsfi_mode), | |
| 56 enable_dyncode_syscalls(enable_dyncode_syscalls), | 54 enable_dyncode_syscalls(enable_dyncode_syscalls), |
| 57 enable_exception_handling(enable_exception_handling), | 55 enable_exception_handling(enable_exception_handling), |
| 58 enable_crash_throttling(enable_crash_throttling) { | 56 enable_crash_throttling(enable_crash_throttling) { |
| 59 } | 57 } |
| 60 nacl::string url; | 58 nacl::string url; |
| 61 bool uses_irt; | 59 bool uses_irt; |
| 62 bool uses_ppapi; | 60 bool uses_ppapi; |
| 63 bool uses_nonsfi_mode; | |
| 64 bool enable_dev_interfaces; | 61 bool enable_dev_interfaces; |
| 65 bool enable_dyncode_syscalls; | 62 bool enable_dyncode_syscalls; |
| 66 bool enable_exception_handling; | 63 bool enable_exception_handling; |
| 67 bool enable_crash_throttling; | 64 bool enable_crash_throttling; |
| 68 }; | 65 }; |
| 69 | 66 |
| 70 // Callback resources are essentially our continuation state. | 67 // Callback resources are essentially our continuation state. |
| 71 struct OpenManifestEntryResource { | 68 struct OpenManifestEntryResource { |
| 72 public: | 69 public: |
| 73 OpenManifestEntryResource(const std::string& target_url, | 70 OpenManifestEntryResource(const std::string& target_url, |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 // Mutex and CondVar to protect start_sel_ldr_done_ and nexe_started_. | 241 // Mutex and CondVar to protect start_sel_ldr_done_ and nexe_started_. |
| 245 NaClMutex mu_; | 242 NaClMutex mu_; |
| 246 NaClCondVar cond_; | 243 NaClCondVar cond_; |
| 247 bool start_sel_ldr_done_; | 244 bool start_sel_ldr_done_; |
| 248 bool nexe_started_; | 245 bool nexe_started_; |
| 249 }; | 246 }; |
| 250 | 247 |
| 251 } // namespace plugin | 248 } // namespace plugin |
| 252 | 249 |
| 253 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_ | 250 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_ |
| OLD | NEW |