SVG Web Animations: Add SVGIntegerOptionalIntegerInterpolationType

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"
 #include "core/animation/CSSImageInterpolationType.h"
 #include "core/animation/CSSImageListInterpolationType.h"
 #include "core/animation/CSSLengthInterpolationType.h"
 #include "core/animation/CSSNumberInterpolationType.h"
 #include "core/animation/CSSPaintInterpolationType.h"
 #include "core/animation/CSSShadowListInterpolationType.h"
 #include "core/animation/CSSValueInterpolationType.h"
 #include "core/animation/CompositorAnimations.h"
 #include "core/animation/ConstantStyleInterpolation.h"
 #include "core/animation/DefaultSVGInterpolation.h"
 #include "core/animation/DeferredLegacyStyleInterpolation.h"
 #include "core/animation/DoubleStyleInterpolation.h"
 #include "core/animation/FilterStyleInterpolation.h"
 #include "core/animation/ImageSliceStyleInterpolation.h"
-#include "core/animation/IntegerOptionalIntegerSVGInterpolation.h"
 #include "core/animation/IntegerSVGInterpolation.h"
 #include "core/animation/InterpolationType.h"
 #include "core/animation/InvalidatableInterpolation.h"
 #include "core/animation/LegacyStyleInterpolation.h"
 #include "core/animation/LengthBoxStyleInterpolation.h"
 #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/SVGAngleInterpolationType.h"
+#include "core/animation/SVGIntegerOptionalIntegerInterpolationType.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"
@@ skipping 263 matching lines @@
             || attribute == SVGNames::stitchTilesAttr
             || attribute == SVGNames::targetAttr
             || attribute == SVGNames::typeAttr
             || attribute == SVGNames::xChannelSelectorAttr
             || attribute == SVGNames::yChannelSelectorAttr
             || attribute == XLinkNames::hrefAttr) {
             // Use default SVGValueInterpolationType.
             applicableTypes->append(new SVGValueInterpolationType(attribute));
         } else if (attribute == SVGNames::orientAttr) {
             applicableTypes->append(new SVGAngleInterpolationType(attribute));
+        } else if (attribute == SVGNames::orderAttr) {
+            applicableTypes->append(new SVGIntegerOptionalIntegerInterpolationType(attribute));
         } else {
             fallbackToLegacy = true;
         }
 
         if (!fallbackToLegacy)
             applicableTypes->append(new SVGValueInterpolationType(attribute));
     }
 
     if (fallbackToLegacy) {
         delete applicableTypes;
@@ skipping 218 matching lines @@
 
 namespace {
 
 PassRefPtr<Interpolation> createSVGInterpolation(SVGPropertyBase* fromValue, SVGPropertyBase* toValue, SVGAnimatedPropertyBase* attribute)
 {
     RefPtr<Interpolation> interpolation = nullptr;
     ASSERT(fromValue->type() == toValue->type());
     switch (fromValue->type()) {
     case AnimatedInteger:
         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 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 AnimatedAngle:
     case AnimatedNumber:
+    case AnimatedIntegerOptionalInteger:
         ASSERT_NOT_REACHED();
         // Fallthrough.
 
     // TODO(ericwilligers): Support more animation types.
     default:
         break;
     }
     if (interpolation)
         return interpolation.release();
 
@@ skipping 15 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