Animation: Add template for ListStyleInterpolation

Source/core/animation/StringKeyframe.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/animation/StringKeyframe.h"
 
 #include "core/animation/ColorStyleInterpolation.h"
 #include "core/animation/ConstantStyleInterpolation.h"
 #include "core/animation/DefaultStyleInterpolation.h"
 #include "core/animation/DeferredLegacyStyleInterpolation.h"
 #include "core/animation/DoubleStyleInterpolation.h"
 #include "core/animation/ImageStyleInterpolation.h"
 #include "core/animation/LegacyStyleInterpolation.h"
 #include "core/animation/LengthBoxStyleInterpolation.h"
 #include "core/animation/LengthPairStyleInterpolation.h"
-#include "core/animation/LengthPoint3DStyleInterpolation.h"
 #include "core/animation/LengthStyleInterpolation.h"
+#include "core/animation/ListStyleInterpolation.h"
+#include "core/animation/ShadowStyleInterpolation.h"
 #include "core/animation/VisibilityStyleInterpolation.h"
 #include "core/animation/css/CSSAnimations.h"
 #include "core/css/CSSPropertyMetadata.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/rendering/style/RenderStyle.h"
 
 namespace blink {
 
 StringKeyframe::StringKeyframe(const StringKeyframe& copyFrom)
     : Keyframe(copyFrom.m_offset, copyFrom.m_composite, copyFrom.m_easing)
@@ skipping 177 matching lines @@
         break;
     case CSSPropertyBorderBottomLeftRadius:
     case CSSPropertyBorderBottomRightRadius:
     case CSSPropertyBorderTopLeftRadius:
     case CSSPropertyBorderTopRightRadius:
         range = RangeNonNegative;
         // Fall through
     case CSSPropertyObjectPosition:
         if (LengthPairStyleInterpolation::canCreateFrom(*fromCSSValue) && LengthPairStyleInterpolation::canCreateFrom(*toCSSValue))
             return LengthPairStyleInterpolation::create(*fromCSSValue, *toCSSValue, property, range);
+        break;
 
-        // FIXME: Handle CSSValueLists.
-        fallBackToLegacy = true;
-        break;
     case CSSPropertyPerspectiveOrigin:
     case CSSPropertyTransformOrigin:
-        if (LengthPoint3DStyleInterpolation::canCreateFrom(*fromCSSValue) && LengthPoint3DStyleInterpolation::canCreateFrom(*toCSSValue))
-            return LengthPoint3DStyleInterpolation::create(*fromCSSValue, *toCSSValue, property);
+        {

[Eric Willigers, 2015/01/28 02:21:23]

Move brace to end of previous line. Following 5 lines can be un-indented.

[evemj (not active), 2015/01/28 23:01:53]

Done.

+            RefPtrWillBeRawPtr<Interpolation> interpolation = ListStyleInterpolation<LengthStyleInterpolation>::maybeCreateFromList(*fromCSSValue, *toCSSValue, property, range);
+            if (interpolation)
+                return interpolation.release();
+            break;
+        }
 
-        // FIXME: Handle percentages and 2D origins.
-        fallBackToLegacy = true;
-        break;
+    case CSSPropertyBoxShadow:
+    case CSSPropertyTextShadow:
+    case CSSPropertyWebkitBoxShadow:
+        {

[Eric Willigers, 2015/01/28 02:21:23]

Move brace to end of previous line. Following lines can be un-indented.

[evemj (not active), 2015/01/28 23:01:53]

Done.

+            RefPtrWillBeRawPtr<Interpolation> interpolation = ListStyleInterpolation<ShadowStyleInterpolation>::maybeCreateFromList(*fromCSSValue, *toCSSValue, property);
+            if (interpolation)
+                return interpolation.release();
+
+            // Interpolation between inset and non-inset ShadowValues should fall back to DefaultStyleInterpolation
+            if (ShadowStyleInterpolation::usesDefaultStyleInterpolation(*fromCSSValue, *toCSSValue))
+                return DefaultStyleInterpolation::create(fromCSSValue, toCSSValue, property);
+
+            // FIXME: Handle interpolation from/to none
+            fallBackToLegacy = true;
+
+            break;
+        }
+
     case CSSPropertyWebkitMaskBoxImageSlice:
         if (LengthBoxStyleInterpolation::matchingFill(*toCSSValue, *fromCSSValue) && LengthBoxStyleInterpolation::canCreateFrom(*fromCSSValue) && LengthStyleInterpolation::canCreateFrom(*toCSSValue))
             return LengthBoxStyleInterpolation::createFromBorderImageSlice(*fromCSSValue, *toCSSValue, property);
+        break;
 
-        break;
     default:
         // Fall back to LegacyStyleInterpolation.
         fallBackToLegacy = true;
         break;
     }
 
     if (fromCSSValue->isUnsetValue() || fromCSSValue->isInheritedValue() || fromCSSValue->isInitialValue()
         || toCSSValue->isUnsetValue() || toCSSValue->isInheritedValue() || toCSSValue->isInitialValue())
         fallBackToLegacy = true;
 
@@ skipping 44 matching lines @@
 }
 
 void StringKeyframe::PropertySpecificKeyframe::trace(Visitor* visitor)
 {
     visitor->trace(m_value);
     visitor->trace(m_animatableValueCache);
     Keyframe::PropertySpecificKeyframe::trace(visitor);
 }
 
 }