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

Unified Diff: Source/core/animation/css/CSSAnimations.cpp

Issue 1213063004: Rename animatable to interpolable in CSSProperties.in (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 5 years, 6 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 | « Source/core/animation/css/CSSAnimations.h ('k') | Source/core/css/CSSProperties.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/css/CSSAnimations.cpp
diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp
index a84c2846377d0332fe3f91e0619ceb279f81e2c5..a22873c10c015af6ae88658be88dd90d2e9a4492 100644
--- a/Source/core/animation/css/CSSAnimations.cpp
+++ b/Source/core/animation/css/CSSAnimations.cpp
@@ -100,7 +100,9 @@ static PassRefPtrWillBeRawPtr<StringKeyframeEffectModel> createKeyframeEffectMod
timingFunction = CSSTimingData::initialTimingFunction();
}
keyframe->setEasing(timingFunction.release());
- } else if (CSSPropertyMetadata::isAnimatableProperty(property)) {
+ } else if (CSSPropertyMetadata::isInterpolableProperty(property)) {
+ // TODO(alancutter): We should allow animation of non-interpolable properties as well.
+ // https://lists.w3.org/Archives/Public/www-style/2012Nov/0261.html
keyframe->setPropertyValue(property, properties.propertyAt(j).value());
}
}
@@ -551,7 +553,7 @@ void CSSAnimations::calculateTransitionUpdate(CSSAnimationUpdate* update, const
CSSPropertyID id = propertyList.length() ? propertyList.properties()[j] : property;
if (!animateAll) {
- if (CSSPropertyMetadata::isAnimatableProperty(id))
+ if (CSSPropertyMetadata::isInterpolableProperty(id))
listedProperties.set(id);
else
continue;
@@ -751,7 +753,7 @@ const StylePropertyShorthand& CSSAnimations::propertiesForTransitionAll()
|| id == CSSPropertyWebkitTransformOriginY
|| id == CSSPropertyWebkitTransformOriginZ)
continue;
- if (CSSPropertyMetadata::isAnimatableProperty(id))
+ if (CSSPropertyMetadata::isInterpolableProperty(id))
properties.append(id);
}
propertyShorthand = StylePropertyShorthand(CSSPropertyInvalid, properties.begin(), properties.size());
@@ -759,9 +761,9 @@ const StylePropertyShorthand& CSSAnimations::propertiesForTransitionAll()
return propertyShorthand;
}
-// KeyframeEffect properties are not allowed to be affected by Web Animations.
-// http://dev.w3.org/fxtf/web-animations/#not-animatable
-bool CSSAnimations::isAllowedAnimation(CSSPropertyID property)
+// 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)
{
switch (property) {
case CSSPropertyAnimation:
« no previous file with comments | « Source/core/animation/css/CSSAnimations.h ('k') | Source/core/css/CSSProperties.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698