Revert of Add additive animation support for border-radius CSS properties

third_party/WebKit/Source/core/animation/LengthListPropertyFunctions.cpp

Index: third_party/WebKit/Source/core/animation/LengthListPropertyFunctions.cpp
diff --git a/third_party/WebKit/Source/core/animation/LengthListPropertyFunctions.cpp b/third_party/WebKit/Source/core/animation/LengthListPropertyFunctions.cpp
index 7db77263cf8d3d0ed32d49a08e7b5fa5544a0cf4..28fc54865a575bfbacbf85944dfa558a2387d185 100644
--- a/third_party/WebKit/Source/core/animation/LengthListPropertyFunctions.cpp
+++ b/third_party/WebKit/Source/core/animation/LengthListPropertyFunctions.cpp
@@ -82,10 +82,6 @@
     case CSSPropertyWebkitMaskPositionY:
         return ValueRangeAll;
 
-    case CSSPropertyBorderBottomLeftRadius:
-    case CSSPropertyBorderBottomRightRadius:
-    case CSSPropertyBorderTopLeftRadius:
-    case CSSPropertyBorderTopRightRadius:
     case CSSPropertyStrokeDasharray:
         return ValueRangeNonNegative;
 
@@ -100,47 +96,27 @@
     return getLengthList(property, *ComputedStyle::initialStyle());
 }
 
-static Vector<Length> toVector(const LengthPoint& point)
-{
-    Vector<Length> result(2);
-    result[0] = point.x();
-    result[1] = point.y();
-    return result;
-}
-
-static Vector<Length> toVector(const LengthSize& size)
-{
-    Vector<Length> result(2);
-    result[0] = size.width();
-    result[1] = size.height();
-    return result;
-}
-
 Vector<Length> LengthListPropertyFunctions::getLengthList(CSSPropertyID property, const ComputedStyle& style)
 {
+    Vector<Length> result;
+
     switch (property) {
-    case CSSPropertyStrokeDasharray: {
+    case CSSPropertyStrokeDasharray:
         if (style.strokeDashArray())
-            return style.strokeDashArray()->vector();
-        return Vector<Length>();
-    }
+            result.appendVector(style.strokeDashArray()->vector());
+        return result;
     case CSSPropertyObjectPosition:
-        return toVector(style.objectPosition());
+        result.append(style.objectPosition().x());
+        result.append(style.objectPosition().y());
+        return result;
     case CSSPropertyPerspectiveOrigin:
-        return toVector(style.perspectiveOrigin());
-    case CSSPropertyBorderBottomLeftRadius:
-        return toVector(style.borderBottomLeftRadius());
-    case CSSPropertyBorderBottomRightRadius:
-        return toVector(style.borderBottomRightRadius());
-    case CSSPropertyBorderTopLeftRadius:
-        return toVector(style.borderTopLeftRadius());
-    case CSSPropertyBorderTopRightRadius:
-        return toVector(style.borderTopRightRadius());
+        result.append(style.perspectiveOrigin().x());
+        result.append(style.perspectiveOrigin().y());
+        return result;
     default:
         break;
     }
 
-    Vector<Length> result;
     const FillLayer* fillLayer = getFillLayer(property, style);
     FillLayerMethods fillLayerMethods(property);
     while (fillLayer && (fillLayer->*fillLayerMethods.isSet)()) {
@@ -150,18 +126,6 @@
     return result;
 }
 
-static LengthPoint pointFromVector(const Vector<Length>& list)
-{
-    ASSERT(list.size() == 2);
-    return LengthPoint(list[0], list[1]);
-}
-
-static LengthSize sizeFromVector(const Vector<Length>& list)
-{
-    ASSERT(list.size() == 2);
-    return LengthSize(list[0], list[1]);
-}
-
 void LengthListPropertyFunctions::setLengthList(CSSPropertyID property, ComputedStyle& style, Vector<Length>&& lengthList)
 {
     switch (property) {
@@ -169,22 +133,10 @@
         style.setStrokeDashArray(lengthList.isEmpty() ? nullptr : RefVector<Length>::create(std::move(lengthList)));
         return;
     case CSSPropertyObjectPosition:
-        style.setObjectPosition(pointFromVector(lengthList));
+        style.setObjectPosition(LengthPoint(lengthList[0], lengthList[1]));
         return;
     case CSSPropertyPerspectiveOrigin:
-        style.setPerspectiveOrigin(pointFromVector(lengthList));
-        return;
-    case CSSPropertyBorderBottomLeftRadius:
-        style.setBorderBottomLeftRadius(sizeFromVector(lengthList));
-        return;
-    case CSSPropertyBorderBottomRightRadius:
-        style.setBorderBottomRightRadius(sizeFromVector(lengthList));
-        return;
-    case CSSPropertyBorderTopLeftRadius:
-        style.setBorderTopLeftRadius(sizeFromVector(lengthList));
-        return;
-    case CSSPropertyBorderTopRightRadius:
-        style.setBorderTopRightRadius(sizeFromVector(lengthList));
+        style.setPerspectiveOrigin(LengthPoint(lengthList[0], lengthList[1]));
         return;
     default:
         break;