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

Unified Diff: third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp

Issue 2323633002: Implement animation tainted custom property values (Closed)
Patch Set: Rebased Created 4 years, 2 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/Source/core/css/resolver/CSSVariableResolver.cpp ('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/css/resolver/StyleBuilderCustom.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
index d2286563aa2a67cfd756ae8c1c1dee878bde61cc..46ee042dd0bfc72e003a56f247efa90f815447fe 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
@@ -42,6 +42,7 @@
#include "core/CSSValueKeywords.h"
#include "core/StyleBuilderFunctions.h"
#include "core/StylePropertyShorthand.h"
+#include "core/animation/css/CSSAnimations.h"
#include "core/css/CSSCounterValue.h"
#include "core/css/CSSCursorImageValue.h"
#include "core/css/CSSCustomPropertyDeclaration.h"
@@ -114,8 +115,10 @@ void StyleBuilder::applyProperty(CSSPropertyID id,
const CSSValue& value) {
if (id != CSSPropertyVariable && (value.isVariableReferenceValue() ||
value.isPendingSubstitutionValue())) {
+ bool omitAnimationTainted = CSSAnimations::isAnimationAffectingProperty(id);
const CSSValue* resolvedValue =
- CSSVariableResolver::resolveVariableReferences(state, id, value);
+ CSSVariableResolver::resolveVariableReferences(state, id, value,
+ omitAnimationTainted);
applyProperty(id, state, *resolvedValue);
if (!state.style()->hasVariableReferenceFromNonInheritedProperty() &&
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698