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

Unified Diff: third_party/WebKit/Source/core/animation/CSSBasicShapeInterpolationType.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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/animation/CSSBorderImageLengthBoxInterpolationType.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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()));
}
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/animation/CSSBorderImageLengthBoxInterpolationType.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698