Changeset 69560 in webkit

Timestamp:

Oct 11, 2010 9:08:42 PM (14 years ago)

Author:

dumi@chromium.org

Message:

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

Reviewed by Dumitru Daniliuc.

FileWriter should hold a reference to a Blob during write
​https://bugs.webkit.org/show_bug.cgi?id=47318

Without this reference, the Blob might get garbage-collected from JS
before the write has completed, which would be quite unintuitive to the
user. I just grab a RefPtr to the Blob at write(), then clear it when
we're done.

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

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

Reviewed by Dumitru Daniliuc.

FileWriter should hold a reference to a Blob during write
​https://bugs.webkit.org/show_bug.cgi?id=47318

Added the first FileWriter test to cover this.
Problem #1: it's not a deterministic problem; the test might or might
not catch the error, but at least it won't ever trigger a false
positive.
Problem #2: no platform fully implements FileWriter yet, so this test
must start out completely supressed. All non-chromium platforms
already skip all filesystem tests, so I'm only adding a suppression in
chromium.

• fast/filesystem/file-writer-gc-blob-expected.txt: Added.
• fast/filesystem/file-writer-gc-blob.html: Added.
• platform/chromium/test_expectations.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/filesystem/file-writer-gc-blob-expected.txt (added)
• LayoutTests/fast/filesystem/file-writer-gc-blob.html (added)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/fileapi/FileWriter.cpp (modified) (4 diffs)
• WebCore/fileapi/FileWriter.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-11  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by Dumitru Daniliuc.
+
+        FileWriter should hold a reference to a Blob during write
+        https://bugs.webkit.org/show_bug.cgi?id=47318
+
+        Added the first FileWriter test to cover this.
+        Problem #1: it's not a deterministic problem; the test might or might
+        not catch the error, but at least it won't ever trigger a false
+        positive.
+        Problem #2: no platform fully implements FileWriter yet, so this test
+        must start out completely supressed.  All non-chromium platforms
+        already skip all filesystem tests, so I'm only adding a suppression in
+        chromium.
+        * fast/filesystem/file-writer-gc-blob-expected.txt: Added.
+        * fast/filesystem/file-writer-gc-blob.html: Added.
+        * platform/chromium/test_expectations.txt:
+
 2010-10-11  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -3209 +3209 @@
 BUG58358 MAC : fast/css/transformed-mask.html = IMAGE
 
+// FileWriter isn't in TestShell yet.
+BUG58587 SKIP : fast/filesystem/file-writer-gc-blob.html = FAIL
+
 // Failing somewhere between after Webkit r69367 and r69417.
 BUG_AJWONG WIN LINUX : svg/W3C-SVG-1.1/pservers-grad-17-b.svg = IMAGE

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-11  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by Dumitru Daniliuc.
+
+        FileWriter should hold a reference to a Blob during write
+        https://bugs.webkit.org/show_bug.cgi?id=47318
+
+        Without this reference, the Blob might get garbage-collected from JS
+        before the write has completed, which would be quite unintuitive to the
+        user.  I just grab a RefPtr to the Blob at write(), then clear it when
+        we're done.
+
+        * fileapi/FileWriter.cpp:
+        (WebCore::FileWriter::stop):
+        (WebCore::FileWriter::write):
+        (WebCore::FileWriter::didWrite):
+        (WebCore::FileWriter::didFail):
+        * fileapi/FileWriter.h:
+
 2010-10-11  Michael Saboff  <msaboff@apple.com>
 

trunk/WebCore/fileapi/FileWriter.cpp

@@ -83 +83 @@
     if (m_writer && m_readyState == WRITING)
         m_writer->abort();
+    m_blobBeingWritten.clear();
     m_readyState = DONE;
 }
@@ -100 +101 @@
     }
 
+    m_blobBeingWritten = data;
     m_readyState = WRITING;
     m_startedWriting = false;
@@ -170 +172 @@
     fireEvent(eventNames().progressEvent);
     if (complete) {
+        m_blobBeingWritten.clear();
         fireEvent(eventNames().writeEvent);
         m_readyState = DONE;
@@ -196 +199 @@
         fireEvent(eventNames().abortEvent);
     fireEvent(eventNames().errorEvent);
+    m_blobBeingWritten.clear();
     m_readyState = DONE;
     fireEvent(eventNames().writeendEvent);

trunk/WebCore/fileapi/FileWriter.h

@@ -124 +124 @@
     long long m_bytesToWrite;
     long long m_truncateLength;
+    RefPtr<Blob> m_blobBeingWritten;
 };