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

Side by Side Diff: ppapi/native_client/src/trusted/plugin/service_runtime.h

Issue 337463002: Remove LoadModule SRPC for non-SFI mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 6 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 | Annotate | Revision Log
OLDNEW
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 24 matching lines...) Expand all
35 namespace plugin { 35 namespace plugin {
36 36
37 class Plugin; 37 class Plugin;
38 class SrpcClient; 38 class SrpcClient;
39 class ServiceRuntime; 39 class ServiceRuntime;
40 40
41 // Struct of params used by StartSelLdr. Use a struct so that callback 41 // Struct of params used by StartSelLdr. Use a struct so that callback
42 // creation templates aren't overwhelmed with too many parameters. 42 // creation templates aren't overwhelmed with too many parameters.
43 struct SelLdrStartParams { 43 struct SelLdrStartParams {
44 SelLdrStartParams(const nacl::string& url, 44 SelLdrStartParams(const nacl::string& url,
45 const PP_NaClFileInfo& file_info,
45 bool uses_irt, 46 bool uses_irt,
46 bool uses_ppapi, 47 bool uses_ppapi,
47 bool enable_dyncode_syscalls, 48 bool enable_dyncode_syscalls,
48 bool enable_exception_handling, 49 bool enable_exception_handling,
49 bool enable_crash_throttling) 50 bool enable_crash_throttling)
50 : url(url), 51 : url(url),
52 file_info(file_info),
51 uses_irt(uses_irt), 53 uses_irt(uses_irt),
52 uses_ppapi(uses_ppapi), 54 uses_ppapi(uses_ppapi),
53 enable_dyncode_syscalls(enable_dyncode_syscalls), 55 enable_dyncode_syscalls(enable_dyncode_syscalls),
54 enable_exception_handling(enable_exception_handling), 56 enable_exception_handling(enable_exception_handling),
55 enable_crash_throttling(enable_crash_throttling) { 57 enable_crash_throttling(enable_crash_throttling) {
56 } 58 }
57 nacl::string url; 59 nacl::string url;
60 PP_NaClFileInfo file_info;
58 bool uses_irt; 61 bool uses_irt;
59 bool uses_ppapi; 62 bool uses_ppapi;
60 bool enable_dev_interfaces; 63 bool enable_dev_interfaces;
61 bool enable_dyncode_syscalls; 64 bool enable_dyncode_syscalls;
62 bool enable_exception_handling; 65 bool enable_exception_handling;
63 bool enable_crash_throttling; 66 bool enable_crash_throttling;
64 }; 67 };
65 68
66 // Callback resources are essentially our continuation state. 69 // Callback resources are essentially our continuation state.
67 struct OpenManifestEntryResource { 70 struct OpenManifestEntryResource {
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 // Mutex and CondVar to protect start_sel_ldr_done_ and nexe_started_. 230 // Mutex and CondVar to protect start_sel_ldr_done_ and nexe_started_.
228 NaClMutex mu_; 231 NaClMutex mu_;
229 NaClCondVar cond_; 232 NaClCondVar cond_;
230 bool start_sel_ldr_done_; 233 bool start_sel_ldr_done_;
231 bool nexe_started_; 234 bool nexe_started_;
232 }; 235 };
233 236
234 } // namespace plugin 237 } // namespace plugin
235 238
236 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_ 239 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698