Title: [132592] trunk/Source/WebCore
- Revision
- 132592
- Author
- [email protected]
- Date
- 2012-10-26 02:37:55 -0700 (Fri, 26 Oct 2012)
Log Message
FileReader abort case causes Chromium renderer crash
https://bugs.webkit.org/show_bug.cgi?id=99142
Patch by Ningxin Hu <[email protected]> on 2012-10-26
Reviewed by Kentaro Hara.
Before dispatching load event, FileReader should check if it is
in aborting.
Test: manually launch fast/files/file-reader-abort.html in Chromium
browser and compare the result with
fast/files/file-reader-abort-expected.txt.
* fileapi/FileReader.cpp:
(WebCore::FileReader::didFinishLoading):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (132591 => 132592)
--- trunk/Source/WebCore/ChangeLog 2012-10-26 09:34:07 UTC (rev 132591)
+++ trunk/Source/WebCore/ChangeLog 2012-10-26 09:37:55 UTC (rev 132592)
@@ -1,3 +1,20 @@
+2012-10-26 Ningxin Hu <[email protected]>
+
+ FileReader abort case causes Chromium renderer crash
+ https://bugs.webkit.org/show_bug.cgi?id=99142
+
+ Reviewed by Kentaro Hara.
+
+ Before dispatching load event, FileReader should check if it is
+ in aborting.
+
+ Test: manually launch fast/files/file-reader-abort.html in Chromium
+ browser and compare the result with
+ fast/files/file-reader-abort-expected.txt.
+
+ * fileapi/FileReader.cpp:
+ (WebCore::FileReader::didFinishLoading):
+
2012-10-26 Julien Chaffraix <[email protected]>
Generate less repaint calls during subtree detaching
Modified: trunk/Source/WebCore/fileapi/FileReader.cpp (132591 => 132592)
--- trunk/Source/WebCore/fileapi/FileReader.cpp 2012-10-26 09:34:07 UTC (rev 132591)
+++ trunk/Source/WebCore/fileapi/FileReader.cpp 2012-10-26 09:37:55 UTC (rev 132592)
@@ -215,6 +215,9 @@
void FileReader::didFinishLoading()
{
+ if (m_aborting)
+ return;
+
ASSERT(m_state != DONE);
m_state = DONE;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
