| Index: Source/core/animation/LengthStyleInterpolation.h
|
| diff --git a/Source/core/animation/LengthStyleInterpolation.h b/Source/core/animation/LengthStyleInterpolation.h
|
| index cd8ab4cd89f4b812b33acf9dcfe442d295e52387..35401806cf657de17e86260261382a417064a3dd 100644
|
| --- a/Source/core/animation/LengthStyleInterpolation.h
|
| +++ b/Source/core/animation/LengthStyleInterpolation.h
|
| @@ -13,9 +13,12 @@ namespace blink {
|
|
|
| class LengthStyleInterpolation : public StyleInterpolation {
|
| public:
|
| +
|
| + typedef void NonInterpolableType;
|
| +
|
| static PassRefPtrWillBeRawPtr<LengthStyleInterpolation> create(const CSSValue& start, const CSSValue& end, CSSPropertyID id, InterpolationRange range)
|
| {
|
| - return adoptRefWillBeNoop(new LengthStyleInterpolation(lengthToInterpolableValue(start), lengthToInterpolableValue(end), id, range));
|
| + return adoptRefWillBeNoop(new LengthStyleInterpolation(toInterpolableValue(start), toInterpolableValue(end), id, range));
|
| }
|
|
|
| static bool canCreateFrom(const CSSValue&);
|
| @@ -24,22 +27,16 @@ public:
|
|
|
| virtual void trace(Visitor*) override;
|
|
|
| + static PassOwnPtrWillBeRawPtr<InterpolableValue> toInterpolableValue(const CSSValue&);
|
| + static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> fromInterpolableValue(const InterpolableValue&, InterpolationRange);
|
| +
|
| private:
|
| LengthStyleInterpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end, CSSPropertyID id, InterpolationRange range)
|
| : StyleInterpolation(start, end, id)
|
| , m_range(range)
|
| { }
|
|
|
| - static PassOwnPtrWillBeRawPtr<InterpolableValue> lengthToInterpolableValue(const CSSValue&);
|
| - static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> interpolableValueToLength(const InterpolableValue*, InterpolationRange);
|
| -
|
| InterpolationRange m_range;
|
| -
|
| - friend class AnimationLengthStyleInterpolationTest;
|
| - friend class LengthBoxStyleInterpolation;
|
| - friend class ShadowStyleInterpolation;
|
| - friend class LengthPairStyleInterpolation;
|
| - friend class LengthPoint3DStyleInterpolation;
|
| };
|
|
|
| }
|
|
|