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

Unified Diff: Source/core/svg/animation/SVGSMILElement.cpp

Issue 316013003: Frozen animations still contribute to the sandwich/animation stack (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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/svg/animations/animate-to-low-prio-frozen-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/svg/animation/SVGSMILElement.cpp
diff --git a/Source/core/svg/animation/SVGSMILElement.cpp b/Source/core/svg/animation/SVGSMILElement.cpp
index b72117b966a7d7787624fdc5d74c5aedb67c8391..55ba7471277a107c1de29bfa1d1c0c69615a7b73 100644
--- a/Source/core/svg/animation/SVGSMILElement.cpp
+++ b/Source/core/svg/animation/SVGSMILElement.cpp
@@ -1154,13 +1154,15 @@ bool SVGSMILElement::progress(SMILTime elapsed, SVGSMILElement* resultElement, b
if (elapsed < m_interval.begin) {
ASSERT(m_activeState != Active);
- if (m_activeState == Frozen) {
+ bool isFrozen = (m_activeState == Frozen);
+ if (isFrozen) {
if (this == resultElement)
resetAnimatedType();
updateAnimation(m_lastPercent, m_lastRepeat, resultElement);
}
m_nextProgressTime = m_interval.begin;
- return false;
+ // If the animation is frozen, it's still contributing.
+ return isFrozen;
}
m_previousIntervalBegin = m_interval.begin;
« no previous file with comments | « LayoutTests/svg/animations/animate-to-low-prio-frozen-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698