OLD | NEW |
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 Loading... |
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, |
87 bool uses_nonsfi_mode, | 88 bool uses_nonsfi_mode, |
88 PP_NaClAppProcessType process_type, | 89 PP_NaClAppProcessType process_type, |
89 const pp::CompletionCallback& init_done_cb); | 90 const pp::CompletionCallback& init_done_cb); |
90 | 91 |
91 // Finish hooking interfaces up, after low-level initialization is | 92 // Finish hooking interfaces up, after low-level initialization is |
92 // complete. | 93 // complete. |
93 bool LoadNaClModuleContinuationIntern(); | 94 bool LoadNaClModuleContinuationIntern(); |
94 | 95 |
95 // Continuation for starting SRPC/JSProxy services as appropriate. | 96 // Continuation for starting SRPC/JSProxy services as appropriate. |
96 // This is invoked as a callback when the NaCl module makes the | 97 // This is invoked as a callback when the NaCl module makes the |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 | 186 |
186 nacl::DescWrapperFactory* wrapper_factory_; | 187 nacl::DescWrapperFactory* wrapper_factory_; |
187 | 188 |
188 pp::CompletionCallbackFactory<Plugin> callback_factory_; | 189 pp::CompletionCallbackFactory<Plugin> callback_factory_; |
189 | 190 |
190 nacl::scoped_ptr<PnaclCoordinator> pnacl_coordinator_; | 191 nacl::scoped_ptr<PnaclCoordinator> pnacl_coordinator_; |
191 | 192 |
192 int exit_status_; | 193 int exit_status_; |
193 | 194 |
194 PP_NaClFileInfo nexe_file_info_; | 195 PP_NaClFileInfo nexe_file_info_; |
| 196 PP_NaClResourceFileHandle* resource_file_handles_; |
195 | 197 |
196 const PPB_NaCl_Private* nacl_interface_; | 198 const PPB_NaCl_Private* nacl_interface_; |
197 pp::UMAPrivate uma_interface_; | 199 pp::UMAPrivate uma_interface_; |
198 }; | 200 }; |
199 | 201 |
200 } // namespace plugin | 202 } // namespace plugin |
201 | 203 |
202 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ | 204 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ |
OLD | NEW |