| Index: third_party/WebKit/Source/core/animation/CSSPaintInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSPaintInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSPaintInterpolationType.cpp
|
| index 9f50bc2681bea9d4b506e024506df4f04430d3e9..785cb1c10969c37148f8965d278d01916fab28cd 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSPaintInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSPaintInterpolationType.cpp
|
| @@ -66,12 +66,12 @@ private:
|
| const StyleColor m_color;
|
| };
|
|
|
| -PassOwnPtr<InterpolationValue> CSSPaintInterpolationType::maybeConvertInherit(const StyleResolverState* state, ConversionCheckers& conversionCheckers) const
|
| +PassOwnPtr<InterpolationValue> CSSPaintInterpolationType::maybeConvertInherit(const StyleResolverState& state, ConversionCheckers& conversionCheckers) const
|
| {
|
| - if (!state || !state->parentStyle())
|
| + if (!state.parentStyle())
|
| return nullptr;
|
| StyleColor parentColor;
|
| - if (!PaintPropertyFunctions::getColor(cssProperty(), *state->parentStyle(), parentColor)) {
|
| + if (!PaintPropertyFunctions::getColor(cssProperty(), *state.parentStyle(), parentColor)) {
|
| conversionCheckers.append(ParentPaintChecker::create(*this, cssProperty()));
|
| return nullptr;
|
| }
|
| @@ -79,7 +79,7 @@ PassOwnPtr<InterpolationValue> CSSPaintInterpolationType::maybeConvertInherit(co
|
| return InterpolationValue::create(*this, CSSColorInterpolationType::createInterpolableColor(parentColor));
|
| }
|
|
|
| -PassOwnPtr<InterpolationValue> CSSPaintInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState*, ConversionCheckers&) const
|
| +PassOwnPtr<InterpolationValue> CSSPaintInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState&, ConversionCheckers&) const
|
| {
|
| OwnPtr<InterpolableValue> interpolableColor = CSSColorInterpolationType::maybeCreateInterpolableColor(value);
|
| if (!interpolableColor)
|
|
|