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

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

Issue 2162773002: Avoid mishandling CSSPendingSubstitutionValues in CSS animations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: Created 4 years, 5 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 | « third_party/WebKit/LayoutTests/animations/animate-shorthand-var-crash.html ('k') | no next file » | 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 a5041dc5689fd0e317797a549d9abda154c88993..25fd06b50aaf19d75e124777f28b47a2de7a6152 100644
--- a/third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp
@@ -49,6 +49,10 @@ InterpolationValue CSSInterpolationType::maybeConvertSingle(const PropertySpecif
if (!value)
return maybeConvertNeutral(underlying, conversionCheckers);
+ // TODO(alancutter): Support animation of var() in shorthand properties.
+ if (value->isPendingSubstitutionValue())
+ return nullptr;
+
if (value->isVariableReferenceValue() && !isShorthandProperty(cssProperty())) {
resolvedCSSValueOwner = CSSVariableResolver::resolveVariableReferences(environment.state().style()->variables(), cssProperty(), toCSSVariableReferenceValue(*value));
conversionCheckers.append(ResolvedVariableChecker::create(cssProperty(), toCSSVariableReferenceValue(value), resolvedCSSValueOwner));
« no previous file with comments | « third_party/WebKit/LayoutTests/animations/animate-shorthand-var-crash.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698