| Index: Source/core/animation/css/CSSAnimations.cpp
|
| diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp
|
| index bc145e2ebbabc033e2dbdc74cf41242c9cddf5e2..e701343782c33424bb330d717593ea11216d16f3 100644
|
| --- a/Source/core/animation/css/CSSAnimations.cpp
|
| +++ b/Source/core/animation/css/CSSAnimations.cpp
|
| @@ -79,6 +79,12 @@ CSSPropertyID propertyForAnimation(CSSPropertyID property)
|
| return CSSPropertyPerspective;
|
| case CSSPropertyWebkitTransform:
|
| return CSSPropertyTransform;
|
| + case CSSPropertyWebkitTransformOriginX:
|
| + case CSSPropertyWebkitTransformOriginY:
|
| + case CSSPropertyWebkitTransformOriginZ:
|
| + if (RuntimeEnabledFeatures::cssTransformsUnprefixedEnabled())
|
| + return CSSPropertyTransformOrigin;
|
| + break;
|
| default:
|
| break;
|
| }
|
| @@ -881,9 +887,6 @@ bool CSSAnimations::isAnimatableProperty(CSSPropertyID property)
|
| case CSSPropertyShapeMargin:
|
| case CSSPropertyShapeImageThreshold:
|
| case CSSPropertyWebkitTextStrokeColor:
|
| - case CSSPropertyWebkitTransformOriginX:
|
| - case CSSPropertyWebkitTransformOriginY:
|
| - case CSSPropertyWebkitTransformOriginZ:
|
| case CSSPropertyTransform:
|
| case CSSPropertyWidows:
|
| case CSSPropertyWidth:
|
| @@ -891,6 +894,12 @@ bool CSSAnimations::isAnimatableProperty(CSSPropertyID property)
|
| case CSSPropertyZIndex:
|
| case CSSPropertyZoom:
|
| return true;
|
| + case CSSPropertyTransformOrigin:
|
| + return RuntimeEnabledFeatures::cssTransformsUnprefixedEnabled();
|
| + case CSSPropertyWebkitTransformOriginX:
|
| + case CSSPropertyWebkitTransformOriginY:
|
| + case CSSPropertyWebkitTransformOriginZ:
|
| + return !RuntimeEnabledFeatures::cssTransformsUnprefixedEnabled();
|
| default:
|
| return false;
|
| }
|
|
|