Web Animations: Add SVGNumberInterpolationType

third_party/WebKit/Source/core/animation/StringKeyframe.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/animation/StringKeyframe.h"
 
 #include "core/XLinkNames.h"
 #include "core/animation/AngleSVGInterpolation.h"
 #include "core/animation/CSSColorInterpolationType.h"
@@ skipping 20 matching lines @@
 #include "core/animation/LengthPairStyleInterpolation.h"
 #include "core/animation/LengthSVGInterpolation.h"
 #include "core/animation/LengthStyleInterpolation.h"
 #include "core/animation/ListSVGInterpolation.h"
 #include "core/animation/ListStyleInterpolation.h"
 #include "core/animation/NumberOptionalNumberSVGInterpolation.h"
 #include "core/animation/NumberSVGInterpolation.h"
 #include "core/animation/PathSVGInterpolation.h"
 #include "core/animation/PointSVGInterpolation.h"
 #include "core/animation/RectSVGInterpolation.h"
+#include "core/animation/SVGNumberInterpolationType.h"
 #include "core/animation/SVGStrokeDasharrayStyleInterpolation.h"
 #include "core/animation/SVGValueInterpolationType.h"
 #include "core/animation/TransformSVGInterpolation.h"
 #include "core/animation/VisibilityStyleInterpolation.h"
 #include "core/animation/css/CSSAnimations.h"
 #include "core/css/CSSPropertyMetadata.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/style/ComputedStyle.h"
 #include "core/svg/SVGElement.h"
 #include "platform/RuntimeEnabledFeatures.h"
