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

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

Issue 338353008: NaCl: clean up nexe loading logic in trusted plugin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + resolve conflicts 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
« no previous file with comments | « no previous file | ppapi/native_client/src/trusted/plugin/plugin.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // -*- c++ -*- 1 // -*- c++ -*-
2 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 // Use of this source code is governed by a BSD-style license that can be 3 // Use of this source code is governed by a BSD-style license that can be
4 // found in the LICENSE file. 4 // found in the LICENSE file.
5 5
6 // The portable representation of an instance and root scriptable object. 6 // The portable representation of an instance and root scriptable object.
7 // The PPAPI version of the plugin instantiates a subclass of this class. 7 // The PPAPI version of the plugin instantiates a subclass of this class.
8 8
9 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ 9 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
10 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ 10 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 ServiceRuntime* service_runtime, 154 ServiceRuntime* service_runtime,
155 const SelLdrStartParams& params, 155 const SelLdrStartParams& params,
156 pp::CompletionCallback callback); 156 pp::CompletionCallback callback);
157 157
158 // Signals that StartSelLdr has finished. 158 // Signals that StartSelLdr has finished.
159 // This is invoked on the main thread. 159 // This is invoked on the main thread.
160 void SignalStartSelLdrDone(int32_t pp_error, 160 void SignalStartSelLdrDone(int32_t pp_error,
161 bool* started, 161 bool* started,
162 ServiceRuntime* service_runtime); 162 ServiceRuntime* service_runtime);
163 163
164 // Signals that the nexe is started.
165 // This is invoked on the main thread.
166 void SignalNexeStarted(int32_t pp_error,
167 bool* started,
168 ServiceRuntime* service_runtime);
169
170 // This is invoked on the main thread. 164 // This is invoked on the main thread.
171 void LoadNexeAndStart(int32_t pp_error, 165 void LoadNexeAndStart(int32_t pp_error,
172 ServiceRuntime* service_runtime, 166 ServiceRuntime* service_runtime,
173 PP_NaClFileInfo file_info, 167 PP_NaClFileInfo file_info);
174 const pp::CompletionCallback& callback);
175 168
176 // Callback used when getting the URL for the .nexe file. If the URL loading 169 // Callback used when getting the URL for the .nexe file. If the URL loading
177 // is successful, the file descriptor is opened and can be passed to sel_ldr 170 // is successful, the file descriptor is opened and can be passed to sel_ldr
178 // with the sandbox on. 171 // with the sandbox on.
179 void NexeFileDidOpen(int32_t pp_error); 172 void NexeFileDidOpen(int32_t pp_error);
180 void NexeFileDidOpenContinuation(int32_t pp_error); 173 void NexeFileDidOpenContinuation(int32_t pp_error);
181 174
182 // Callback used when the reverse channel closes. This is an 175 // Callback used when the reverse channel closes. This is an
183 // asynchronous event that might turn into a JavaScript error or 176 // asynchronous event that might turn into a JavaScript error or
184 // crash event -- this is controlled by the two state variables 177 // crash event -- this is controlled by the two state variables
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 222
230 PP_NaClFileInfo nexe_file_info_; 223 PP_NaClFileInfo nexe_file_info_;
231 224
232 const PPB_NaCl_Private* nacl_interface_; 225 const PPB_NaCl_Private* nacl_interface_;
233 pp::UMAPrivate uma_interface_; 226 pp::UMAPrivate uma_interface_;
234 }; 227 };
235 228
236 } // namespace plugin 229 } // namespace plugin
237 230
238 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ 231 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
OLDNEW
« no previous file with comments | « no previous file | ppapi/native_client/src/trusted/plugin/plugin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698