Changeset 69140 in webkit

Timestamp:

Oct 5, 2010 1:28:59 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-05 Eric Uhrhane <​ericu@chromium.org>

Reviewed by David Levin.

Relax restrictions on FileWriter::didWrite calls
​https://bugs.webkit.org/show_bug.cgi?id=47139

No new tests; they're still waiting on the first implementation.

• fileapi/FileWriter.cpp: (WebCore::FileWriter::FileWriter): (WebCore::FileWriter::write): (WebCore::FileWriter::didWrite):
• fileapi/FileWriter.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• fileapi/FileWriter.cpp (modified) (3 diffs)
• fileapi/FileWriter.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-05  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by David Levin.
+
+        Relax restrictions on FileWriter::didWrite calls
+        https://bugs.webkit.org/show_bug.cgi?id=47139
+
+        No new tests; they're still waiting on the first implementation.
+
+        * fileapi/FileWriter.cpp:
+        (WebCore::FileWriter::FileWriter):
+        (WebCore::FileWriter::write):
+        (WebCore::FileWriter::didWrite):
+        * fileapi/FileWriter.h:
+
 2010-10-05  Daniel Cheng  <dcheng@chromium.org>
 

trunk/WebCore/fileapi/FileWriter.cpp

@@ -47 +47 @@
     , m_readyState(INIT)
     , m_position(0)
+    , m_startedWriting(false)
     , m_bytesWritten(0)
     , m_bytesToWrite(0)
@@ -93 +94 @@
         return;
     }
+    if (!data) {
+        ec = TYPE_MISMATCH_ERR;
+        m_error = FileError::create(ec);
+        return;
+    }
 
     m_readyState = WRITING;
+    m_startedWriting = false;
     m_bytesWritten = 0;
     m_bytesToWrite = data->size();
@@ -150 +157 @@
 void FileWriter::didWrite(long long bytes, bool complete)
 {
-    ASSERT(bytes > 0);
     ASSERT(bytes + m_bytesWritten > 0);
     ASSERT(bytes + m_bytesWritten <= m_bytesToWrite);
-    if (!m_bytesWritten)
+    if (!m_startedWriting) {
         fireEvent(eventNames().writestartEvent);
+        m_startedWriting = true;
+    }
     m_bytesWritten += bytes;
-    ASSERT((m_bytesWritten == m_bytesToWrite) == complete);
+    ASSERT((m_bytesWritten == m_bytesToWrite) || !complete);
     m_position += bytes;
     if (m_position > m_length)

trunk/WebCore/fileapi/FileWriter.h

@@ -120 +120 @@
     long long m_position;
     long long m_length;
+    bool m_startedWriting;
     long long m_bytesWritten;
     long long m_bytesToWrite;