| 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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 // uma_interface_ normally. | 169 // uma_interface_ normally. |
| 170 void HistogramTimeSmall(const std::string& name, int64_t ms); | 170 void HistogramTimeSmall(const std::string& name, int64_t ms); |
| 171 void HistogramEnumerateLoadStatus(PP_NaClError error_code); | 171 void HistogramEnumerateLoadStatus(PP_NaClError error_code); |
| 172 void HistogramEnumerateSelLdrLoadStatus(NaClErrorCode error_code); | 172 void HistogramEnumerateSelLdrLoadStatus(NaClErrorCode error_code); |
| 173 | 173 |
| 174 // Load a nacl module from the file specified in file_handle. | 174 // Load a nacl module from the file specified in file_handle. |
| 175 // Only to be used from a background (non-main) thread. | 175 // Only to be used from a background (non-main) thread. |
| 176 // This will fully initialize the |subprocess| if the load was successful. | 176 // This will fully initialize the |subprocess| if the load was successful. |
| 177 bool LoadNaClModuleFromBackgroundThread(PP_FileHandle file_handle, | 177 bool LoadNaClModuleFromBackgroundThread(PP_FileHandle file_handle, |
| 178 NaClSubprocess* subprocess, | 178 NaClSubprocess* subprocess, |
| 179 int32_t manifest_id, | |
| 180 const SelLdrStartParams& params); | 179 const SelLdrStartParams& params); |
| 181 | 180 |
| 182 // Start sel_ldr from the main thread, given the start params. | 181 // Start sel_ldr from the main thread, given the start params. |
| 183 // |pp_error| is set by CallOnMainThread (should be PP_OK). | 182 // |pp_error| is set by CallOnMainThread (should be PP_OK). |
| 184 void StartSelLdrOnMainThread(int32_t pp_error, | 183 void StartSelLdrOnMainThread(int32_t pp_error, |
| 185 ServiceRuntime* service_runtime, | 184 ServiceRuntime* service_runtime, |
| 186 const SelLdrStartParams& params, | 185 const SelLdrStartParams& params, |
| 187 pp::CompletionCallback callback); | 186 pp::CompletionCallback callback); |
| 188 | 187 |
| 189 // Signals that StartSelLdr has finished. | 188 // Signals that StartSelLdr has finished. |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 // Original, unresolved URL for the .nexe program to load. | 248 // Original, unresolved URL for the .nexe program to load. |
| 250 std::string program_url_; | 249 std::string program_url_; |
| 251 | 250 |
| 252 pp::CompletionCallbackFactory<Plugin> callback_factory_; | 251 pp::CompletionCallbackFactory<Plugin> callback_factory_; |
| 253 | 252 |
| 254 nacl::scoped_ptr<PnaclCoordinator> pnacl_coordinator_; | 253 nacl::scoped_ptr<PnaclCoordinator> pnacl_coordinator_; |
| 255 | 254 |
| 256 int64_t time_of_last_progress_event_; | 255 int64_t time_of_last_progress_event_; |
| 257 int exit_status_; | 256 int exit_status_; |
| 258 | 257 |
| 259 int32_t manifest_id_; | |
| 260 | |
| 261 PP_NaClFileInfo nexe_file_info_; | 258 PP_NaClFileInfo nexe_file_info_; |
| 262 | 259 |
| 263 const PPB_NaCl_Private* nacl_interface_; | 260 const PPB_NaCl_Private* nacl_interface_; |
| 264 pp::UMAPrivate uma_interface_; | 261 pp::UMAPrivate uma_interface_; |
| 265 }; | 262 }; |
| 266 | 263 |
| 267 } // namespace plugin | 264 } // namespace plugin |
| 268 | 265 |
| 269 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ | 266 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ |
| OLD | NEW |