Index: Source/core/css/CSSProperty.h |
diff --git a/Source/core/css/CSSProperty.h b/Source/core/css/CSSProperty.h |
index a400af1b5823592e09677665cacbfe57b89f86e4..fd802ecbe4018c3951fa86a7022119317da69d19 100644 |
--- a/Source/core/css/CSSProperty.h |
+++ b/Source/core/css/CSSProperty.h |
@@ -22,6 +22,7 @@ |
#define CSSProperty_h |
#include "CSSPropertyNames.h" |
+#include "RuntimeEnabledFeatures.h" |
#include "core/css/CSSValue.h" |
#include "core/platform/text/TextDirection.h" |
#include "core/platform/text/WritingMode.h" |
@@ -89,8 +90,38 @@ private: |
inline CSSPropertyID prefixingVariantForPropertyId(CSSPropertyID propId) |
{ |
+ if (!RuntimeEnabledFeatures::cssAnimationUnprefixedEnabled() && (propId >= CSSPropertyWebkitAnimation && propId <= CSSPropertyAnimationTimingFunction)) |
+ return propId; |
+ |
CSSPropertyID propertyId = CSSPropertyInvalid; |
switch (propId) { |
+ case CSSPropertyAnimation: |
+ propertyId = CSSPropertyWebkitAnimation; |
+ break; |
+ case CSSPropertyAnimationDelay: |
+ propertyId = CSSPropertyWebkitAnimationDelay; |
+ break; |
+ case CSSPropertyAnimationDirection: |
+ propertyId = CSSPropertyWebkitAnimationDirection; |
+ break; |
+ case CSSPropertyAnimationDuration: |
+ propertyId = CSSPropertyWebkitAnimationDuration; |
+ break; |
+ case CSSPropertyAnimationFillMode: |
+ propertyId = CSSPropertyWebkitAnimationFillMode; |
+ break; |
+ case CSSPropertyAnimationIterationCount: |
eseidel
2013/08/13 17:49:15
Bleh. This should just be one big static array ma
darktears
2013/08/13 18:08:54
Yes, let's fix that in a following patch.
|
+ propertyId = CSSPropertyWebkitAnimationIterationCount; |
+ break; |
+ case CSSPropertyAnimationName: |
+ propertyId = CSSPropertyWebkitAnimationName; |
+ break; |
+ case CSSPropertyAnimationPlayState: |
+ propertyId = CSSPropertyWebkitAnimationPlayState; |
+ break; |
+ case CSSPropertyAnimationTimingFunction: |
+ propertyId = CSSPropertyWebkitAnimationTimingFunction; |
+ break; |
case CSSPropertyTransitionDelay: |
propertyId = CSSPropertyWebkitTransitionDelay; |
break; |
@@ -106,6 +137,33 @@ inline CSSPropertyID prefixingVariantForPropertyId(CSSPropertyID propId) |
case CSSPropertyTransition: |
propertyId = CSSPropertyWebkitTransition; |
break; |
+ case CSSPropertyWebkitAnimation: |
+ propertyId = CSSPropertyAnimation; |
+ break; |
+ case CSSPropertyWebkitAnimationDelay: |
+ propertyId = CSSPropertyAnimationDelay; |
+ break; |
+ case CSSPropertyWebkitAnimationDirection: |
+ propertyId = CSSPropertyAnimationDirection; |
+ break; |
+ case CSSPropertyWebkitAnimationDuration: |
+ propertyId = CSSPropertyAnimationDuration; |
+ break; |
+ case CSSPropertyWebkitAnimationFillMode: |
+ propertyId = CSSPropertyAnimationFillMode; |
+ break; |
+ case CSSPropertyWebkitAnimationIterationCount: |
+ propertyId = CSSPropertyAnimationIterationCount; |
+ break; |
+ case CSSPropertyWebkitAnimationName: |
+ propertyId = CSSPropertyAnimationName; |
+ break; |
+ case CSSPropertyWebkitAnimationPlayState: |
+ propertyId = CSSPropertyAnimationPlayState; |
+ break; |
+ case CSSPropertyWebkitAnimationTimingFunction: |
+ propertyId = CSSPropertyAnimationTimingFunction; |
+ break; |
case CSSPropertyWebkitTransitionDelay: |
propertyId = CSSPropertyTransitionDelay; |
break; |