| Index: third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp
|
| index 152818047232099985787758d8a3429255e2cdcd..e116686be4667ed0d1ae48c931bcfc8fa270fb88 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.cpp
|
| @@ -98,18 +98,18 @@ private:
|
| StyleImageList m_inheritedImageList;
|
| };
|
|
|
| -PassOwnPtr<InterpolationValue> CSSImageListInterpolationType::maybeConvertInherit(const StyleResolverState* state, ConversionCheckers& conversionCheckers) const
|
| +PassOwnPtr<InterpolationValue> CSSImageListInterpolationType::maybeConvertInherit(const StyleResolverState& state, ConversionCheckers& conversionCheckers) const
|
| {
|
| - if (!state || !state->parentStyle())
|
| + if (!state.parentStyle())
|
| return nullptr;
|
|
|
| StyleImageList inheritedImageList;
|
| - ImageListPropertyFunctions::getImageList(cssProperty(), *state->parentStyle(), inheritedImageList);
|
| + ImageListPropertyFunctions::getImageList(cssProperty(), *state.parentStyle(), inheritedImageList);
|
| conversionCheckers.append(ParentImageListChecker::create(*this, cssProperty(), inheritedImageList));
|
| return maybeConvertStyleImageList(inheritedImageList);
|
| }
|
|
|
| -PassOwnPtr<InterpolationValue> CSSImageListInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState*, ConversionCheckers&) const
|
| +PassOwnPtr<InterpolationValue> CSSImageListInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState&, ConversionCheckers&) const
|
| {
|
| if (value.isPrimitiveValue() && toCSSPrimitiveValue(value).getValueID() == CSSValueNone)
|
| return nullptr;
|
|
|