Fix unprefixed transitions when experimental features flag is off

Source/core/css/CSSProperty.h

Index: Source/core/css/CSSProperty.h
diff --git a/Source/core/css/CSSProperty.h b/Source/core/css/CSSProperty.h
index 13ae2f0ce919a7de95d82c8b016d05ca8175b819..1cf80fc40b991f498f0063e53b7bd3a4d69f1ebb 100644
--- a/Source/core/css/CSSProperty.h
+++ b/Source/core/css/CSSProperty.h
@@ -92,101 +92,73 @@ private:
 
 inline CSSPropertyID prefixingVariantForPropertyId(CSSPropertyID propId)
 {
-    if (!RuntimeEnabledFeatures::cssAnimationUnprefixedEnabled())
-        return propId;
+    if (RuntimeEnabledFeatures::cssAnimationUnprefixedEnabled()) {
+        switch (propId) {
+        case CSSPropertyAnimation:
+            return CSSPropertyWebkitAnimation;
+        case CSSPropertyAnimationDelay:
+            return CSSPropertyWebkitAnimationDelay;
+        case CSSPropertyAnimationDirection:
+            return CSSPropertyWebkitAnimationDirection;
+        case CSSPropertyAnimationDuration:
+            return CSSPropertyWebkitAnimationDuration;
+        case CSSPropertyAnimationFillMode:
+            return CSSPropertyWebkitAnimationFillMode;
+        case CSSPropertyAnimationIterationCount:
+            return CSSPropertyWebkitAnimationIterationCount;
+        case CSSPropertyAnimationName:
+            return CSSPropertyWebkitAnimationName;
+        case CSSPropertyAnimationPlayState:
+            return CSSPropertyWebkitAnimationPlayState;
+        case CSSPropertyAnimationTimingFunction:
+            return CSSPropertyWebkitAnimationTimingFunction;
+        case CSSPropertyWebkitAnimation:
+            return CSSPropertyAnimation;
+        case CSSPropertyWebkitAnimationDelay:
+            return CSSPropertyAnimationDelay;
+        case CSSPropertyWebkitAnimationDirection:
+            return CSSPropertyAnimationDirection;
+        case CSSPropertyWebkitAnimationDuration:
+            return CSSPropertyAnimationDuration;
+        case CSSPropertyWebkitAnimationFillMode:
+            return CSSPropertyAnimationFillMode;
+        case CSSPropertyWebkitAnimationIterationCount:
+            return CSSPropertyAnimationIterationCount;
+        case CSSPropertyWebkitAnimationName:
+            return CSSPropertyAnimationName;
+        case CSSPropertyWebkitAnimationPlayState:
+            return CSSPropertyAnimationPlayState;
+        case CSSPropertyWebkitAnimationTimingFunction:
+            return CSSPropertyAnimationTimingFunction;
+        default:
+            break;
+        }
+    }
 
-    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:
-        propertyId = CSSPropertyWebkitAnimationIterationCount;
-        break;
-    case CSSPropertyAnimationName:
-        propertyId = CSSPropertyWebkitAnimationName;
-        break;
-    case CSSPropertyAnimationPlayState:
-        propertyId = CSSPropertyWebkitAnimationPlayState;
-        break;
-    case CSSPropertyAnimationTimingFunction:
-        propertyId = CSSPropertyWebkitAnimationTimingFunction;
-        break;
     case CSSPropertyTransitionDelay:
-        propertyId = CSSPropertyWebkitTransitionDelay;
-        break;
+        return CSSPropertyWebkitTransitionDelay;
     case CSSPropertyTransitionDuration:
-        propertyId = CSSPropertyWebkitTransitionDuration;
-        break;
+        return CSSPropertyWebkitTransitionDuration;
     case CSSPropertyTransitionProperty:
-        propertyId = CSSPropertyWebkitTransitionProperty;
-        break;
+        return CSSPropertyWebkitTransitionProperty;
     case CSSPropertyTransitionTimingFunction:
-        propertyId = CSSPropertyWebkitTransitionTimingFunction;
-        break;
+        return CSSPropertyWebkitTransitionTimingFunction;
     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;
+        return CSSPropertyWebkitTransition;
     case CSSPropertyWebkitTransitionDelay:
-        propertyId = CSSPropertyTransitionDelay;
-        break;
+        return CSSPropertyTransitionDelay;
     case CSSPropertyWebkitTransitionDuration:
-        propertyId = CSSPropertyTransitionDuration;
-        break;
+        return CSSPropertyTransitionDuration;
     case CSSPropertyWebkitTransitionProperty:
-        propertyId = CSSPropertyTransitionProperty;
-        break;
+        return CSSPropertyTransitionProperty;
     case CSSPropertyWebkitTransitionTimingFunction:
-        propertyId = CSSPropertyTransitionTimingFunction;
-        break;
+        return CSSPropertyTransitionTimingFunction;
     case CSSPropertyWebkitTransition:
-        propertyId = CSSPropertyTransition;
-        break;
+        return CSSPropertyTransition;
     default:
-        propertyId = propId;
-        break;
+        return propId;
     }
-    ASSERT(propertyId != CSSPropertyInvalid);
-    return propertyId;
 }
 
 } // namespace blink