| 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 89d3575080a56085a75162938bc4899c5958cb40..3369f67efde61c951c4d884605416200d0d413ca 100644
|
| --- a/third_party/WebKit/Source/core/animation/StringKeyframe.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/StringKeyframe.cpp
|
| @@ -34,11 +34,11 @@
|
| #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/SVGIntegerInterpolationType.h"
|
| #include "core/animation/SVGNumberInterpolationType.h"
|
| +#include "core/animation/SVGPathInterpolationType.h"
|
| #include "core/animation/SVGStrokeDasharrayStyleInterpolation.h"
|
| #include "core/animation/SVGValueInterpolationType.h"
|
| #include "core/animation/TransformSVGInterpolation.h"
|
| @@ -289,6 +289,8 @@ const Vector<const InterpolationType*>* applicableTypesForProperty(PropertyHandl
|
| || attribute == SVGNames::surfaceScaleAttr
|
| || attribute == SVGNames::zAttr) {
|
| applicableTypes->append(new SVGNumberInterpolationType(attribute));
|
| + } else if (attribute == SVGNames::dAttr) {
|
| + applicableTypes->append(new SVGPathInterpolationType(attribute));
|
| } else if (attribute == SVGNames::numOctavesAttr
|
| || attribute == SVGNames::targetXAttr
|
| || attribute == SVGNames::targetYAttr) {
|
| @@ -548,7 +550,7 @@ PassOwnPtr<Keyframe::PropertySpecificKeyframe> SVGPropertySpecificKeyframe::clon
|
|
|
| PassOwnPtr<Keyframe::PropertySpecificKeyframe> SVGPropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const
|
| {
|
| - return adoptPtr(new SVGPropertySpecificKeyframe(offset, easing, "", EffectModel::CompositeAdd));
|
| + return adoptPtr(new SVGPropertySpecificKeyframe(offset, easing, String(), EffectModel::CompositeAdd));
|
| }
|
|
|
| namespace {
|
| @@ -576,9 +578,6 @@ PassRefPtr<Interpolation> createSVGInterpolation(SVGPropertyBase* fromValue, SVG
|
| 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;
|
| @@ -589,6 +588,7 @@ PassRefPtr<Interpolation> createSVGInterpolation(SVGPropertyBase* fromValue, SVG
|
| break;
|
|
|
| // Handled by SVGInterpolationTypes.
|
| + case AnimatedPath:
|
| case AnimatedInteger:
|
| case AnimatedNumber:
|
| ASSERT_NOT_REACHED();
|
|
|