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

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

Issue 1515573002: Safely finalize an AnimationTimeline's still-attached Animations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unconditonally register prefinalizer Created 5 years 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/Source/core/animation/AnimationTimeline.h ('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/AnimationTimeline.cpp
diff --git a/third_party/WebKit/Source/core/animation/AnimationTimeline.cpp b/third_party/WebKit/Source/core/animation/AnimationTimeline.cpp
index 14882ee5cee826d20c1119988f98d082b565882d..d39fd4b3aa9a53b9b7ad36e3529a523f86a20c13 100644
--- a/third_party/WebKit/Source/core/animation/AnimationTimeline.cpp
+++ b/third_party/WebKit/Source/core/animation/AnimationTimeline.cpp
@@ -72,6 +72,7 @@ AnimationTimeline::AnimationTimeline(Document* document, PlatformTiming* timing)
, m_playbackRate(1)
, m_lastCurrentTimeInternal(0)
{
+ ThreadState::current()->registerPreFinalizer(this);
if (!timing)
m_timing = new AnimationTimelineTiming(this);
else
@@ -89,6 +90,17 @@ AnimationTimeline::~AnimationTimeline()
{
}
+void AnimationTimeline::dispose()
+{
+ // The Animation objects depend on using this AnimationTimeline to
+ // unregister from its underlying compositor timeline. To arrange
+ // for that safely, this dispose() method will return first
+ // during prefinalization, notifying each Animation object of
+ // impending destruction.
+ for (const auto& animation : m_animations)
+ animation->dispose();
+}
+
bool AnimationTimeline::isActive()
{
return m_document && m_document->page();
« no previous file with comments | « third_party/WebKit/Source/core/animation/AnimationTimeline.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698