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

Unified Diff: Source/core/animation/ElementAnimations.cpp

Issue 1322883003: Oilpan: KeyframeEffect::m_target shouldn't become stale (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | « Source/core/animation/ElementAnimations.h ('k') | Source/core/animation/KeyframeEffect.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/ElementAnimations.cpp
diff --git a/Source/core/animation/ElementAnimations.cpp b/Source/core/animation/ElementAnimations.cpp
index 195b4fa0fa133479673be576efc42b21a279444d..68ee7970f3be7c0d3066c14d02805d59fbd88bd3 100644
--- a/Source/core/animation/ElementAnimations.cpp
+++ b/Source/core/animation/ElementAnimations.cpp
@@ -42,7 +42,23 @@ ElementAnimations::ElementAnimations()
ElementAnimations::~ElementAnimations()
{
+#if !ENABLE(OILPAN)
+ ASSERT(m_effects.isEmpty());
+#endif
+}
+
+#if !ENABLE(OILPAN)
+void ElementAnimations::dispose()
+{
+ // The notifyElementDestroyed() is called for elements that happen to live
+ // longer than the KeyframeEffect. This undeterminism is fine because
+ // all the notifyElementDestroyed() does is to clear the raw pointers
+ // held by the KeyframeEffect.
+ for (KeyframeEffect* effect : m_effects)
+ effect->notifyElementDestroyed();
+ m_effects.clear();
}
+#endif
void ElementAnimations::updateAnimationFlags(ComputedStyle& style)
{
@@ -88,6 +104,9 @@ DEFINE_TRACE(ElementAnimations)
visitor->trace(m_cssAnimations);
visitor->trace(m_defaultStack);
visitor->trace(m_animations);
+#if !ENABLE(OILPAN)
+ visitor->trace(m_effects);
+#endif
}
const ComputedStyle* ElementAnimations::baseComputedStyle() const
« no previous file with comments | « Source/core/animation/ElementAnimations.h ('k') | Source/core/animation/KeyframeEffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698