| Index: Source/core/animation/LengthStyleInterpolation.h
|
| diff --git a/Source/core/animation/LengthStyleInterpolation.h b/Source/core/animation/LengthStyleInterpolation.h
|
| index 791bd9fa6b7872c561dfd486c55b347904128fe9..949dcdaa065cfb7f5637911be9474de3e720a4e4 100644
|
| --- a/Source/core/animation/LengthStyleInterpolation.h
|
| +++ b/Source/core/animation/LengthStyleInterpolation.h
|
| @@ -16,7 +16,6 @@ class Length;
|
|
|
| class CORE_EXPORT LengthStyleInterpolation : public StyleInterpolation {
|
| public:
|
| - typedef void (ComputedStyle::*LengthSetter)(const Length&);
|
| typedef void NonInterpolableType;
|
|
|
| static PassRefPtrWillBeRawPtr<LengthStyleInterpolation> create(const CSSValue& start, const CSSValue& end, CSSPropertyID id, InterpolationRange range)
|
| @@ -32,23 +31,16 @@ public:
|
|
|
| static PassOwnPtrWillBeRawPtr<InterpolableValue> toInterpolableValue(const CSSValue&, CSSPropertyID = CSSPropertyInvalid);
|
| static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> fromInterpolableValue(const InterpolableValue&, InterpolationRange);
|
| - static void applyInterpolableValue(CSSPropertyID, const InterpolableValue&, InterpolationRange, StyleResolverState&, LengthSetter);
|
| + static void applyInterpolableValue(CSSPropertyID, const InterpolableValue&, InterpolationRange, StyleResolverState&);
|
|
|
| private:
|
| LengthStyleInterpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end, CSSPropertyID id, InterpolationRange range)
|
| : StyleInterpolation(start, end, id)
|
| , m_range(range)
|
| - , m_lengthSetter(nullptr)
|
| {
|
| - if (isPixelsOrPercentOnly(*m_start) && isPixelsOrPercentOnly(*m_end))
|
| - m_lengthSetter = lengthSetterForProperty(id);
|
| }
|
|
|
| - static bool isPixelsOrPercentOnly(const InterpolableValue&);
|
| - static LengthSetter lengthSetterForProperty(CSSPropertyID);
|
| -
|
| InterpolationRange m_range;
|
| - LengthSetter m_lengthSetter;
|
| };
|
|
|
| }
|
|
|