| Index: third_party/WebKit/Source/core/animation/CSSImageInterpolationType.h
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSImageInterpolationType.h b/third_party/WebKit/Source/core/animation/CSSImageInterpolationType.h
|
| index 6bbbe25f250f6adbfe20ddf3065a66e6478a0f44..42a1600b16cb99e5f5ab43989de1afd7cfd1d98d 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSImageInterpolationType.h
|
| +++ b/third_party/WebKit/Source/core/animation/CSSImageInterpolationType.h
|
| @@ -32,8 +32,8 @@ public:
|
| private:
|
| PassOwnPtr<InterpolationValue> maybeConvertNeutral(const UnderlyingValue&, ConversionCheckers&) const final;
|
| PassOwnPtr<InterpolationValue> maybeConvertInitial() const final;
|
| - PassOwnPtr<InterpolationValue> maybeConvertInherit(const StyleResolverState*, ConversionCheckers&) const final;
|
| - PassOwnPtr<InterpolationValue> maybeConvertValue(const CSSValue&, const StyleResolverState*, ConversionCheckers&) const final;
|
| + PassOwnPtr<InterpolationValue> maybeConvertInherit(const StyleResolverState&, ConversionCheckers&) const final;
|
| + PassOwnPtr<InterpolationValue> maybeConvertValue(const CSSValue&, const StyleResolverState&, ConversionCheckers&) const final;
|
|
|
| PassOwnPtr<PairwisePrimitiveInterpolation> mergeSingleConversions(InterpolationValue& startValue, InterpolationValue& endValue) const final;
|
| };
|
|
|