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

Unified Diff: third_party/WebKit/Source/core/animation/Animation.cpp

Issue 2535793002: Revert of Blink Animation: Extend Animation's GC lifetime if it has a finish promise. (Closed)
Patch Set: Created 4 years, 1 month 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 | « third_party/WebKit/LayoutTests/web-animations-api/animation-finish-promise-gc.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/animation/Animation.cpp
diff --git a/third_party/WebKit/Source/core/animation/Animation.cpp b/third_party/WebKit/Source/core/animation/Animation.cpp
index 5de8b9515a3fa10bab9c8bbb1d4da1e8f7a39b83..8b9f2414f1bbeba0c50e8c9ef1c391e036445a92 100644
--- a/third_party/WebKit/Source/core/animation/Animation.cpp
+++ b/third_party/WebKit/Source/core/animation/Animation.cpp
@@ -650,11 +650,7 @@
}
bool Animation::hasPendingActivity() const {
- bool hasPendingPromise =
- m_finishedPromise &&
- m_finishedPromise->getState() == ScriptPromisePropertyBase::Pending;
-
- return m_pendingFinishedEvent || hasPendingPromise ||
+ return m_pendingFinishedEvent ||
(!m_finished && hasEventListeners(EventTypeNames::finish));
}
« no previous file with comments | « third_party/WebKit/LayoutTests/web-animations-api/animation-finish-promise-gc.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698