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

Unified Diff: ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc

Issue 10815080: Add an interface for nacl to create delete-on-close temp files, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert buildbot hack Created 8 years, 5 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: ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
index 064d8e10b5c27a82695bf826382a7ec963e90122..d9b485e1364e36c6eba3fc3fa750837daac0b6fd 100644
--- a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
+++ b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
@@ -16,6 +16,7 @@
#include "native_client/src/trusted/plugin/pnacl_streaming_translate_thread.h"
#include "native_client/src/trusted/plugin/pnacl_translate_thread.h"
#include "native_client/src/trusted/plugin/service_runtime.h"
+#include "native_client/src/trusted/plugin/temporary_file.h"
#include "native_client/src/trusted/service_runtime/include/sys/stat.h"
#include "ppapi/c/pp_errors.h"
@@ -304,32 +305,6 @@ void PnaclCoordinator::TranslateFinished(int32_t pp_error) {
// the one from the compiler, (which is always just PP_ERROR_FAILED)
if (translate_finish_error_ == PP_OK) translate_finish_error_ = pp_error;
- // Close the object temporary file (regardless of error code).
- pp::CompletionCallback cb =
- callback_factory_.NewCallback(&PnaclCoordinator::ObjectFileWasClosed);
- obj_file_->Close(cb);
-}
-
-void PnaclCoordinator::ObjectFileWasClosed(int32_t pp_error) {
- PLUGIN_PRINTF(("PnaclCoordinator::ObjectFileWasClosed (pp_error=%"
- NACL_PRId32")\n", pp_error));
- if (pp_error != PP_OK) {
- ReportPpapiError(pp_error);
- return;
- }
- // Delete the object temporary file.
- pp::CompletionCallback cb =
- callback_factory_.NewCallback(&PnaclCoordinator::ObjectFileWasDeleted);
- obj_file_->Delete(cb);
-}
-
-void PnaclCoordinator::ObjectFileWasDeleted(int32_t pp_error) {
- PLUGIN_PRINTF(("PnaclCoordinator::ObjectFileWasDeleted (pp_error=%"
- NACL_PRId32")\n", pp_error));
- if (pp_error != PP_OK) {
- ReportPpapiError(pp_error);
- return;
- }
// Close the nexe temporary file.
if (nexe_file_ != NULL) {
pp::CompletionCallback cb =
@@ -474,11 +449,10 @@ void PnaclCoordinator::CachedFileDidOpen(int32_t pp_error) {
// translator can start writing to it during streaming translation.
// In the non-streaming case this can wait until the bitcode download is
// finished.
- obj_file_.reset(new LocalTempFile(plugin_, file_system_.get(),
- nacl::string(kPnaclTempDir)));
+ obj_file_.reset(new TempFile(plugin_));
pp::CompletionCallback obj_cb =
- callback_factory_.NewCallback(&PnaclCoordinator::ObjectWriteDidOpen);
- obj_file_->OpenWrite(obj_cb);
+ callback_factory_.NewCallback(&PnaclCoordinator::ObjectFileDidOpen);
+ obj_file_->Open(obj_cb);
streaming_downloader_.reset(new FileDownloader());
streaming_downloader_->Initialize(plugin_);
@@ -521,20 +495,8 @@ StreamCallback PnaclCoordinator::GetCallback() {
&PnaclCoordinator::BitcodeStreamGotData);
}
-void PnaclCoordinator::ObjectWriteDidOpen(int32_t pp_error) {
- PLUGIN_PRINTF(("PnaclCoordinator::ObjectWriteDidOpen (pp_error=%"
- NACL_PRId32")\n", pp_error));
- if (pp_error != PP_OK) {
- ReportPpapiError(pp_error);
- return;
- }
- pp::CompletionCallback cb =
- callback_factory_.NewCallback(&PnaclCoordinator::ObjectReadDidOpen);
- obj_file_->OpenRead(cb);
-}
-
-void PnaclCoordinator::ObjectReadDidOpen(int32_t pp_error) {
- PLUGIN_PRINTF(("PnaclCoordinator::ObjectReadDidOpen (pp_error=%"
+void PnaclCoordinator::ObjectFileDidOpen(int32_t pp_error) {
+ PLUGIN_PRINTF(("PnaclCoordinator::ObjectFileDidOpen (pp_error=%"
NACL_PRId32")\n", pp_error));
if (pp_error != PP_OK) {
ReportPpapiError(pp_error);

Powered by Google App Engine
This is Rietveld 408576698