Web Animations: Migrate SVG integer interpolation to interpolation types

Web Animations: Migrate SVG integer interpolation to interpolation types

BUG=530436

[dstockwell, 2015-11-03 01:57:44]

dstockwell@chromium.org changed reviewers:
+ alancutter@chromium.org

[dstockwell, 2015-11-03 01:57:50]

The CQ bit was checked by dstockwell@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2015-11-03 01:58:15]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1406393006/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1406393006/1

[alancutter (OOO until 2018), 2015-11-03 02:29:48]

lgtm

[dstockwell, 2015-11-03 03:13:40]

The CQ bit was unchecked by dstockwell@chromium.org

[dstockwell, 2015-11-03 03:13:45]

The CQ bit was checked by dstockwell@chromium.org

[commit-bot: I haz the power, 2015-11-03 03:14:07]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1406393006/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1406393006/1

[commit-bot: I haz the power, 2015-11-03 04:12:56]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-11-03 04:12:57]

Failed to apply patch for
third_party/WebKit/Source/core/animation/StringKeyframe.cpp:
While running git apply --index -3 -p1;
  error: patch failed:
third_party/WebKit/Source/core/animation/StringKeyframe.cpp:38
  Falling back to three-way merge...
  Applied patch to 'third_party/WebKit/Source/core/animation/StringKeyframe.cpp'
with conflicts.
  U third_party/WebKit/Source/core/animation/StringKeyframe.cpp

Patch:       third_party/WebKit/Source/core/animation/StringKeyframe.cpp
Index: third_party/WebKit/Source/core/animation/StringKeyframe.cpp
diff --git a/third_party/WebKit/Source/core/animation/StringKeyframe.cpp
b/third_party/WebKit/Source/core/animation/StringKeyframe.cpp
index
2a57e08f88f821805632e576b629a01cfe44cb3a..89d3575080a56085a75162938bc4899c5958cb40
100644
--- a/third_party/WebKit/Source/core/animation/StringKeyframe.cpp
+++ b/third_party/WebKit/Source/core/animation/StringKeyframe.cpp
@@ -23,7 +23,6 @@
 #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"
@@ -38,6 +37,7 @@
 #include "core/animation/PathSVGInterpolation.h"
 #include "core/animation/PointSVGInterpolation.h"
 #include "core/animation/RectSVGInterpolation.h"
+#include "core/animation/SVGIntegerInterpolationType.h"
 #include "core/animation/SVGNumberInterpolationType.h"
 #include "core/animation/SVGStrokeDasharrayStyleInterpolation.h"
 #include "core/animation/SVGValueInterpolationType.h"
@@ -289,6 +289,10 @@ const Vector<const InterpolationType*>*
applicableTypesForProperty(PropertyHandl
             || attribute == SVGNames::surfaceScaleAttr
             || attribute == SVGNames::zAttr) {
             applicableTypes->append(new SVGNumberInterpolationType(attribute));
+        } else if (attribute == SVGNames::numOctavesAttr
+            || attribute == SVGNames::targetXAttr
+            || attribute == SVGNames::targetYAttr) {
+            applicableTypes->append(new
SVGIntegerInterpolationType(attribute));
         } else if (attribute == HTMLNames::classAttr
             || attribute == SVGNames::clipPathUnitsAttr
             || attribute == SVGNames::edgeModeAttr
@@ -558,8 +562,6 @@ PassRefPtr<Interpolation>
createSVGInterpolation(SVGPropertyBase* fromValue, SVG
         if (AngleSVGInterpolation::canCreateFrom(fromValue) &&
AngleSVGInterpolation::canCreateFrom(toValue))
             return AngleSVGInterpolation::create(fromValue, toValue,
attribute);
         break;
-    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);
@@ -587,6 +589,7 @@ PassRefPtr<Interpolation>
createSVGInterpolation(SVGPropertyBase* fromValue, SVG
         break;
 
     // Handled by SVGInterpolationTypes.
+    case AnimatedInteger:
     case AnimatedNumber:
         ASSERT_NOT_REACHED();
         // Fallthrough.

[commit-bot: I haz the power, 2015-11-03 04:12:58]

The CQ bit was unchecked by commit-bot@chromium.org