@@ skipping 204 matching lines @@
             break;
         default:
             // TODO(alancutter): Support all interpolable CSS properties here so we can stop falling back to the old StyleInterpolation implementation.
             if (CSSPropertyMetadata::isInterpolableProperty(cssProperty))
                 fallbackToLegacy = true;
             break;
         }
         applicableTypes->append(new CSSValueInterpolationType(cssProperty));
     } else {
         const QualifiedName& attribute = property.svgAttribute();
-        if (attribute == HTMLNames::classAttr
+        if (attribute == SVGNames::amplitudeAttr
+            || attribute == SVGNames::azimuthAttr
+            || attribute == SVGNames::biasAttr
+            || attribute == SVGNames::diffuseConstantAttr
+            || attribute == SVGNames::divisorAttr
+            || attribute == SVGNames::elevationAttr
+            || attribute == SVGNames::exponentAttr
+            || attribute == SVGNames::interceptAttr
+            || attribute == SVGNames::k1Attr
+            || attribute == SVGNames::k2Attr
+            || attribute == SVGNames::k3Attr
+            || attribute == SVGNames::k4Attr
+            || attribute == SVGNames::limitingConeAngleAttr
+            || attribute == SVGNames::offsetAttr
+            || attribute == SVGNames::pathLengthAttr
+            || attribute == SVGNames::pointsAtXAttr
+            || attribute == SVGNames::pointsAtYAttr
+            || attribute == SVGNames::pointsAtZAttr
+            || attribute == SVGNames::scaleAttr
+            || attribute == SVGNames::seedAttr
+            || attribute == SVGNames::slopeAttr
+            || attribute == SVGNames::specularConstantAttr
+            || attribute == SVGNames::specularExponentAttr
+            || attribute == SVGNames::surfaceScaleAttr
+            || attribute == SVGNames::zAttr) {
+            applicableTypes->append(new SVGNumberInterpolationType(attribute));
+        } else if (attribute == HTMLNames::classAttr
             || attribute == SVGNames::clipPathUnitsAttr
             || attribute == SVGNames::edgeModeAttr
             || attribute == SVGNames::filterUnitsAttr
             || attribute == SVGNames::gradientUnitsAttr
             || attribute == SVGNames::inAttr
             || attribute == SVGNames::in2Attr
             || attribute == SVGNames::lengthAdjustAttr
             || attribute == SVGNames::markerUnitsAttr
             || attribute == SVGNames::maskContentUnitsAttr
             || attribute == SVGNames::maskUnitsAttr
             || attribute == SVGNames::methodAttr
             || attribute == SVGNames::modeAttr
             || attribute == SVGNames::operatorAttr
             || attribute == SVGNames::patternContentUnitsAttr
             || attribute == SVGNames::patternUnitsAttr
             || attribute == SVGNames::preserveAlphaAttr
             || attribute == SVGNames::preserveAspectRatioAttr
             || attribute == SVGNames::primitiveUnitsAttr
             || attribute == SVGNames::resultAttr
             || attribute == SVGNames::spacingAttr
             || attribute == SVGNames::spreadMethodAttr
             || attribute == SVGNames::stitchTilesAttr
             || attribute == SVGNames::targetAttr
             || attribute == SVGNames::typeAttr
             || attribute == SVGNames::xChannelSelectorAttr
             || attribute == SVGNames::yChannelSelectorAttr
             || attribute == XLinkNames::hrefAttr) {
-            applicableTypes->append(new SVGValueInterpolationType(attribute));
+            // Use default SVGValueInterpolationType.
         } else {
             fallbackToLegacy = true;
         }
+
+        if (!fallbackToLegacy)
+            applicableTypes->append(new SVGValueInterpolationType(attribute));
     }
 
     if (fallbackToLegacy) {
         delete applicableTypes;
         applicableTypesMap.add(property, nullptr);
         return nullptr;
     }
 
     applicableTypesMap.add(property, applicableTypes);
     return applicableTypes;
@@ skipping 225 matching lines @@
         return IntegerSVGInterpolation::create(fromValue, toValue, attribute);
     case AnimatedIntegerOptionalInteger: {
         int min = &attribute->attributeName() == &SVGNames::orderAttr ? 1 : 0;
         return IntegerOptionalIntegerSVGInterpolation::create(fromValue, toValue, attribute, min);
     }
     case AnimatedLength:
         return LengthSVGInterpolation::create(fromValue, toValue, attribute);
     case AnimatedLengthList:
         interpolation = ListSVGInterpolation<LengthSVGInterpolation>::maybeCreate(fromValue, toValue, attribute);
         break;
-    case AnimatedNumber: {
-        SVGNumberNegativeValuesMode negativeValuesMode = &attribute->attributeName() == &SVGNames::pathLengthAttr ? ForbidNegativeNumbers : AllowNegativeNumbers;
-        return NumberSVGInterpolation::create(fromValue, toValue, attribute, negativeValuesMode);
-    }
     case AnimatedNumberOptionalNumber:
         return NumberOptionalNumberSVGInterpolation::create(fromValue, toValue, attribute);
     case AnimatedNumberList:
         interpolation = ListSVGInterpolation<NumberSVGInterpolation>::maybeCreate(fromValue, toValue, attribute);
         break;
     case AnimatedPath:
         interpolation = PathSVGInterpolation::maybeCreate(fromValue, toValue, attribute);
         break;
     case AnimatedPoints:
         interpolation = ListSVGInterpolation<PointSVGInterpolation>::maybeCreate(fromValue, toValue, attribute);
         break;
     case AnimatedRect:
         return RectSVGInterpolation::create(fromValue, toValue, attribute);
     case AnimatedTransformList:
         interpolation = ListSVGInterpolation<TransformSVGInterpolation>::maybeCreate(fromValue, toValue, attribute);
         break;
 
+    // Handled by SVGInterpolationTypes.
+    case AnimatedNumber:
+        ASSERT_NOT_REACHED();
+        // Fallthrough.
+
     // TODO(ericwilligers): Support more animation types.
     default:
         break;
     }
     if (interpolation)
         return interpolation.release();
 
     return DefaultSVGInterpolation::create(fromValue, toValue, attribute);
 }
 
@@ skipping 12 matching lines @@
     RefPtrWillBeRawPtr<SVGPropertyBase> fromValue = attribute->currentValueBase()->cloneForAnimation(m_value);
     RefPtrWillBeRawPtr<SVGPropertyBase> toValue = attribute->currentValueBase()->cloneForAnimation(toSVGPropertySpecificKeyframe(end).value());
 
     if (!fromValue || !toValue)
         return nullptr;
 
     return createSVGInterpolation(fromValue.get(), toValue.get(), attribute.get());
 }
 
 } // namespace blink