third_party/WebKit/Source/core/animation/StringKeyframe.cpp - Issue 1441853002: Web Animations: Add SVGPathInterpolationType

Unified Diff: third_party/WebKit/Source/core/animation/StringKeyframe.cpp

Issue 1441853002: Web Animations: Add SVGPathInterpolationType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_svgNumberListInterpolationType

Patch Set: Rebased Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/animation/SVGPathSegInterpolationFunctions.cpp ('k') | third_party/WebKit/Source/core/core.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 64c81d59d2ae2c9f7452e1453d0439b531b66575..c1353acdfe211d20895876fde272a0fe9edf93e8 100644

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

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

@@ -30,7 +30,6 @@

#include "core/animation/LengthStyleInterpolation.h"

#include "core/animation/ListSVGInterpolation.h"

#include "core/animation/ListStyleInterpolation.h"

-#include "core/animation/PathSVGInterpolation.h"

#include "core/animation/SVGAngleInterpolationType.h"

#include "core/animation/SVGIntegerInterpolationType.h"

#include "core/animation/SVGIntegerOptionalIntegerInterpolationType.h"

@@ -38,6 +37,7 @@

#include "core/animation/SVGNumberInterpolationType.h"

#include "core/animation/SVGNumberListInterpolationType.h"

#include "core/animation/SVGNumberOptionalNumberInterpolationType.h"

+#include "core/animation/SVGPathInterpolationType.h"

#include "core/animation/SVGPointListInterpolationType.h"

#include "core/animation/SVGRectInterpolationType.h"

#include "core/animation/SVGStrokeDasharrayStyleInterpolation.h"

@@ -331,6 +331,8 @@ const InterpolationTypes* applicableTypesForProperty(PropertyHandle property)

|| attribute == SVGNames::radiusAttr

|| attribute == SVGNames::stdDeviationAttr) {

applicableTypes->append(adoptPtr(new SVGNumberOptionalNumberInterpolationType(attribute)));

+ } else if (attribute == SVGNames::dAttr) {

+ applicableTypes->append(adoptPtr(new SVGPathInterpolationType(attribute)));

} else if (attribute == SVGNames::pointsAttr) {

applicableTypes->append(adoptPtr(new SVGPointListInterpolationType(attribute)));

} else if (attribute == SVGNames::viewBoxAttr) {

@@ -601,9 +603,6 @@ PassRefPtr<Interpolation> createSVGInterpolation(SVGPropertyBase* fromValue, SVG

case AnimatedLengthList:

interpolation = ListSVGInterpolation<LengthSVGInterpolation>::maybeCreate(fromValue, toValue, attribute);

break;

- case AnimatedPath:

- interpolation = PathSVGInterpolation::maybeCreate(fromValue, toValue, attribute);

- break;

// Handled by SVGInterpolationTypes.

case AnimatedAngle:

@@ -613,6 +612,7 @@ PassRefPtr<Interpolation> createSVGInterpolation(SVGPropertyBase* fromValue, SVG

case AnimatedNumber:

case AnimatedNumberList:

case AnimatedNumberOptionalNumber:

+ case AnimatedPath:

case AnimatedPoints:

case AnimatedRect:

case AnimatedTransformList: