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

Unified Diff: trunk/src/ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.h

Issue 265393004: Revert 268280 "Pepper: Move manifest logic to components/nacl." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: trunk/src/ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.h
===================================================================
--- trunk/src/ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.h (revision 268294)
+++ trunk/src/ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.h (working copy)
@@ -28,6 +28,7 @@
namespace plugin {
+class Manifest;
class NaClSubprocess;
class Plugin;
class PnaclCoordinator;
@@ -42,7 +43,7 @@
// Start the translation process. It will continue to run and consume data
// as it is passed in with PutBytes.
void RunTranslate(const pp::CompletionCallback& finish_callback,
- int32_t manifest_id,
+ const Manifest* manifest,
const std::vector<TempFile*>* obj_files,
TempFile* nexe_file,
nacl::DescWrapper* invalid_desc_wrapper,
@@ -68,7 +69,7 @@
private:
// Starts an individual llc or ld subprocess used for translation.
NaClSubprocess* StartSubprocess(const nacl::string& url,
- int32_t manifest_id,
+ const Manifest* manifest,
ErrorInfo* error_info);
// Helper thread entry point for translation. Takes a pointer to
// PnaclTranslateThread and calls DoTranslate().
@@ -113,7 +114,7 @@
int64_t compile_time_;
// Data about the translation files, owned by the coordinator
- int32_t manifest_id_;
+ const Manifest* manifest_;
const std::vector<TempFile*>* obj_files_;
TempFile* nexe_file_;
nacl::DescWrapper* invalid_desc_wrapper_;

Powered by Google App Engine
This is Rietveld 408576698