Index: Source/core/animation/css/CSSTransitionData.h |
diff --git a/Source/core/animation/css/CSSTransitionData.h b/Source/core/animation/css/CSSTransitionData.h |
index 78cfce95c8afcd6321960c4c918d880d8f51de7d..56e66b0d7d9f8f50a82503592b79dff0100f09e5 100644 |
--- a/Source/core/animation/css/CSSTransitionData.h |
+++ b/Source/core/animation/css/CSSTransitionData.h |
@@ -15,23 +15,22 @@ class CSSTransitionData final : public CSSTimingData { |
public: |
enum TransitionPropertyType { |
TransitionNone, |
alancutter (OOO until 2018)
2015/08/26 02:57:17
Unrelated to this patch but I'm not sure why we re
Timothy Loh
2015/08/26 03:36:37
Probably to make it consistent with the other tran
|
- TransitionSingleProperty, |
- TransitionUnknown, |
- TransitionAll |
+ TransitionKnownProperty, |
+ TransitionUnknownProperty, |
}; |
// FIXME: We shouldn't allow 'none' to be used alongside other properties. |
struct TransitionProperty { |
ALLOW_ONLY_INLINE_ALLOCATION(); |
TransitionProperty(CSSPropertyID id) |
- : propertyType(TransitionSingleProperty) |
+ : propertyType(TransitionKnownProperty) |
, unresolvedProperty(id) |
{ |
ASSERT(id != CSSPropertyInvalid); |
} |
TransitionProperty(const String& string) |
- : propertyType(TransitionUnknown) |
+ : propertyType(TransitionUnknownProperty) |
, unresolvedProperty(CSSPropertyInvalid) |
, propertyString(string) |
{ |
@@ -41,7 +40,7 @@ public: |
: propertyType(type) |
, unresolvedProperty(CSSPropertyInvalid) |
{ |
- ASSERT(type == TransitionNone || type == TransitionAll); |
+ ASSERT(type == TransitionNone); |
} |
bool operator==(const TransitionProperty& other) const { return propertyType == other.propertyType && unresolvedProperty == other.unresolvedProperty && propertyString == other.propertyString; } |
@@ -68,7 +67,7 @@ public: |
const Vector<TransitionProperty>& propertyList() const { return m_propertyList; } |
Vector<TransitionProperty>& propertyList() { return m_propertyList; } |
- static TransitionProperty initialProperty() { return TransitionProperty(TransitionAll); } |
+ static TransitionProperty initialProperty() { return TransitionProperty(CSSPropertyAll); } |
private: |
CSSTransitionData(); |