| Index: Source/core/page/animation/CSSPropertyAnimation.cpp
|
| diff --git a/Source/core/page/animation/CSSPropertyAnimation.cpp b/Source/core/page/animation/CSSPropertyAnimation.cpp
|
| index 5b31b8cd969b461626c9ead77572993e0e8c2a99..4f5ab988a32a5a21eeeca6519727f8ee6dafd321 100644
|
| --- a/Source/core/page/animation/CSSPropertyAnimation.cpp
|
| +++ b/Source/core/page/animation/CSSPropertyAnimation.cpp
|
| @@ -85,6 +85,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),
|
| @@ -1110,6 +1115,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).
|
|
|