| Index: third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.h
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.h b/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.h
|
| index 344b2a876bd90a7336be4c2a774b79680f542694..80ec1aefefcd09ca26ad2bc9ae92236ce76193bc 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.h
|
| +++ b/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.h
|
| @@ -30,8 +30,8 @@ private:
|
| PassOwnPtr<InterpolationValue> maybeConvertLength(const Length&, float zoom) const;
|
| 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&, InterpolationValue&) const final;
|
|
|
|
|