Send OnModifyFile Notification when File Write Finishes

webkit/fileapi/local_file_system_operation.cc

Index: webkit/fileapi/local_file_system_operation.cc
diff --git a/webkit/fileapi/local_file_system_operation.cc b/webkit/fileapi/local_file_system_operation.cc
index ff46be532199a57d370f4c7b080206d6aa826091..3d1e4a4db899f898d30e2bf357b41a3ef1c4a8d3 100644
--- a/webkit/fileapi/local_file_system_operation.cc
+++ b/webkit/fileapi/local_file_system_operation.cc
@@ -314,7 +314,7 @@ void LocalFileSystemOperation::Write(
   DCHECK(blob_url.is_valid());
   file_writer_delegate_.reset(new FileWriterDelegate(
       base::Bind(&LocalFileSystemOperation::DidWrite,
-                 weak_factory_.GetWeakPtr()),
+                 weak_factory_.GetWeakPtr(), url),
       writer.Pass()));
 
   set_write_callback(callback);
@@ -677,17 +677,27 @@ void LocalFileSystemOperation::DidReadDirectory(
 }
 
 void LocalFileSystemOperation::DidWrite(
+    const FileSystemURL& url,
     base::PlatformFileError rv,
     int64 bytes,
-    bool complete) {
+    FileWriterDelegate::WriteCompletionStatus write_status) {
   if (write_callback_.is_null()) {
     // If cancelled, callback is already invoked and set to null in Cancel().
     // We must not call it twice. Just shut down this operation object.
     delete this;
     return;
   }
+
+  if (write_status == FileWriterDelegate::COMPLETE_SUCCESSFUL ||
+      write_status == FileWriterDelegate::ERROR_WRITE_STARTED) {

[kinuko, 2012/09/25 14:00:49]

This might be only me but I found this code kinda makes me worry if we're
covering all possible situations we should fire the notification.

How about moving line 697 before this if condition and change it like:

if (complete && write_status != ERROR_WRITE_NOT_STARTED)

[calvinlo, 2012/09/26 05:23:07]

Done.

+    operation_context_->change_observers()->Notify(
+        &FileChangeObserver::OnModifyFile, MakeTuple(url));
+  }
+
+  bool complete = (write_status != FileWriterDelegate::NOT_COMPLETE);
   write_callback_.Run(rv, bytes, complete);
-  if (complete || rv != base::PLATFORM_FILE_OK)
+  if (write_status == FileWriterDelegate::COMPLETE_SUCCESSFUL ||

[kinuko, 2012/09/25 14:00:49]

shouldn't this just use 'complete'?

[calvinlo, 2012/09/26 05:23:07]

Done.

+      rv != base::PLATFORM_FILE_OK)
     delete this;
 }