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

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

Issue 173523003: Make clearing the animated type at the end of an interval more robust (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Drop explicit timeout in TC. Created 6 years, 10 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/animateTransform-circular-linked-syncbases-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 20ac8cd39ffdb471d997eb0b5a7583e4c6bd64b5..8e3ee0e6307a00ca144e58e03039f7be48046f80 100644
--- a/Source/core/svg/animation/SVGSMILElement.cpp
+++ b/Source/core/svg/animation/SVGSMILElement.cpp
@@ -1020,7 +1020,7 @@ SVGSMILElement::RestartedInterval SVGSMILElement::maybeRestartInterval(SMILTime
}
if (elapsed >= m_intervalEnd) {
- if (resolveNextInterval())
+ if (resolveNextInterval() && elapsed >= m_intervalBegin)
return DidRestartInterval;
}
return DidNotRestartInterval;
@@ -1197,7 +1197,7 @@ bool SVGSMILElement::progress(SMILTime elapsed, SVGSMILElement* resultElement, b
if ((oldActiveState == Active && m_activeState != Active) || restartedInterval == DidRestartInterval) {
smilEndEventSender().dispatchEventSoon(this);
endedActiveInterval();
- if (restartedInterval == DidNotRestartInterval && m_activeState != Frozen && this == resultElement)
+ if (!animationIsContributing && this == resultElement)
clearAnimatedType(m_targetElement);
}
« no previous file with comments | « LayoutTests/svg/animations/animateTransform-circular-linked-syncbases-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698