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

Unified Diff: third_party/WebKit/Source/core/animation/css/CSSAnimations.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/css/CSSAnimations.cpp
diff --git a/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp b/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
index 0ab1173dc676ef47fc1df5599cf527d5d57efc55..de2351b358b72f95d99a5ab127266456719ea737 100644
--- a/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
+++ b/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
@@ -113,7 +113,7 @@ static StringKeyframeEffectModel* createKeyframeEffectModel(
timingFunction = CSSTimingData::initialTimingFunction();
}
keyframe->setEasing(timingFunction.release());
- } else if (CSSAnimations::isAnimatableProperty(property)) {
+ } else if (!CSSAnimations::isAnimationAffectingProperty(property)) {
keyframe->setCSSPropertyValue(property,
properties.propertyAt(j).value());
}
@@ -1048,7 +1048,7 @@ const StylePropertyShorthand& CSSAnimations::propertiesForTransitionAll() {
// Properties that affect animations are not allowed to be affected by
// animations. http://w3c.github.io/web-animations/#not-animatable-section
-bool CSSAnimations::isAnimatableProperty(CSSPropertyID property) {
+bool CSSAnimations::isAnimationAffectingProperty(CSSPropertyID property) {
switch (property) {
case CSSPropertyAnimation:
case CSSPropertyAnimationDelay:
@@ -1065,9 +1065,9 @@ bool CSSAnimations::isAnimatableProperty(CSSPropertyID property) {
case CSSPropertyTransitionDuration:
case CSSPropertyTransitionProperty:
case CSSPropertyTransitionTimingFunction:
- return false;
- default:
return true;
+ default:
+ return false;
}
}
« no previous file with comments | « third_party/WebKit/Source/core/animation/css/CSSAnimations.h ('k') | third_party/WebKit/Source/core/css/CSSSyntaxDescriptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698