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

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

Issue 2652063003: Remove dependency on StyleResolverState in CSSInterpolationType::maybeConvertUnderlyingValue() (Closed)
Patch Set: Rebased Created 3 years, 10 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/InterpolationEnvironment.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp
diff --git a/third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp
index a4c5bce83a2f14b20d49c5aeb84a3a6dcc871722..861d27a5c1ab2bd498bdd6834ad119c528a2d084 100644
--- a/third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp
@@ -250,9 +250,9 @@ CSSInterpolationType::maybeConvertCustomPropertyDeclarationInternal(
InterpolationValue CSSInterpolationType::maybeConvertUnderlyingValue(
const InterpolationEnvironment& environment) const {
- const StyleResolverState& state = environment.state();
+ const ComputedStyle& style = environment.style();
if (!getProperty().isCSSCustomProperty()) {
- return maybeConvertStandardPropertyUnderlyingValue(*state.style());
+ return maybeConvertStandardPropertyUnderlyingValue(style);
}
const PropertyHandle property = getProperty();
@@ -261,7 +261,7 @@ InterpolationValue CSSInterpolationType::maybeConvertUnderlyingValue(
return nullptr;
}
const CSSValue* underlyingValue =
- state.style()->getRegisteredVariable(name, m_registration->inherits());
+ style.getRegisteredVariable(name, m_registration->inherits());
if (!underlyingValue) {
underlyingValue = m_registration->initial();
}
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/animation/InterpolationEnvironment.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698