Index: third_party/WebKit/Source/core/animation/PropertyInterpolationTypesMapping.cpp |
diff --git a/third_party/WebKit/Source/core/animation/PropertyInterpolationTypesMapping.cpp b/third_party/WebKit/Source/core/animation/PropertyInterpolationTypesMapping.cpp |
index 8266085d8726183966398431b01328642fc4c2c1..2e3f013f07bb808813ac0f88a2a5f85b0b1426a8 100644 |
--- a/third_party/WebKit/Source/core/animation/PropertyInterpolationTypesMapping.cpp |
+++ b/third_party/WebKit/Source/core/animation/PropertyInterpolationTypesMapping.cpp |
@@ -18,8 +18,8 @@ |
#include "core/animation/CSSLengthInterpolationType.h" |
#include "core/animation/CSSLengthListInterpolationType.h" |
#include "core/animation/CSSLengthPairInterpolationType.h" |
-#include "core/animation/CSSMotionRotationInterpolationType.h" |
#include "core/animation/CSSNumberInterpolationType.h" |
+#include "core/animation/CSSOffsetRotationInterpolationType.h" |
#include "core/animation/CSSPaintInterpolationType.h" |
#include "core/animation/CSSPathInterpolationType.h" |
#include "core/animation/CSSPositionAxisListInterpolationType.h" |
@@ -86,7 +86,7 @@ const InterpolationTypes& PropertyInterpolationTypesMapping::get(const PropertyH |
case CSSPropertyMaxWidth: |
case CSSPropertyMinHeight: |
case CSSPropertyMinWidth: |
- case CSSPropertyMotionOffset: |
+ case CSSPropertyOffsetDistance: |
case CSSPropertyOutlineOffset: |
case CSSPropertyOutlineWidth: |
case CSSPropertyPaddingBottom: |
@@ -186,8 +186,8 @@ const InterpolationTypes& PropertyInterpolationTypesMapping::get(const PropertyH |
case CSSPropertyClip: |
applicableTypes->append(wrapUnique(new CSSClipInterpolationType(cssProperty))); |
break; |
- case CSSPropertyMotionRotation: |
- applicableTypes->append(wrapUnique(new CSSMotionRotationInterpolationType(cssProperty))); |
+ case CSSPropertyOffsetRotation: |
+ applicableTypes->append(wrapUnique(new CSSOffsetRotationInterpolationType(cssProperty))); |
break; |
case CSSPropertyBackgroundPositionX: |
case CSSPropertyBackgroundPositionY: |
@@ -195,8 +195,8 @@ const InterpolationTypes& PropertyInterpolationTypesMapping::get(const PropertyH |
case CSSPropertyWebkitMaskPositionY: |
applicableTypes->append(wrapUnique(new CSSPositionAxisListInterpolationType(cssProperty))); |
break; |
- case CSSPropertyPerspectiveOrigin: |
case CSSPropertyObjectPosition: |
+ case CSSPropertyPerspectiveOrigin: |
applicableTypes->append(wrapUnique(new CSSPositionInterpolationType(cssProperty))); |
break; |
case CSSPropertyBorderBottomLeftRadius: |