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

Unified Diff: Source/core/animation/css/CSSTransitionData.h

Issue 1308073007: Don't special case transition-property: all in parsing and data storage (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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.cpp ('k') | Source/core/css/ComputedStyleCSSValueMapping.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « Source/core/animation/css/CSSAnimations.cpp ('k') | Source/core/css/ComputedStyleCSSValueMapping.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698