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

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

Issue 793723006: Revert of NaCl: Remove reliance on "init_done" SRPC call in the non-PNaCl case (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | « ppapi/nacl_irt/ppapi_dispatcher.cc ('k') | 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 bool* started, 151 bool* started,
152 ServiceRuntime* service_runtime); 152 ServiceRuntime* service_runtime);
153 153
154 // This is invoked on the main thread. 154 // This is invoked on the main thread.
155 void StartNexe(int32_t pp_error, ServiceRuntime* service_runtime); 155 void StartNexe(int32_t pp_error, ServiceRuntime* service_runtime);
156 156
157 // Callback used when getting the URL for the .nexe file. If the URL loading 157 // Callback used when getting the URL for the .nexe file. If the URL loading
158 // is successful, the file descriptor is opened and can be passed to sel_ldr 158 // is successful, the file descriptor is opened and can be passed to sel_ldr
159 // with the sandbox on. 159 // with the sandbox on.
160 void NexeFileDidOpen(int32_t pp_error); 160 void NexeFileDidOpen(int32_t pp_error);
161 void NexeFileDidOpenContinuation(int32_t pp_error);
161 162
162 // Callback used when a .nexe is translated from bitcode. If the translation 163 // Callback used when a .nexe is translated from bitcode. If the translation
163 // is successful, the file descriptor is opened and can be passed to sel_ldr 164 // is successful, the file descriptor is opened and can be passed to sel_ldr
164 // with the sandbox on. 165 // with the sandbox on.
165 void BitcodeDidTranslate(int32_t pp_error); 166 void BitcodeDidTranslate(int32_t pp_error);
166 void BitcodeDidTranslateContinuation(int32_t pp_error); 167 void BitcodeDidTranslateContinuation(int32_t pp_error);
167 168
168 // NaCl ISA selection manifest file support. The manifest file is specified 169 // NaCl ISA selection manifest file support. The manifest file is specified
169 // using the "nacl" attribute in the <embed> tag. First, the manifest URL (or 170 // using the "nacl" attribute in the <embed> tag. First, the manifest URL (or
170 // data: URI) is fetched, then the JSON is parsed. Once a valid .nexe is 171 // data: URI) is fetched, then the JSON is parsed. Once a valid .nexe is
(...skipping 21 matching lines...) Expand all
192 193
193 PP_NaClFileInfo nexe_file_info_; 194 PP_NaClFileInfo nexe_file_info_;
194 195
195 const PPB_NaCl_Private* nacl_interface_; 196 const PPB_NaCl_Private* nacl_interface_;
196 pp::UMAPrivate uma_interface_; 197 pp::UMAPrivate uma_interface_;
197 }; 198 };
198 199
199 } // namespace plugin 200 } // namespace plugin
200 201
201 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ 202 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
OLDNEW
« no previous file with comments | « ppapi/nacl_irt/ppapi_dispatcher.cc ('k') | ppapi/native_client/src/trusted/plugin/plugin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698