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

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

Issue 2323633002: Implement animation tainted custom property values (Closed)
Patch Set: bigger fallback value 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
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 65f290940c5f232da962a58f37bfcdf4f4eca1cf..131a5d7b0287236a8cc71a19c95545705b8dd3fa 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
@@ -40,6 +40,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"
@@ -112,8 +113,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() &&

Powered by Google App Engine
This is Rietveld 408576698