| Index: third_party/WebKit/Source/core/css/resolver/CSSPropertyPriority.h
|
| diff --git a/third_party/WebKit/Source/core/css/resolver/CSSPropertyPriority.h b/third_party/WebKit/Source/core/css/resolver/CSSPropertyPriority.h
|
| index ed6b7f46526b747ac5b5d26de22f3d2b2c009a42..fc511fdaa26ffa06eec7c51c16ed5226d2f1ab8b 100644
|
| --- a/third_party/WebKit/Source/core/css/resolver/CSSPropertyPriority.h
|
| +++ b/third_party/WebKit/Source/core/css/resolver/CSSPropertyPriority.h
|
| @@ -16,6 +16,7 @@ namespace blink {
|
|
|
| enum CSSPropertyPriority {
|
| ResolveVariables = 0,
|
| + AnimationPropertyPriority,
|
| HighPropertyPriority,
|
| LowPropertyPriority,
|
| PropertyPriorityCount,
|
| @@ -47,8 +48,31 @@ inline CSSPropertyID CSSPropertyPriorityData<ResolveVariables>::last() {
|
| }
|
|
|
| template <>
|
| +inline CSSPropertyID
|
| +CSSPropertyPriorityData<AnimationPropertyPriority>::first() {
|
| + static_assert(CSSPropertyAnimationDelay == firstCSSProperty,
|
| + "CSSPropertyAnimationDelay should be the first animation "
|
| + "priority property");
|
| + return CSSPropertyAnimationDelay;
|
| +}
|
| +
|
| +template <>
|
| +inline CSSPropertyID
|
| +CSSPropertyPriorityData<AnimationPropertyPriority>::last() {
|
| + static_assert(
|
| + CSSPropertyTransitionTimingFunction == CSSPropertyAnimationDelay + 11,
|
| + "CSSPropertyTransitionTimingFunction should be the end of the high "
|
| + "priority property range");
|
| + static_assert(
|
| + CSSPropertyColor == CSSPropertyTransitionTimingFunction + 1,
|
| + "CSSPropertyTransitionTimingFunction should be immediately before "
|
| + "CSSPropertyColor");
|
| + return CSSPropertyTransitionTimingFunction;
|
| +}
|
| +
|
| +template <>
|
| inline CSSPropertyID CSSPropertyPriorityData<HighPropertyPriority>::first() {
|
| - static_assert(CSSPropertyColor == firstCSSProperty,
|
| + static_assert(CSSPropertyColor == CSSPropertyTransitionTimingFunction + 1,
|
| "CSSPropertyColor should be the first high priority property");
|
| return CSSPropertyColor;
|
| }
|
| @@ -86,6 +110,10 @@ inline CSSPropertyPriority priorityForProperty(CSSPropertyID property) {
|
| property)) {
|
| return HighPropertyPriority;
|
| }
|
| + if (CSSPropertyPriorityData<AnimationPropertyPriority>::propertyHasPriority(
|
| + property)) {
|
| + return AnimationPropertyPriority;
|
| + }
|
| DCHECK(
|
| CSSPropertyPriorityData<ResolveVariables>::propertyHasPriority(property));
|
| return ResolveVariables;
|
|
|