| Index: third_party/WebKit/Source/core/animation/CSSBasicShapeInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSBasicShapeInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSBasicShapeInterpolationType.cpp
|
| index 4ac573a3be86d23181237fedd371cc7ca6e9ae1b..4a5b552cfa89c5de63143ea61a39c009e1bdd80b 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSBasicShapeInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSBasicShapeInterpolationType.cpp
|
| @@ -103,7 +103,7 @@ PairwiseInterpolationValue CSSBasicShapeInterpolationType::maybeMergeSingles(Int
|
|
|
| InterpolationValue CSSBasicShapeInterpolationType::maybeConvertUnderlyingValue(const InterpolationEnvironment& environment) const
|
| {
|
| - const ComputedStyle& style = *environment.state().style();
|
| + const ComputedStyle& style = environment.style();
|
| return BasicShapeInterpolationFunctions::maybeConvertBasicShape(
|
| BasicShapePropertyFunctions::getBasicShape(cssProperty(), style), style.effectiveZoom());
|
| }
|
| @@ -120,7 +120,7 @@ void CSSBasicShapeInterpolationType::composite(UnderlyingValueOwner& underlyingV
|
|
|
| void CSSBasicShapeInterpolationType::apply(const InterpolableValue& interpolableValue, const NonInterpolableValue* nonInterpolableValue, InterpolationEnvironment& environment) const
|
| {
|
| - BasicShapePropertyFunctions::setBasicShape(cssProperty(), *environment.state().style(),
|
| + BasicShapePropertyFunctions::setBasicShape(cssProperty(), environment.style(),
|
| BasicShapeInterpolationFunctions::createBasicShape(interpolableValue, *nonInterpolableValue, environment.state().cssToLengthConversionData()));
|
| }
|
|
|
|
|