Refactor SMIL animation value updates

third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp

Index: third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp
diff --git a/third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp b/third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp
index 31195dc870d7e0b5e4c603bfdd11f95bd3a30823..85f448bb01e9209c2bc4a717f10003b5483fd2da 100644
--- a/third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp
@@ -190,20 +190,18 @@ void SVGAnimateElement::resetAnimatedType()
             addReferenceTo(element);
 
         if (!m_animatedProperty)
-            m_animatedProperty = m_animator.startAnimValAnimation(animatedElements);
+            m_animatedProperty = m_animator.startAnimValAnimation();
         else
-            m_animatedProperty = m_animator.resetAnimValToBaseVal(animatedElements);
+            m_animatedProperty = m_animator.resetAnimValToBaseVal();
 
         return;
     }
+    DCHECK_EQ(shouldApply, ApplyCSSAnimation);
 
     // CSS properties animation code-path.
     String baseValue;
-
-    if (shouldApply == ApplyCSSAnimation) {
-        ASSERT(SVGAnimationElement::isTargetAttributeCSSProperty(targetElement, attributeName));
-        computeCSSPropertyValue(targetElement, cssPropertyID(attributeName.localName()), baseValue);
-    }
+    DCHECK(isTargetAttributeCSSProperty(targetElement, attributeName));
+    computeCSSPropertyValue(targetElement, cssPropertyID(attributeName.localName()), baseValue);
 
     m_animatedProperty = m_animator.constructFromString(baseValue);
 }
@@ -282,8 +280,7 @@ void SVGAnimateElement::clearAnimatedType()
 
     // SVG DOM animVal animation code-path.
     if (m_animatedProperty) {
-        SVGElementInstances animatedElements = findElementInstances(targetElement);
-        m_animator.stopAnimValAnimation(animatedElements);
+        m_animator.stopAnimValAnimation();
         notifyTargetAndInstancesAboutAnimValChange(targetElement, attributeName());
     }