| Index: ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h
|
| diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h
|
| index b5fb3d0627d036a328245b143a7cb594d1ab2a25..318babd66a075c4f704e96812d89c18086e1b36d 100644
|
| --- a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h
|
| +++ b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h
|
| @@ -38,6 +38,7 @@ class Manifest;
|
| class Plugin;
|
| class PnaclCoordinator;
|
| class PnaclTranslateThread;
|
| +class TempFile;
|
|
|
| // A class invoked by Plugin to handle PNaCl client-side translation.
|
| // Usage:
|
| @@ -153,13 +154,7 @@ class PnaclCoordinator: public CallbackSource<FileStreamData> {
|
| // Invoked when the pexe download finishes (using streaming translation)
|
| void BitcodeStreamDidFinish(int32_t pp_error);
|
| // Invoked when the write descriptor for obj_file_ is created.
|
| - void ObjectWriteDidOpen(int32_t pp_error);
|
| - // Invoked when the read descriptor for obj_file_ is created.
|
| - void ObjectReadDidOpen(int32_t pp_error);
|
| - // Invoked when the descriptors for obj_file_ have been closed.
|
| - void ObjectFileWasClosed(int32_t pp_error);
|
| - // Invoked when the obj_file_ temporary has been deleted.
|
| - void ObjectFileWasDeleted(int32_t pp_error);
|
| + void ObjectFileDidOpen(int32_t pp_error);
|
| // Invoked when the descriptors for nexe_file_ have been closed.
|
| void NexeFileWasClosed(int32_t pp_error);
|
| // Invoked when the nexe_file_ temporary has been renamed to the nexe name.
|
| @@ -169,6 +164,9 @@ class PnaclCoordinator: public CallbackSource<FileStreamData> {
|
| // Invoked if there was an error and we've cleaned up the nexe_file_ temp.
|
| void NexeFileWasDeleted(int32_t pp_error);
|
|
|
| + void TestFileWrapper(const nacl::string& prefix,
|
| + nacl::DescWrapper* wrapper);
|
| +
|
| // Once llc and ld nexes have been loaded and the two temporary files have
|
| // been created, this starts the translation. Translation starts two
|
| // subprocesses, one for llc and one for ld.
|
| @@ -213,7 +211,7 @@ class PnaclCoordinator: public CallbackSource<FileStreamData> {
|
| // Optional cache identity for translation caching.
|
| nacl::string cache_identity_;
|
| // Object file, produced by the translator and consumed by the linker.
|
| - nacl::scoped_ptr<LocalTempFile> obj_file_;
|
| + nacl::scoped_ptr<TempFile> obj_file_;
|
| // Translated nexe file, produced by the linker and consumed by sel_ldr.
|
| nacl::scoped_ptr<LocalTempFile> nexe_file_;
|
|
|
|
|