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

Unified Diff: third_party/WebKit/Source/core/animation/StringKeyframe.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
Index: third_party/WebKit/Source/core/animation/StringKeyframe.cpp
diff --git a/third_party/WebKit/Source/core/animation/StringKeyframe.cpp b/third_party/WebKit/Source/core/animation/StringKeyframe.cpp
index feecf4cd7452e8a9615c839a86e5cc0e3b21febc..ea298ff2e1d56327c46feabdc38befee435dfe9a 100644
--- a/third_party/WebKit/Source/core/animation/StringKeyframe.cpp
+++ b/third_party/WebKit/Source/core/animation/StringKeyframe.cpp
@@ -26,7 +26,9 @@ void StringKeyframe::setCSSPropertyValue(
const AtomicString& propertyName,
const String& value,
StyleSheetContents* styleSheetContents) {
- m_cssPropertyMap->setProperty(propertyName, value, false, styleSheetContents);
+ bool isAnimationTainted = true;
+ m_cssPropertyMap->setProperty(propertyName, value, false, styleSheetContents,
+ isAnimationTainted);
}
void StringKeyframe::setCSSPropertyValue(
@@ -34,14 +36,14 @@ void StringKeyframe::setCSSPropertyValue(
const String& value,
StyleSheetContents* styleSheetContents) {
DCHECK_NE(property, CSSPropertyInvalid);
- if (CSSAnimations::isAnimatableProperty(property))
+ if (!CSSAnimations::isAnimationAffectingProperty(property))
m_cssPropertyMap->setProperty(property, value, false, styleSheetContents);
}
void StringKeyframe::setCSSPropertyValue(CSSPropertyID property,
const CSSValue& value) {
DCHECK_NE(property, CSSPropertyInvalid);
- DCHECK(CSSAnimations::isAnimatableProperty(property));
+ DCHECK(!CSSAnimations::isAnimationAffectingProperty(property));
m_cssPropertyMap->setProperty(property, value, false);
}
@@ -50,7 +52,7 @@ void StringKeyframe::setPresentationAttributeValue(
const String& value,
StyleSheetContents* styleSheetContents) {
DCHECK_NE(property, CSSPropertyInvalid);
- if (CSSAnimations::isAnimatableProperty(property))
+ if (!CSSAnimations::isAnimationAffectingProperty(property))
m_presentationAttributeMap->setProperty(property, value, false,
styleSheetContents);
}

Powered by Google App Engine
This is Rietveld 408576698