Changeset 85556 in webkit

Timestamp:

May 2, 2011 5:10:45 PM (13 years ago)

Author:

ericu@chromium.org

Message:

2011-05-02 Eric Uhrhane <​ericu@chromium.org>

Reviewed by Eric Seidel.

Some FileWriter progress events should be queued
​https://bugs.webkit.org/show_bug.cgi?id=50846

• fileapi/FileWriter.cpp:
• fileapi/FileWriter.h: Create a new asynchronous Task [FileWriterCompletionEventTask] that will set readyState to DONE and fire off the right events.

2011-05-02 Eric Uhrhane <​ericu@chromium.org>

Reviewed by Eric Seidel.

Some FileWriter progress events should be queued
​https://bugs.webkit.org/show_bug.cgi?id=50846

• fast/filesystem/resources/file-writer-events.js: (onWrite): Expect readyState at onwrite to be DONE now, not WRITING.
• fast/filesystem/resources/file-writer-utils.js: Switch to using onwrite, now that it works.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/filesystem/resources/file-writer-events.js (modified) (1 diff)
• LayoutTests/fast/filesystem/resources/file-writer-utils.js (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/fileapi/FileWriter.cpp (modified) (3 diffs)
• Source/WebCore/fileapi/FileWriter.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-02  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Some FileWriter progress events should be queued
+        https://bugs.webkit.org/show_bug.cgi?id=50846
+
+        * fast/filesystem/resources/file-writer-events.js:
+        (onWrite): Expect readyState at onwrite to be DONE now, not WRITING.
+        * fast/filesystem/resources/file-writer-utils.js:
+        Switch to using onwrite, now that it works.
+
 2011-05-02  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/LayoutTests/fast/filesystem/resources/file-writer-events.js

@@ -50 +50 @@
 
 function onWrite(e) {
-    assert(writer.readyState == writer.WRITING);
+    assert(writer.readyState == writer.DONE);
     assert(sawWriteStart);
     assert(sawProgress);

trunk/LayoutTests/fast/filesystem/resources/file-writer-utils.js

@@ -117 +117 @@
             var successFunc = getSuccessFunc(fileEntry);
             fileWriter.onError = onError;
-            // FIXME: This should be onwrite, but the spec and code need to be changed to allow that.  See https://bugs.webkit.org/show_bug.cgi?id=50846.
-            fileWriter.onwriteend = function() {
+            fileWriter.onwrite = function() {
+                fileWriter.onwrite = null;
                 verifyFileLength(fileEntry, 0, successFunc);
             };
@@ -144 +144 @@
         offset += fileWriter.length;
     assert(offset >= 0);
-    // FIXME: This should be onwrite, but the spec and code need to be changed to allow that.  See https://bugs.webkit.org/show_bug.cgi?id=50846.
-    fileWriter.onwriteend = function() {
-        fileWriter.onwriteend = null;
+    fileWriter.onwrite = function() {
+        fileWriter.onwrite = null;
         verifyByteRangeAsString(fileEntry, offset, data, onSuccess);
     };
@@ -153 +152 @@
 function setFileContents(fileEntry, fileWriter, contents, onSuccess) {
     fileWriter.onerror = onError;
-    // FIXME: This should be onwrite, but the spec and code need to be changed to allow that.  See https://bugs.webkit.org/show_bug.cgi?id=50846.
-    fileWriter.onwriteend = function() {
+    fileWriter.onwrite = function() {
+        fileWriter.onwrite = null;
         writeString(fileEntry, fileWriter, 0, contents, onSuccess);
     };

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-02  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Some FileWriter progress events should be queued
+        https://bugs.webkit.org/show_bug.cgi?id=50846
+
+        * fileapi/FileWriter.cpp:
+        * fileapi/FileWriter.h:
+        Create a new asynchronous Task [FileWriterCompletionEventTask] that will set readyState to DONE and fire off the right events.
+
 2011-05-02  Jia Pu  <jpu@apple.com>
 

trunk/Source/WebCore/fileapi/FileWriter.cpp

@@ -134 +134 @@
     }
 
-    m_error = FileError::create(FileError::ABORT_ERR);
     writer()->abort();
 }
@@ -154 +153 @@
     if (complete) {
         m_blobBeingWritten.clear();
-        fireEvent(eventNames().writeEvent);
-        m_readyState = DONE;
-        fireEvent(eventNames().writeendEvent);
+        scriptExecutionContext()->postTask(FileWriterCompletionEventTask::create(this, FileError::OK));
     }
 }
@@ -168 +165 @@
         setPosition(length());
     m_truncateLength = -1;
-    fireEvent(eventNames().writeEvent);
+    scriptExecutionContext()->postTask(FileWriterCompletionEventTask::create(this, FileError::OK));
+}
+
+void FileWriter::didFail(FileError::ErrorCode code)
+{
+    ASSERT(code != FileError::OK);
+    m_blobBeingWritten.clear();
+    scriptExecutionContext()->postTask(FileWriterCompletionEventTask::create(this, code));
+}
+
+void FileWriter::signalCompletion(FileError::ErrorCode code)
+{
     m_readyState = DONE;
-    fireEvent(eventNames().writeendEvent);
-}
-
-void FileWriter::didFail(FileError::ErrorCode code)
-{
-    m_error = FileError::create(code);
-    fireEvent(eventNames().errorEvent);
-    if (FileError::ABORT_ERR == code)
-        fireEvent(eventNames().abortEvent);
-    fireEvent(eventNames().errorEvent);
-    m_blobBeingWritten.clear();
-    m_readyState = DONE;
+    if (FileError::OK != code) {
+        m_error = FileError::create(code);
+        fireEvent(eventNames().errorEvent);
+        if (FileError::ABORT_ERR == code)
+            fireEvent(eventNames().abortEvent);
+    } else
+        fireEvent(eventNames().writeEvent);
     fireEvent(eventNames().writeendEvent);
 }

trunk/Source/WebCore/fileapi/FileWriter.h

@@ -37 +37 @@
 #include "EventTarget.h"
 #include "FileWriterBase.h"
+#include "ScriptExecutionContext.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
@@ -103 +104 @@
     void setError(FileError::ErrorCode, ExceptionCode&);
 
+    void signalCompletion(FileError::ErrorCode);
+
+    class FileWriterCompletionEventTask : public ScriptExecutionContext::Task {
+    public:
+        static PassOwnPtr<FileWriterCompletionEventTask> create(PassRefPtr<FileWriter> fileWriter, FileError::ErrorCode code)
+        {
+            return adoptPtr(new FileWriterCompletionEventTask(fileWriter, code));
+        }
+
+
+        virtual void performTask(ScriptExecutionContext*)
+        {
+            m_fileWriter->signalCompletion(m_code);
+        }
+    private:
+        FileWriterCompletionEventTask(PassRefPtr<FileWriter> fileWriter, FileError::ErrorCode code)
+            : m_fileWriter(fileWriter)
+            , m_code(code)
+        {
+        }
+
+        RefPtr<FileWriter> m_fileWriter;
+        FileError::ErrorCode m_code;
+    };
+
     RefPtr<FileError> m_error;
     EventTargetData m_eventTargetData;