Index: third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.cpp |
diff --git a/third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.cpp |
index eff2bd9a4827e2f10b3f4bf602258aa95f5206b4..1531c678191815926acf9597cea8e820e4d6b7f2 100644 |
--- a/third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.cpp |
+++ b/third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.cpp |
@@ -98,9 +98,7 @@ PairwiseInterpolationValue CSSShadowListInterpolationType::maybeMergeSingles(Int |
InterpolationValue CSSShadowListInterpolationType::maybeConvertUnderlyingValue(const InterpolationEnvironment& environment) const |
{ |
- if (!environment.state().style()) |
- return nullptr; |
- return convertShadowList(ShadowListPropertyFunctions::getShadowList(cssProperty(), *environment.state().style()), environment.state().style()->effectiveZoom()); |
+ return convertShadowList(ShadowListPropertyFunctions::getShadowList(cssProperty(), environment.style()), environment.style().effectiveZoom()); |
} |
void CSSShadowListInterpolationType::composite(UnderlyingValueOwner& underlyingValueOwner, double underlyingFraction, const InterpolationValue& value, double interpolationFraction) const |
@@ -125,7 +123,7 @@ static PassRefPtr<ShadowList> createShadowList(const InterpolableValue& interpol |
void CSSShadowListInterpolationType::apply(const InterpolableValue& interpolableValue, const NonInterpolableValue* nonInterpolableValue, InterpolationEnvironment& environment) const |
{ |
- ShadowListPropertyFunctions::setShadowList(cssProperty(), *environment.state().style(), createShadowList(interpolableValue, nonInterpolableValue, environment.state())); |
+ ShadowListPropertyFunctions::setShadowList(cssProperty(), environment.style(), createShadowList(interpolableValue, nonInterpolableValue, environment.state())); |
} |
} // namespace blink |