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

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

Issue 292743011: Pepper: Simplify Pnacl manifest id logic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 // main-thread-only operations such as file processing. 106 // main-thread-only operations such as file processing.
107 bool LoadNaClModuleContinuation(int32_t pp_error); 107 bool LoadNaClModuleContinuation(int32_t pp_error);
108 108
109 // Load support. 109 // Load support.
110 // A helper SRPC NaCl module can be loaded given a PP_FileHandle. 110 // A helper SRPC NaCl module can be loaded given a PP_FileHandle.
111 // Blocks until the helper module signals initialization is done. 111 // Blocks until the helper module signals initialization is done.
112 // Does not update nacl_module_origin(). 112 // Does not update nacl_module_origin().
113 // Returns NULL or the NaClSubprocess of the new helper NaCl module. 113 // Returns NULL or the NaClSubprocess of the new helper NaCl module.
114 NaClSubprocess* LoadHelperNaClModule(const nacl::string& helper_url, 114 NaClSubprocess* LoadHelperNaClModule(const nacl::string& helper_url,
115 PP_FileHandle file_handle, 115 PP_FileHandle file_handle,
116 int32_t manifest_id,
117 ErrorInfo* error_info); 116 ErrorInfo* error_info);
118 117
119 enum LengthComputable { 118 enum LengthComputable {
120 LENGTH_IS_NOT_COMPUTABLE = 0, 119 LENGTH_IS_NOT_COMPUTABLE = 0,
121 LENGTH_IS_COMPUTABLE = 1 120 LENGTH_IS_COMPUTABLE = 1
122 }; 121 };
123 // Report successful loading of a module. 122 // Report successful loading of a module.
124 void ReportLoadSuccess(uint64_t loaded_bytes, uint64_t total_bytes); 123 void ReportLoadSuccess(uint64_t loaded_bytes, uint64_t total_bytes);
125 // Report an error that was encountered while loading a module. 124 // Report an error that was encountered while loading a module.
126 void ReportLoadError(const ErrorInfo& error_info); 125 void ReportLoadError(const ErrorInfo& error_info);
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 uint64_t nexe_token_lo_; 274 uint64_t nexe_token_lo_;
276 uint64_t nexe_token_hi_; 275 uint64_t nexe_token_hi_;
277 276
278 const PPB_NaCl_Private* nacl_interface_; 277 const PPB_NaCl_Private* nacl_interface_;
279 pp::UMAPrivate uma_interface_; 278 pp::UMAPrivate uma_interface_;
280 }; 279 };
281 280
282 } // namespace plugin 281 } // namespace plugin
283 282
284 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ 283 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
OLDNEW
« no previous file with comments | « no previous file | ppapi/native_client/src/trusted/plugin/plugin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698