Index: Source/core/animation/LengthBoxStyleInterpolation.h |
diff --git a/Source/core/animation/LengthBoxStyleInterpolation.h b/Source/core/animation/LengthBoxStyleInterpolation.h |
index 1542dda42dce5f69c30f407eafbc0ce4b024e7c4..32c8f0bce719b4282483cf638383f3a8d2620ba1 100644 |
--- a/Source/core/animation/LengthBoxStyleInterpolation.h |
+++ b/Source/core/animation/LengthBoxStyleInterpolation.h |
@@ -7,41 +7,35 @@ |
#include "core/animation/LengthStyleInterpolation.h" |
#include "core/css/CSSBorderImageSliceValue.h" |
+#include "core/css/Rect.h" |
namespace blink { |
class LengthBoxStyleInterpolation : public StyleInterpolation { |
public: |
- static PassRefPtrWillBeRawPtr<LengthBoxStyleInterpolation> create(const CSSValue& start, const CSSValue& end, CSSPropertyID id) |
- { |
- return adoptRefWillBeNoop(new LengthBoxStyleInterpolation(lengthBoxtoInterpolableValue(start), lengthBoxtoInterpolableValue(end), id, false)); |
- } |
+ static PassRefPtrWillBeRawPtr<LengthBoxStyleInterpolation> maybeCreateFrom(CSSValue*, CSSValue*, CSSPropertyID); |
- static PassRefPtrWillBeRawPtr<LengthBoxStyleInterpolation> createFromBorderImageSlice(CSSValue& start, CSSValue& end, CSSPropertyID id) |
- { |
- return adoptRefWillBeNoop(new LengthBoxStyleInterpolation(borderImageSlicetoInterpolableValue(start), borderImageSlicetoInterpolableValue(end), id, toCSSBorderImageSliceValue(start).m_fill)); |
- } |
- |
- static bool canCreateFrom(const CSSValue&); |
- |
- static bool matchingFill(CSSValue&, CSSValue&); |
- static bool canCreateFromBorderImageSlice(CSSValue&); |
+ static bool usesDefault(const CSSValue&, const CSSValue&); |
dstockwell
2015/02/13 02:30:35
This doesn't seem to be used.
evemj (not active)
2015/02/13 04:04:00
Done.
|
virtual void apply(StyleResolverState&) const override; |
virtual void trace(Visitor*) override; |
private: |
- LengthBoxStyleInterpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end, CSSPropertyID id, bool fill) |
- : StyleInterpolation(start, end, id) |
+ LengthBoxStyleInterpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> startInterpolation, PassOwnPtrWillBeRawPtr<InterpolableValue> endInterpolation, CSSPropertyID id, bool fill, CSSValue* startCSS, CSSValue* endCSS) |
+ : StyleInterpolation(startInterpolation, endInterpolation, id) |
, m_fill(fill) |
+ , m_startCSSValue(startCSS) |
+ , m_endCSSValue(endCSS) |
{ } |
- static PassOwnPtrWillBeRawPtr<InterpolableValue> lengthBoxtoInterpolableValue(const CSSValue&); |
- static PassOwnPtrWillBeRawPtr<InterpolableValue> borderImageSlicetoInterpolableValue(CSSValue&); |
- static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToLengthBox(InterpolableValue*, InterpolationRange = RangeAll); |
+ static PassOwnPtrWillBeRawPtr<InterpolableValue> lengthBoxtoInterpolableValue(const CSSValue&, const CSSValue&, bool); |
+ static PassOwnPtrWillBeRawPtr<InterpolableValue> borderImageSlicetoInterpolableValue(const CSSValue&); |
+ static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToLengthBox(InterpolableValue*, const CSSValue&, const CSSValue&); |
static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToBorderImageSlice(InterpolableValue*, bool); |
bool m_fill; |
+ RefPtrWillBeMember<CSSValue> m_startCSSValue; |
+ RefPtrWillBeMember<CSSValue> m_endCSSValue; |
friend class AnimationLengthBoxStyleInterpolationTest; |
}; |