Merge 159454 - Flush at the end of local file writing in FileWriter API.

webkit/fileapi/file_writer_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/fileapi/file_writer_delegate.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util_proxy.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/thread_restrictions.h"
 #include "net/base/net_errors.h"
 #include "webkit/fileapi/file_stream_writer.h"
 #include "webkit/fileapi/file_system_context.h"
 
 namespace fileapi {
 
 static const int kReadBufSize = 32768;
 
 namespace {
 
 base::PlatformFileError NetErrorToPlatformFileError(int error) {
 // TODO(kinuko): Move this static method to more convenient place.
   switch (error) {
+    case net::OK:
+      return base::PLATFORM_FILE_OK;
     case net::ERR_FILE_NO_SPACE:
       return base::PLATFORM_FILE_ERROR_NO_SPACE;
     case net::ERR_FILE_NOT_FOUND:
       return base::PLATFORM_FILE_ERROR_NOT_FOUND;
     case net::ERR_ACCESS_DENIED:
       return base::PLATFORM_FILE_ERROR_ACCESS_DENIED;
     default:
       return base::PLATFORM_FILE_ERROR_FAILED;
   }
 }
@@ skipping 143 matching lines @@
 FileWriterDelegate::GetCompletionStatusOnError() const {
   return writing_started_ ? ERROR_WRITE_STARTED : ERROR_WRITE_NOT_STARTED;
 }
 
 void FileWriterDelegate::OnError(base::PlatformFileError error) {
   if (request_.get()) {
     request_->set_delegate(NULL);
     request_->Cancel();
   }
 
-  write_callback_.Run(error, 0, GetCompletionStatusOnError());
+  if (writing_started_)
+    FlushForCompletion(error, 0, ERROR_WRITE_STARTED);
+  else
+    write_callback_.Run(error, 0, ERROR_WRITE_NOT_STARTED);
 }
 
 void FileWriterDelegate::OnProgress(int bytes_written, bool done) {
   DCHECK(bytes_written + bytes_written_backlog_ >= bytes_written_backlog_);
   static const int kMinProgressDelayMS = 200;
   base::Time currentTime = base::Time::Now();
   if (done || last_progress_event_time_.is_null() ||
       (currentTime - last_progress_event_time_).InMilliseconds() >
           kMinProgressDelayMS) {
     bytes_written += bytes_written_backlog_;
     last_progress_event_time_ = currentTime;
     bytes_written_backlog_ = 0;
 
-    WriteProgressStatus status = done ? SUCCESS_COMPLETED : SUCCESS_IO_PENDING;
-    write_callback_.Run(base::PLATFORM_FILE_OK, bytes_written, status);
+    if (done) {
+      FlushForCompletion(base::PLATFORM_FILE_OK, bytes_written,
+                         SUCCESS_COMPLETED);
+    } else {
+      write_callback_.Run(base::PLATFORM_FILE_OK, bytes_written,
+                          SUCCESS_IO_PENDING);
+    }
     return;
   }
   bytes_written_backlog_ += bytes_written;
 }
 
 void FileWriterDelegate::OnWriteCancelled(int status) {
   write_callback_.Run(base::PLATFORM_FILE_ERROR_ABORT, 0,
                       GetCompletionStatusOnError());
 }
 
+void FileWriterDelegate::FlushForCompletion(
+    base::PlatformFileError error,
+    int bytes_written,
+    WriteProgressStatus progress_status) {
+  int flush_error = file_stream_writer_->Flush(
+      base::Bind(&FileWriterDelegate::OnFlushed,
+                 weak_factory_.GetWeakPtr(),
+                 error, bytes_written, progress_status));
+  if (flush_error != net::ERR_IO_PENDING)
+    OnFlushed(error, bytes_written, progress_status, flush_error);
+}
+
+void FileWriterDelegate::OnFlushed(base::PlatformFileError error,
+                                   int bytes_written,
+                                   WriteProgressStatus progress_status,
+                                   int flush_error) {
+  if (error == base::PLATFORM_FILE_OK && flush_error != net::OK) {
+    // If the Flush introduced an error, overwrite the status.
+    // Otherwise, keep the original error status.
+    error = NetErrorToPlatformFileError(flush_error);
+    progress_status = GetCompletionStatusOnError();
+  }
+  write_callback_.Run(error, bytes_written, progress_status);
+}
+
 }  // namespace fileapi