| 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 // such as ld.so processing is done. That initialization requires | 105 // such as ld.so processing is done. That initialization requires |
| 106 // that the main thread be free in order to do Pepper | 106 // that the main thread be free in order to do Pepper |
| 107 // main-thread-only operations such as file processing. | 107 // main-thread-only operations such as file processing. |
| 108 bool LoadNaClModuleContinuation(int32_t pp_error); | 108 bool LoadNaClModuleContinuation(int32_t pp_error); |
| 109 | 109 |
| 110 // Load support. | 110 // Load support. |
| 111 // A helper SRPC NaCl module can be loaded given a DescWrapper. | 111 // A helper SRPC NaCl module can be loaded given a DescWrapper. |
| 112 // Blocks until the helper module signals initialization is done. | 112 // Blocks until the helper module signals initialization is done. |
| 113 // Does not update nacl_module_origin(). | 113 // Does not update nacl_module_origin(). |
| 114 // Returns NULL or the NaClSubprocess of the new helper NaCl module. | 114 // Returns NULL or the NaClSubprocess of the new helper NaCl module. |
| 115 NaClSubprocess* LoadHelperNaClModule(nacl::DescWrapper* wrapper, | 115 NaClSubprocess* LoadHelperNaClModule(const nacl::string& helper_url, |
| 116 nacl::DescWrapper* wrapper, |
| 116 const Manifest* manifest, | 117 const Manifest* manifest, |
| 117 ErrorInfo* error_info); | 118 ErrorInfo* error_info); |
| 118 | 119 |
| 119 // Returns the argument value for the specified key, or NULL if not found. | 120 // Returns the argument value for the specified key, or NULL if not found. |
| 120 std::string LookupArgument(const std::string& key) const; | 121 std::string LookupArgument(const std::string& key) const; |
| 121 | 122 |
| 122 enum LengthComputable { | 123 enum LengthComputable { |
| 123 LENGTH_IS_NOT_COMPUTABLE = 0, | 124 LENGTH_IS_NOT_COMPUTABLE = 0, |
| 124 LENGTH_IS_COMPUTABLE = 1 | 125 LENGTH_IS_COMPUTABLE = 1 |
| 125 }; | 126 }; |
| (...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 465 int64_t time_of_last_progress_event_; | 466 int64_t time_of_last_progress_event_; |
| 466 int exit_status_; | 467 int exit_status_; |
| 467 | 468 |
| 468 const PPB_NaCl_Private* nacl_interface_; | 469 const PPB_NaCl_Private* nacl_interface_; |
| 469 pp::UMAPrivate uma_interface_; | 470 pp::UMAPrivate uma_interface_; |
| 470 }; | 471 }; |
| 471 | 472 |
| 472 } // namespace plugin | 473 } // namespace plugin |
| 473 | 474 |
| 474 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ | 475 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ |
| OLD | NEW |