Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(602)

Unified Diff: Source/core/fileapi/FileReader.cpp

Issue 538983002: Merge 180450 "Avoid GCing an aborting and stopped FileReader." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2125/
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/files/resources/file-reader-abort-gc-iframe.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/fileapi/FileReader.cpp
===================================================================
--- Source/core/fileapi/FileReader.cpp (revision 181364)
+++ Source/core/fileapi/FileReader.cpp (working copy)
@@ -243,6 +243,10 @@
void FileReader::stop()
{
+ // The delayed abort task tidies up and advances to the DONE state.
+ if (m_loadingState == LoadingStateAborted)
+ return;
+
if (hasPendingActivity())
ThrottlingController::finishReader(executionContext(), this, ThrottlingController::removeReader(executionContext(), this));
terminate();
« no previous file with comments | « LayoutTests/fast/files/resources/file-reader-abort-gc-iframe.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698