[webkit-changes] [127636] branches/chromium/1229

Wed, 05 Sep 2012 12:46:51 -0700

Title: [127636] branches/chromium/1229

Diff

Copied: branches/chromium/1229/LayoutTests/fast/files/file-reader-done-reading-abort-expected.txt (from rev 127082, trunk/LayoutTests/fast/files/file-reader-done-reading-abort-expected.txt) (0 => 127636)


--- branches/chromium/1229/LayoutTests/fast/files/file-reader-done-reading-abort-expected.txt	                        (rev 0)
+++ branches/chromium/1229/LayoutTests/fast/files/file-reader-done-reading-abort-expected.txt	2012-09-05 19:47:34 UTC (rev 127636)
@@ -0,0 +1,3 @@
+Test that FileReader.abort after reading is done doesn't fire events.
+DONE
+

Copied: branches/chromium/1229/LayoutTests/fast/files/file-reader-done-reading-abort.html (from rev 127082, trunk/LayoutTests/fast/files/file-reader-done-reading-abort.html) (0 => 127636)


--- branches/chromium/1229/LayoutTests/fast/files/file-reader-done-reading-abort.html	                        (rev 0)
+++ branches/chromium/1229/LayoutTests/fast/files/file-reader-done-reading-abort.html	2012-09-05 19:47:34 UTC (rev 127636)
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<body>
+<pre id='console'></pre>
+<script src=""
+<script>
+function log(message)
+{
+    document.getElementById('console').appendChild(document.createTextNode(message + "\n"));
+}
+
+function runTest()
+{
+    log("Test that FileReader.abort after reading is done doesn't fire events.");
+
+    var text = "Hello";
+    var reader = new FileReader();
+
+    reader._onloadend_ = function(event) {
+        fileString = event.target.result;
+        if (fileString != text)
+            log("Incorrect data read, expected " + text + ", got " + fileString);
+
+        reader._onabort_ = function() {
+            log("Received abort event after reading");
+        };
+        reader._onload_ = function() {
+            log("Received load event after reading");
+        };
+        reader._onloadend_ = function() {
+            log("Received loadend event after reading");
+        };
+        reader._onloadstart_ = function() {
+            log("Received load start event after reading");
+        };
+        reader._onprogress_ = function() {
+            log("Received progress event after reading");
+        };
+
+        reader.abort();
+        gc();
+        finishTest();
+    }
+
+    reader._onerror_ = function(event) {
+        log("Received error event: " + event.target.error.code);
+    };
+
+    reader.readAsText(new Blob([text]));
+}
+
+function finishTest()
+{
+    log("DONE");
+    if (testRunner.notifyDone)
+        testRunner.notifyDone();
+}
+
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+}
+
+window._onload_ = runTest;
+</script>
+</body>
+</html>

Copied: branches/chromium/1229/LayoutTests/fast/files/file-reader-immediate-abort-expected.txt (from rev 127082, trunk/LayoutTests/fast/files/file-reader-immediate-abort-expected.txt) (0 => 127636)


--- branches/chromium/1229/LayoutTests/fast/files/file-reader-immediate-abort-expected.txt	                        (rev 0)
+++ branches/chromium/1229/LayoutTests/fast/files/file-reader-immediate-abort-expected.txt	2012-09-05 19:47:34 UTC (rev 127636)
@@ -0,0 +1,6 @@
+Test that FileReader.abort on newly created FileReader doesn't crash.
+PASSED
+Test that FileReader.abort on newly created FileReader doesn't fire events.
+PASSED
+DONE
+

Copied: branches/chromium/1229/LayoutTests/fast/files/file-reader-immediate-abort.html (from rev 127082, trunk/LayoutTests/fast/files/file-reader-immediate-abort.html) (0 => 127636)


--- branches/chromium/1229/LayoutTests/fast/files/file-reader-immediate-abort.html	                        (rev 0)
+++ branches/chromium/1229/LayoutTests/fast/files/file-reader-immediate-abort.html	2012-09-05 19:47:34 UTC (rev 127636)
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html>
+<body>
+<pre id='console'></pre>
+<script src=""
+<script>
+function log(message)
+{
+    document.getElementById('console').appendChild(document.createTextNode(message + "\n"));
+}
+
+function test1()
+{
+    log("Test that FileReader.abort on newly created FileReader doesn't crash.");
+    new FileReader().abort();
+}
+
+function test2()
+{
+    log("Test that FileReader.abort on newly created FileReader doesn't fire events.");
+
+    var reader = new FileReader();
+    reader._onload_ = function() {
+        log("Received load event");
+    };
+    reader._onloadend_ = function() {
+        log("Received loadend event");
+    };
+    reader._onabort_ = function() {
+        log("Received abort event");
+    };
+    reader._onerror_ = function(event) {
+        log("Received error event: " + event.target.error.code);
+    };
+
+    reader.abort();
+}
+
+function runTests()
+{
+    test1();
+    gc();
+    log("PASSED");
+
+    test2();
+    gc();
+    log("PASSED");
+
+    log("DONE");
+    if (testRunner.notifyDone)
+        testRunner.notifyDone();
+}
+
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+}
+
+window._onload_ = runTests;
+</script>
+</body>
+</html>

Modified: branches/chromium/1229/Source/WebCore/fileapi/FileReader.cpp (127635 => 127636)


--- branches/chromium/1229/Source/WebCore/fileapi/FileReader.cpp	2012-09-05 19:46:55 UTC (rev 127635)
+++ branches/chromium/1229/Source/WebCore/fileapi/FileReader.cpp	2012-09-05 19:47:34 UTC (rev 127636)
@@ -161,7 +161,7 @@
 {
     LOG(FileAPI, "FileReader: aborting\n");
 
-    if (m_aborting)
+    if (m_aborting || m_state != LOADING)
         return;
     m_aborting = true;
 

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to