Index: Source/core/page/animation/CSSPropertyAnimation.cpp |
diff --git a/Source/core/page/animation/CSSPropertyAnimation.cpp b/Source/core/page/animation/CSSPropertyAnimation.cpp |
index a0f8894e81e064d752b024face5d7c72aa422c1a..5ad4dd516b0fd60a36239a66154264a2ea72dce6 100644 |
--- a/Source/core/page/animation/CSSPropertyAnimation.cpp |
+++ b/Source/core/page/animation/CSSPropertyAnimation.cpp |
@@ -86,6 +86,11 @@ static inline LengthSize blendFunc(const AnimationBase* anim, const LengthSize& |
blendFunc(anim, from.height(), to.height(), progress)); |
} |
+static inline LengthPoint blendFunc(const AnimationBase* anim, const LengthPoint& from, const LengthPoint& to, double progress) |
+{ |
+ return LengthPoint(blendFunc(anim, from.x(), to.x(), progress), blendFunc(anim, from.y(), to.y(), progress)); |
+} |
+ |
static inline IntSize blendFunc(const AnimationBase* anim, const IntSize& from, const IntSize& to, double progress) |
{ |
return IntSize(blendFunc(anim, from.width(), to.width(), progress), |
@@ -1114,6 +1119,8 @@ void CSSPropertyAnimation::ensurePropertyMap() |
gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyWebkitMaskPositionY, &RenderStyle::maskLayers, &RenderStyle::accessMaskLayers)); |
gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyWebkitMaskSize, &RenderStyle::maskLayers, &RenderStyle::accessMaskLayers)); |
+ gPropertyWrappers->append(new PropertyWrapper<LengthPoint>(CSSPropertyObjectPosition, &RenderStyle::objectPosition, &RenderStyle::setObjectPosition)); |
+ |
gPropertyWrappers->append(new PropertyWrapper<float>(CSSPropertyFontSize, |
// Must pass a specified size to setFontSize if Text Autosizing is enabled, but a computed size |
// if text zoom is enabled (if neither is enabled it's irrelevant as they're probably the same). |