| Index: Source/core/animation/css/CSSAnimations.cpp
|
| diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp
|
| index a84c2846377d0332fe3f91e0619ceb279f81e2c5..61d021fec29db00da738ea30d5b766ff3aa316e1 100644
|
| --- a/Source/core/animation/css/CSSAnimations.cpp
|
| +++ b/Source/core/animation/css/CSSAnimations.cpp
|
| @@ -100,7 +100,7 @@ static PassRefPtrWillBeRawPtr<StringKeyframeEffectModel> createKeyframeEffectMod
|
| timingFunction = CSSTimingData::initialTimingFunction();
|
| }
|
| keyframe->setEasing(timingFunction.release());
|
| - } else if (CSSPropertyMetadata::isAnimatableProperty(property)) {
|
| + } else if (CSSPropertyMetadata::isInterpolableProperty(property)) {
|
| keyframe->setPropertyValue(property, properties.propertyAt(j).value());
|
| }
|
| }
|
| @@ -551,7 +551,7 @@ void CSSAnimations::calculateTransitionUpdate(CSSAnimationUpdate* update, const
|
| CSSPropertyID id = propertyList.length() ? propertyList.properties()[j] : property;
|
|
|
| if (!animateAll) {
|
| - if (CSSPropertyMetadata::isAnimatableProperty(id))
|
| + if (CSSPropertyMetadata::isInterpolableProperty(id))
|
| listedProperties.set(id);
|
| else
|
| continue;
|
| @@ -751,7 +751,7 @@ const StylePropertyShorthand& CSSAnimations::propertiesForTransitionAll()
|
| || id == CSSPropertyWebkitTransformOriginY
|
| || id == CSSPropertyWebkitTransformOriginZ)
|
| continue;
|
| - if (CSSPropertyMetadata::isAnimatableProperty(id))
|
| + if (CSSPropertyMetadata::isInterpolableProperty(id))
|
| properties.append(id);
|
| }
|
| propertyShorthand = StylePropertyShorthand(CSSPropertyInvalid, properties.begin(), properties.size());
|
| @@ -759,9 +759,9 @@ const StylePropertyShorthand& CSSAnimations::propertiesForTransitionAll()
|
| return propertyShorthand;
|
| }
|
|
|
| -// KeyframeEffect properties are not allowed to be affected by Web Animations.
|
| -// http://dev.w3.org/fxtf/web-animations/#not-animatable
|
| -bool CSSAnimations::isAllowedAnimation(CSSPropertyID property)
|
| +// Properties that affect animations are not allowed to be affected by animations.
|
| +// http://w3c.github.io/web-animations/#not-animatable-section
|
| +bool CSSAnimations::isAnimatableProperty(CSSPropertyID property)
|
| {
|
| switch (property) {
|
| case CSSPropertyAnimation:
|
|
|