Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(361)

Unified Diff: third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.cpp

Issue 1885353004: Add ComputedStyle constructor and getter to InterpolationEnvironment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_transformInterpolationType
Patch Set: Rebased Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698