[SVG] SVGAnimatedTransform{,List} migration to new SVG property impl.

Source/core/svg/SVGAnimatedNewPropertyAnimator.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/svg/SVGAnimatedNewPropertyAnimator.h"
 
+#include "core/svg/SVGAnimateTransformElement.h"
 #include "core/svg/SVGAnimatedColor.h"
 #include "core/svg/SVGAnimationElement.h"
+#include "core/svg/SVGColor.h"
 #include "core/svg/SVGElementInstance.h"
 #include "core/svg/SVGLength.h"
 #include "core/svg/SVGLengthList.h"
 #include "core/svg/SVGNumber.h"
 #include "core/svg/SVGPointList.h"
 #include "core/svg/SVGString.h"
+#include "core/svg/SVGTransformList.h"
 
 namespace WebCore {
 
 SVGAnimatedNewPropertyAnimator::SVGAnimatedNewPropertyAnimator(AnimatedPropertyType type, SVGAnimationElement* animationElement, SVGElement* contextElement)
     : SVGAnimatedTypeAnimator(type, animationElement, contextElement)
 {
     ASSERT(m_animationElement);
     ASSERT(m_contextElement);
 
     const QualifiedName& attributeName = m_animationElement->attributeName();
     m_animatedProperty = m_contextElement->propertyFromAttribute(attributeName);
     if (m_animatedProperty)
         ASSERT(m_animatedProperty->type() == m_type);
 }
 
 SVGAnimatedNewPropertyAnimator::~SVGAnimatedNewPropertyAnimator()
 {
 }
 
 PassRefPtr<NewSVGPropertyBase> SVGAnimatedNewPropertyAnimator::createPropertyForAnimation(const String& value)
 {
     if (isAnimatingSVGDom()) {
+        // SVG DOM animVal animation code-path.
+
+        if (m_type == AnimatedTransformList) {

[haraken, 2014/02/11 17:00:21]

Would you add a comment about why we need to treat AnimatedTransformList
specially?

[kouhei (in TOK), 2014/02/12 01:57:49]

Done.

+            ASSERT(m_animationElement);
+            SVGTransformType transformType = toSVGAnimateTransformElement(m_animationElement)->transformType();
+            return SVGTransformList::create(transformType, value);
+        }
+
         ASSERT(m_animatedProperty);
-
-        // SVG DOM animVal animation code-path.
         return m_animatedProperty->currentValueBase()->cloneForAnimation(value);
     }
 
     ASSERT(isAnimatingCSSProperty());
 
     // CSS properties animation code-path.
     // Create a basic instance of the corresponding SVG property.
     // The instance will not have full context info. (e.g. SVGLengthMode)
 
     switch (m_type) {
@@ skipping 15 matching lines @@
         return property.release();
     }
     case AnimatedString: {
         RefPtr<SVGString> property = SVGString::create();
         property->setValueAsString(value, IGNORE_EXCEPTION);
         return property.release();
     }
 
     // These types don't appear in the table in SVGElement::cssPropertyToTypeMap() and thus don't need support.
     case AnimatedBoolean:
+    case AnimatedMatrix:
     case AnimatedNumberList:
     case AnimatedNumberOptionalNumber:
     case AnimatedPoint:
     case AnimatedPoints:
     case AnimatedRect:
+    case AnimatedTransform:
+    case AnimatedTransformList:
         ASSERT_NOT_REACHED();
 
     // These properties are not yet migrated to NewProperty implementation. see http://crbug.com/308818
     case AnimatedAngle:
     case AnimatedEnumeration:
     case AnimatedInteger:
     case AnimatedIntegerOptionalInteger:
     case AnimatedPath:
     case AnimatedPreserveAspectRatio:
     case AnimatedStringList:
-    case AnimatedTransformList:
         ASSERT_NOT_REACHED();
 
     case AnimatedUnknown:
         ASSERT_NOT_REACHED();
     };
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
@@ skipping 25 matching lines @@
     for (; it != itEnd; ++it) {
         RefPtr<NewSVGAnimatedPropertyBase> animatedProperty = it->element->propertyFromAttribute(attributeName);
         animatedProperty->setAnimatedValue(value);
     }
 }
 
 }
 
 PassRefPtr<NewSVGPropertyBase> SVGAnimatedNewPropertyAnimator::resetAnimation(const SVGElementAnimatedPropertyList& list)
 {
+    ASSERT(m_animationElement);
     ASSERT(isAnimatingSVGDom());
-    RefPtr<NewSVGPropertyBase> animatedValue = m_animatedProperty->createAnimatedValue();
+    RefPtr<NewSVGPropertyBase> animatedValue = m_animatedProperty->createAnimatedValue(m_animationElement);
     ASSERT(animatedValue->type() == m_type);
     setAnimatedValueOnAllTargetProperties(list, m_animatedProperty->attributeName(), animatedValue);
 
     return animatedValue.release();
 }
 
 PassOwnPtr<SVGAnimatedType> SVGAnimatedNewPropertyAnimator::startAnimValAnimation(const SVGElementAnimatedPropertyList& list)
 {
     ASSERT(isAnimatingSVGDom());
     SVGElementInstance::InstanceUpdateBlocker blocker(m_contextElement);
@@ skipping 76 matching lines @@
 float SVGAnimatedNewPropertyAnimator::calculateDistance(const String& fromString, const String& toString)
 {
     ASSERT(m_animationElement);
     ASSERT(m_contextElement);
     RefPtr<NewSVGPropertyBase> fromValue = createPropertyForAnimation(fromString);
     RefPtr<NewSVGPropertyBase> toValue = createPropertyForAnimation(toString);
     return fromValue->calculateDistance(toValue, m_contextElement);
 }
 
 } // namespace WebCore