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

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

Issue 649603004: Non-SFI NaCl: Batch-open resource files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove ipc/ and mojo/ changes following Mark's suggestion Created 6 years 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
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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 // trying to communicate with it, i.e., until nacl_ready_state is 77 // trying to communicate with it, i.e., until nacl_ready_state is
78 // DONE. 78 // DONE.
79 // 79 //
80 // NB: currently we do not time out, so if the untrusted code 80 // NB: currently we do not time out, so if the untrusted code
81 // does not signal that it is ready, then we will deadlock the main 81 // does not signal that it is ready, then we will deadlock the main
82 // thread of the renderer on this subsequent event delivery. We 82 // thread of the renderer on this subsequent event delivery. We
83 // should include a time-out at which point we declare the 83 // should include a time-out at which point we declare the
84 // nacl_ready_state to be done, and let the normal crash detection 84 // nacl_ready_state to be done, and let the normal crash detection
85 // mechanism(s) take over. 85 // mechanism(s) take over.
86 void LoadNaClModule(PP_NaClFileInfo file_info, 86 void LoadNaClModule(PP_NaClFileInfo file_info,
87 PP_NaClResourceFileHandle* resource_file_handles,
88 uint32_t resource_file_handles_len,
87 bool uses_nonsfi_mode, 89 bool uses_nonsfi_mode,
88 PP_NaClAppProcessType process_type, 90 PP_NaClAppProcessType process_type,
89 const pp::CompletionCallback& init_done_cb); 91 const pp::CompletionCallback& init_done_cb);
90 92
91 // Finish hooking interfaces up, after low-level initialization is 93 // Finish hooking interfaces up, after low-level initialization is
92 // complete. 94 // complete.
93 bool LoadNaClModuleContinuationIntern(); 95 bool LoadNaClModuleContinuationIntern();
94 96
95 // Continuation for starting SRPC/JSProxy services as appropriate. 97 // Continuation for starting SRPC/JSProxy services as appropriate.
96 // This is invoked as a callback when the NaCl module makes the 98 // This is invoked as a callback when the NaCl module makes the
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 187
186 nacl::DescWrapperFactory* wrapper_factory_; 188 nacl::DescWrapperFactory* wrapper_factory_;
187 189
188 pp::CompletionCallbackFactory<Plugin> callback_factory_; 190 pp::CompletionCallbackFactory<Plugin> callback_factory_;
189 191
190 nacl::scoped_ptr<PnaclCoordinator> pnacl_coordinator_; 192 nacl::scoped_ptr<PnaclCoordinator> pnacl_coordinator_;
191 193
192 int exit_status_; 194 int exit_status_;
193 195
194 PP_NaClFileInfo nexe_file_info_; 196 PP_NaClFileInfo nexe_file_info_;
197 PP_NaClResourceFileHandle* resource_file_handles_;
198 uint32_t resource_file_handles_len_;
195 199
196 const PPB_NaCl_Private* nacl_interface_; 200 const PPB_NaCl_Private* nacl_interface_;
197 pp::UMAPrivate uma_interface_; 201 pp::UMAPrivate uma_interface_;
198 }; 202 };
199 203
200 } // namespace plugin 204 } // namespace plugin
201 205
202 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ 206 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698