| Index: third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp
|
| index 80fb4cfdbd8e8c413d83e1165f0eaf9279667f0a..3c9e04e620b46b68ec44dbbca48f34e141e74d67 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp
|
| @@ -147,18 +147,18 @@ PassOwnPtr<InterpolationValue> CSSLengthInterpolationType::maybeConvertInitial()
|
| return maybeConvertLength(initialLength, 1);
|
| }
|
|
|
| -PassOwnPtr<InterpolationValue> CSSLengthInterpolationType::maybeConvertInherit(const StyleResolverState* state, ConversionCheckers& conversionCheckers) const
|
| +PassOwnPtr<InterpolationValue> CSSLengthInterpolationType::maybeConvertInherit(const StyleResolverState& state, ConversionCheckers& conversionCheckers) const
|
| {
|
| - if (!state || !state->parentStyle())
|
| + if (!state.parentStyle())
|
| return nullptr;
|
| Length inheritedLength;
|
| - if (!LengthPropertyFunctions::getLength(cssProperty(), *state->parentStyle(), inheritedLength))
|
| + if (!LengthPropertyFunctions::getLength(cssProperty(), *state.parentStyle(), inheritedLength))
|
| return nullptr;
|
| conversionCheckers.append(ParentLengthChecker::create(*this, cssProperty(), inheritedLength));
|
| - return maybeConvertLength(inheritedLength, effectiveZoom(*state->parentStyle()));
|
| + return maybeConvertLength(inheritedLength, effectiveZoom(*state.parentStyle()));
|
| }
|
|
|
| -PassOwnPtr<InterpolationValue> CSSLengthInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState*, ConversionCheckers& conversionCheckers) const
|
| +PassOwnPtr<InterpolationValue> CSSLengthInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState&, ConversionCheckers& conversionCheckers) const
|
| {
|
| if (value.isPrimitiveValue() && toCSSPrimitiveValue(value).isValueID()) {
|
| CSSValueID valueID = toCSSPrimitiveValue(value).getValueID();
|
|
|