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 149 matching lines @@
 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;
-    write_callback_.Run(
-        base::PLATFORM_FILE_OK, bytes_written, done);
+    if (done) {
+      // All write operation completed, be sure to flush the data.
+      int result = file_stream_writer_->Flush(
+          base::Bind(&FileWriterDelegate::OnSuccessfulCompletion,
+                     weak_factory_.GetWeakPtr(),
+                     bytes_written));
+      if (result != net::ERR_IO_PENDING) {
+        write_callback_.Run(NetErrorToPlatformFileError(result),
+                            bytes_written, done);
+      }
+    } else {
+      write_callback_.Run(base::PLATFORM_FILE_OK, bytes_written, done);
+    }

[kinuko, 2012/09/26 08:34:08]

Do we need to do this when error has happend after some writes?

Btw fyi we're making a following change so that it'll become easier to tell if
there' were any writes on error case
http://codereview.chromium.org/10956064/

[kinaba, 2012/09/28 11:15:25]

Thanks. I rebased this CL on top of it.

I've also implemented Flush for the error case (PTAL for the latest patchset).

     return;
   }
   bytes_written_backlog_ += bytes_written;
 }
 
 void FileWriterDelegate::OnWriteCancelled(int status) {
   write_callback_.Run(base::PLATFORM_FILE_ERROR_ABORT, 0, true);
 }
 
+void FileWriterDelegate::OnSuccessfulCompletion(int bytes_written, int status) {
+  write_callback_.Run(NetErrorToPlatformFileError(status), bytes_written, true);
+}
+
 }  // namespace fileapi