Fold bits of SVGAnimatedTypeAnimator into SVGAnimateElement

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

 /*
  * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. 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.
@@ skipping 67 matching lines @@
 
 bool SVGAnimateElement::hasValidAttributeType()
 {
     SVGElement* targetElement = this->targetElement();
     if (!targetElement)
         return false;
 
     return animatedPropertyType() != AnimatedUnknown && !hasInvalidCSSAttributeType();
 }
 
+namespace {
+
+class ParsePropertyFromString {
+    STACK_ALLOCATED();
+public:
+    explicit ParsePropertyFromString(SVGAnimatedTypeAnimator* animator)
+        : m_animator(animator)
+    {
+    }
+
+    SVGPropertyBase* operator()(SVGAnimationElement*, const String& value)
+    {
+        return m_animator->createPropertyForAnimation(value);
+    }
+
+private:
+    SVGAnimatedTypeAnimator* m_animator;
+};
+
+}
+
 void SVGAnimateElement::calculateAnimatedValue(float percentage, unsigned repeatCount, SVGSMILElement* resultElement)
 {
     ASSERT(resultElement);
     SVGElement* targetElement = this->targetElement();
     if (!targetElement || !isSVGAnimateElement(*resultElement))
         return;
 
     ASSERT(percentage >= 0 && percentage <= 1);
     ASSERT(animatedPropertyType() != AnimatedTransformList || isSVGAnimateTransformElement(*this));
     ASSERT(animatedPropertyType() != AnimatedUnknown);
     ASSERT(m_fromProperty);
     ASSERT(m_fromProperty->type() == animatedPropertyType());
     ASSERT(m_toProperty);
 
     SVGAnimateElement* resultAnimationElement = toSVGAnimateElement(resultElement);
     ASSERT(resultAnimationElement->m_animatedProperty);
     ASSERT(resultAnimationElement->animatedPropertyType() == animatedPropertyType());
 
     if (isSVGSetElement(*this))
         percentage = 1;
 
     if (getCalcMode() == CalcModeDiscrete)
         percentage = percentage < 0.5 ? 0 : 1;
 
     // Target element might have changed.
     m_animator.setContextElement(targetElement);
 
-    // Values-animation accumulates using the last values entry corresponding to the end of duration time.
-    SVGPropertyBase* toAtEndOfDurationProperty = m_toAtEndOfDurationProperty ? m_toAtEndOfDurationProperty.get() : m_toProperty.get();
-    m_animator.calculateAnimatedValue(percentage, repeatCount, m_fromProperty.get(), m_toProperty.get(), toAtEndOfDurationProperty, resultAnimationElement->m_animatedProperty.get());
+    // Values-animation accumulates using the last values entry corresponding to
+    // the end of duration time.
+    SVGPropertyBase* animatedValue = resultAnimationElement->m_animatedProperty;
+    SVGPropertyBase* toAtEndOfDurationValue =
+        m_toAtEndOfDurationProperty ? m_toAtEndOfDurationProperty : m_toProperty;
+    SVGPropertyBase* fromValue =
+        getAnimationMode() == ToAnimation ? animatedValue : m_fromProperty.get();
+    SVGPropertyBase* toValue = m_toProperty;
+
+    // Apply CSS inheritance rules.
+    ParsePropertyFromString parsePropertyFromString(&m_animator);
+    adjustForInheritance<SVGPropertyBase*, ParsePropertyFromString>(

[pdr., 2016/09/30 19:32:19]

These are the only users of ParsePropertyFromString. Can we just remove that
class and move the logic into adjustForInheritance?

[fs, 2016/09/30 19:39:07]

You're way ahead of me it seems ;-) - that was going to be (one of) my next
CL(s) to this code.

+        parsePropertyFromString, fromPropertyValueType(), fromValue, targetElement);
+    adjustForInheritance<SVGPropertyBase*, ParsePropertyFromString>(
+        parsePropertyFromString, toPropertyValueType(), toValue, targetElement);
+
+    animatedValue->calculateAnimatedValue(
+        this, percentage, repeatCount, fromValue, toValue, toAtEndOfDurationValue, targetElement);
 }
 
 bool SVGAnimateElement::calculateToAtEndOfDurationValue(const String& toAtEndOfDurationString)
 {
     if (toAtEndOfDurationString.isEmpty())
         return false;
-    m_toAtEndOfDurationProperty = m_animator.createAnimatedValueFromString(toAtEndOfDurationString);
+    m_toAtEndOfDurationProperty = m_animator.createPropertyForAnimation(toAtEndOfDurationString);
     return true;
 }
 
 bool SVGAnimateElement::calculateFromAndToValues(const String& fromString, const String& toString)
 {
     SVGElement* targetElement = this->targetElement();
     if (!targetElement)
         return false;
 
     determinePropertyValueTypes(fromString, toString);
-    m_animator.calculateFromAndToValues(m_fromProperty, m_toProperty, fromString, toString);
+    m_fromProperty = m_animator.createPropertyForAnimation(fromString);
+    m_toProperty = m_animator.createPropertyForAnimation(toString);
     return true;
 }
 
 bool SVGAnimateElement::calculateFromAndByValues(const String& fromString, const String& byString)
 {
     SVGElement* targetElement = this->targetElement();
     if (!targetElement)
         return false;
 
     if (getAnimationMode() == ByAnimation && !isAdditive())
         return false;
 
     // from-by animation may only be used with attributes that support addition (e.g. most numeric attributes).
     if (getAnimationMode() == FromByAnimation && !animatedPropertyTypeSupportsAddition())
         return false;
 
     ASSERT(!isSVGSetElement(*this));
 
     determinePropertyValueTypes(fromString, byString);
-    m_animator.calculateFromAndByValues(m_fromProperty, m_toProperty, fromString, byString);
+    m_fromProperty = m_animator.createPropertyForAnimation(fromString);
+    m_toProperty = m_animator.createPropertyForAnimation(byString);
+    m_toProperty->add(m_fromProperty, targetElement);
     return true;
 }
 
 void SVGAnimateElement::resetAnimatedType()
 {
     SVGElement* targetElement = this->targetElement();
     const QualifiedName& attributeName = this->attributeName();
 
     m_animator.reset(targetElement);
 
     ShouldApplyAnimationType shouldApply = shouldApplyAnimation(targetElement, attributeName);
     if (shouldApply == DontApplyAnimation)
         return;
     if (shouldApply == ApplyXMLAnimation || shouldApply == ApplyXMLandCSSAnimation) {
         // SVG DOM animVal animation code-path.
         m_animatedProperty = m_animator.createAnimatedValue();
         targetElement->setAnimatedAttribute(attributeName, m_animatedProperty);
         return;
     }
     DCHECK_EQ(shouldApply, ApplyCSSAnimation);
 
     // CSS properties animation code-path.
     String baseValue;
     DCHECK(isTargetAttributeCSSProperty(targetElement, attributeName));
     computeCSSPropertyValue(targetElement, cssPropertyID(attributeName.localName()), baseValue);
 
-    m_animatedProperty = m_animator.createAnimatedValueFromString(baseValue);
+    m_animatedProperty = m_animator.createPropertyForAnimation(baseValue);
 }
 
 void SVGAnimateElement::clearAnimatedType()
 {
     if (!m_animatedProperty)
         return;
 
     // The animated property lock is held for the "result animation" (see SMILTimeContainer::updateAnimations())
     // while we're processing an animation group. We will very likely crash later if we clear the animated type
     // while the lock is held. See crbug.com/581546.
@@ skipping 78 matching lines @@
 
     return SVGAnimationElement::isAdditive();
 }
 
 float SVGAnimateElement::calculateDistance(const String& fromString, const String& toString)
 {
     // FIXME: A return value of float is not enough to support paced animations on lists.
     SVGElement* targetElement = this->targetElement();
     if (!targetElement)
         return -1;
-
-    return m_animator.calculateDistance(fromString, toString);
+    SVGPropertyBase* fromValue = m_animator.createPropertyForAnimation(fromString);
+    SVGPropertyBase* toValue = m_animator.createPropertyForAnimation(toString);
+    return fromValue->calculateDistance(toValue, targetElement);
 }
 
 void SVGAnimateElement::setTargetElement(SVGElement* target)
 {
     SVGAnimationElement::setTargetElement(target);
     resetAnimatedPropertyType();
 }
 
 void SVGAnimateElement::setAttributeName(const QualifiedName& attributeName)
 {
@@ skipping 14 matching lines @@
 {
     visitor->trace(m_fromProperty);
     visitor->trace(m_toProperty);
     visitor->trace(m_toAtEndOfDurationProperty);
     visitor->trace(m_animatedProperty);
     visitor->trace(m_animator);
     SVGAnimationElement::trace(visitor);
 }
 
 } // namespace blink