Refactor SMIL animation value updates

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

 /*
  * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
  * Copyright (C) 2013 Samsung Electronics. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 143 matching lines @@
     to = constructFromString(toString);
 }
 
 void SVGAnimatedTypeAnimator::calculateFromAndByValues(Member<SVGPropertyBase>& from, Member<SVGPropertyBase>& to, const String& fromString, const String& byString)
 {
     from = constructFromString(fromString);
     to = constructFromString(byString);
     to->add(from, m_contextElement);
 }
 
-namespace {
-
-void setAnimatedValueOnAllTargetProperties(const SVGElementInstances& list, const QualifiedName& attributeName, SVGPropertyBase* value)
+SVGPropertyBase* SVGAnimatedTypeAnimator::resetAnimation()
 {
-    for (SVGElement* elementInstance : list) {
-        if (SVGAnimatedPropertyBase* animatedProperty = elementInstance->propertyFromAttribute(attributeName))
-            animatedProperty->setAnimatedValue(value);
-    }
-}
-
-} // namespace
-
-SVGPropertyBase* SVGAnimatedTypeAnimator::resetAnimation(const SVGElementInstances& list)
-{
-    ASSERT(isAnimatingSVGDom());
+    DCHECK(isAnimatingSVGDom());
+    DCHECK(m_contextElement);
     SVGPropertyBase* animatedValue = m_animatedProperty->createAnimatedValue();
-    ASSERT(animatedValue->type() == m_type);
-    setAnimatedValueOnAllTargetProperties(list, m_animatedProperty->attributeName(), animatedValue);
-
+    DCHECK_EQ(animatedValue->type(), m_type);
+    m_contextElement->setAnimatedAttribute(m_animatedProperty->attributeName(), animatedValue);
     return animatedValue;
 }
 
-SVGPropertyBase* SVGAnimatedTypeAnimator::startAnimValAnimation(const SVGElementInstances& list)
+SVGPropertyBase* SVGAnimatedTypeAnimator::startAnimValAnimation()
 {
-    ASSERT(isAnimatingSVGDom());
-    SVGElement::InstanceUpdateBlocker blocker(m_contextElement);
-
-    return resetAnimation(list);
+    return resetAnimation();
 }
 
-void SVGAnimatedTypeAnimator::stopAnimValAnimation(const SVGElementInstances& list)
+void SVGAnimatedTypeAnimator::stopAnimValAnimation()
 {
     if (!isAnimatingSVGDom())
         return;
-
-    ASSERT(m_contextElement);
-    SVGElement::InstanceUpdateBlocker blocker(m_contextElement);
-
-    for (SVGElement* elementInstance : list) {
-        if (SVGAnimatedPropertyBase* animatedProperty = elementInstance->propertyFromAttribute(m_animatedProperty->attributeName()))
-            animatedProperty->animationEnded();
-    }
+    DCHECK(m_contextElement);
+    m_contextElement->clearAnimatedAttribute(m_animatedProperty->attributeName());
 }
 
-SVGPropertyBase* SVGAnimatedTypeAnimator::resetAnimValToBaseVal(const SVGElementInstances& list)
+SVGPropertyBase* SVGAnimatedTypeAnimator::resetAnimValToBaseVal()
 {
-    SVGElement::InstanceUpdateBlocker blocker(m_contextElement);
-
-    return resetAnimation(list);
+    return resetAnimation();
 }
 
 class ParsePropertyFromString {
     STACK_ALLOCATED();
 public:
     explicit ParsePropertyFromString(SVGAnimatedTypeAnimator* animator)
         : m_animator(animator)
     {
     }
 
@@ skipping 33 matching lines @@
 }
 
 DEFINE_TRACE(SVGAnimatedTypeAnimator)
 {
     visitor->trace(m_animationElement);
     visitor->trace(m_contextElement);
     visitor->trace(m_animatedProperty);
 }
 
 } // namespace blink