| Index: Source/core/animation/Interpolation.h
|
| diff --git a/Source/core/animation/Interpolation.h b/Source/core/animation/Interpolation.h
|
| index 206310c9875007c2688dfc33ae928371aa66b074..6a3cd7a5a4019c31ccf5946975c57b9a945050cd 100644
|
| --- a/Source/core/animation/Interpolation.h
|
| +++ b/Source/core/animation/Interpolation.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "CSSPropertyNames.h"
|
| #include "core/animation/InterpolableValue.h"
|
| +#include "platform/Length.h"
|
| #include "platform/heap/Handle.h"
|
| #include "wtf/RefCounted.h"
|
|
|
| @@ -99,9 +100,9 @@ private:
|
|
|
| class LengthStyleInterpolation : public StyleInterpolation {
|
| public:
|
| - static PassRefPtrWillBeRawPtr<LengthStyleInterpolation> create(CSSValue* start, CSSValue* end, CSSPropertyID id)
|
| + static PassRefPtrWillBeRawPtr<LengthStyleInterpolation> create(CSSValue* start, CSSValue* end, CSSPropertyID id, ValueRange range)
|
| {
|
| - return adoptRefWillBeNoop(new LengthStyleInterpolation(lengthToInterpolableValue(start), lengthToInterpolableValue(end), id));
|
| + return adoptRefWillBeNoop(new LengthStyleInterpolation(lengthToInterpolableValue(start), lengthToInterpolableValue(end), id, range));
|
| }
|
|
|
| static bool canCreateFrom(const CSSValue&);
|
| @@ -111,12 +112,15 @@ public:
|
| virtual void trace(Visitor*) OVERRIDE;
|
|
|
| private:
|
| - LengthStyleInterpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end, CSSPropertyID id)
|
| + LengthStyleInterpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end, CSSPropertyID id, ValueRange range)
|
| : StyleInterpolation(start, end, id)
|
| + , m_range(range)
|
| { }
|
|
|
| static PassOwnPtrWillBeRawPtr<InterpolableValue> lengthToInterpolableValue(CSSValue*);
|
| - static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToLength(InterpolableValue*);
|
| + static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToLength(InterpolableValue*, ValueRange);
|
| +
|
| + ValueRange m_range;
|
|
|
| friend class AnimationInterpolationTest;
|
| };
|
|
|