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

Unified Diff: Source/core/animation/StringKeyframe.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
Index: Source/core/animation/StringKeyframe.cpp
diff --git a/Source/core/animation/StringKeyframe.cpp b/Source/core/animation/StringKeyframe.cpp
index 8ae20c1f2afa7a81cff2c6c827428901e5679842..25c36703bb71163c26129d0b43ee686640b8ac6e 100644
--- a/Source/core/animation/StringKeyframe.cpp
+++ b/Source/core/animation/StringKeyframe.cpp
@@ -55,14 +55,14 @@ StringKeyframe::StringKeyframe(const StringKeyframe& copyFrom)
void StringKeyframe::setPropertyValue(CSSPropertyID property, const String& value, Element* element, StyleSheetContents* styleSheetContents)
{
ASSERT(property != CSSPropertyInvalid);
- if (CSSAnimations::isAllowedAnimation(property))
+ if (CSSAnimations::isAnimatableProperty(property))
m_propertySet->setProperty(property, value, false, styleSheetContents);
}
void StringKeyframe::setPropertyValue(CSSPropertyID property, PassRefPtrWillBeRawPtr<CSSValue> value)
{
ASSERT(property != CSSPropertyInvalid);
- ASSERT(CSSAnimations::isAllowedAnimation(property));
+ ASSERT(CSSAnimations::isAnimatableProperty(property));
m_propertySet->setProperty(property, value, false);
}
@@ -161,8 +161,8 @@ const Vector<const InterpolationType*>* applicableTypesForProperty(CSSPropertyID
if (entry != applicableTypesMap.end())
return entry->value;
- // TODO(alancutter): Support all animatable CSS properties here so we can stop falling back to the old StyleInterpolation implementation.
- if (CSSPropertyMetadata::isAnimatableProperty(property))
+ // TODO(alancutter): Support all interpolable CSS properties here so we can stop falling back to the old StyleInterpolation implementation.
+ if (CSSPropertyMetadata::isInterpolableProperty(property))
return nullptr;
auto applicableTypes = new Vector<const InterpolationType*>();
@@ -197,7 +197,7 @@ PassRefPtrWillBeRawPtr<Interpolation> StringKeyframe::CSSPropertySpecificKeyfram
ASSERT(fromCSSValue && toCSSValue);
- if (!CSSPropertyMetadata::isAnimatableProperty(property)) {
+ if (!CSSPropertyMetadata::isInterpolableProperty(property)) {
if (fromCSSValue == toCSSValue)
return ConstantStyleInterpolation::create(fromCSSValue, property);
« no previous file with comments | « Source/build/scripts/make_css_property_metadata.py ('k') | Source/core/animation/css/CSSAnimatableValueFactory.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698