Animation: Implement DoubleStyleInterpolation in StringKeyframe

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/DefaultStyleInterpolation.h"
 #include "core/animation/DeferredLegacyStyleInterpolation.h"
@@ skipping 60 matching lines @@
     , m_value(value)
 {
     ASSERT(!isNull(m_offset));
 }
 
 PassRefPtrWillBeRawPtr<Interpolation> StringKeyframe::PropertySpecificKeyframe::createInterpolation(CSSPropertyID property, Keyframe::PropertySpecificKeyframe* end, Element* element) const
 {
     CSSValue* fromCSSValue = m_value.get();
     CSSValue* toCSSValue = toStringPropertySpecificKeyframe(end)->value();
     ValueRange range = ValueRangeAll;
+    ClampRange clamp = NoClamp;
 
     if (!CSSPropertyMetadata::isAnimatableProperty(property))
         return DefaultStyleInterpolation::create(fromCSSValue, toCSSValue, property);
 
     bool useDefaultStyleInterpolation = true;
 
     switch (property) {
     case CSSPropertyLineHeight:
-        // FIXME: Handle numbers.
-        useDefaultStyleInterpolation = false;
+        if (DoubleStyleInterpolation::canCreateFrom(*fromCSSValue) && DoubleStyleInterpolation::canCreateFrom(*toCSSValue))
+            return DoubleStyleInterpolation::create(*fromCSSValue, *toCSSValue, property, ClampZero);
         // Fall through
     case CSSPropertyBorderBottomWidth:
     case CSSPropertyBorderLeftWidth:
     case CSSPropertyBorderRightWidth:
     case CSSPropertyBorderTopWidth:
+    case CSSPropertyFlexBasis:
     case CSSPropertyFontSize:
     case CSSPropertyHeight:
     case CSSPropertyMaxHeight:
     case CSSPropertyMaxWidth:
     case CSSPropertyMinHeight:
     case CSSPropertyMinWidth:
     case CSSPropertyMotionPosition:
     case CSSPropertyOutlineWidth:
     case CSSPropertyPaddingBottom:
     case CSSPropertyPaddingLeft:
     case CSSPropertyPaddingRight:
     case CSSPropertyPaddingTop:
     case CSSPropertyPerspective:
     case CSSPropertyShapeMargin:
+    case CSSPropertyWebkitBorderHorizontalSpacing:
+    case CSSPropertyWebkitBorderVerticalSpacing:
+    case CSSPropertyWebkitColumnGap:
+    case CSSPropertyWebkitColumnWidth:
     case CSSPropertyWidth:
         range = ValueRangeNonNegative;
         // Fall through
     case CSSPropertyBottom:
     case CSSPropertyLeft:
     case CSSPropertyLetterSpacing:
     case CSSPropertyMarginBottom:
     case CSSPropertyMarginLeft:
     case CSSPropertyMarginRight:
     case CSSPropertyMarginTop:
     case CSSPropertyOutlineOffset:
     case CSSPropertyRight:
     case CSSPropertyTop:
     case CSSPropertyVerticalAlign:
     case CSSPropertyWordSpacing:
         if (LengthStyleInterpolation::canCreateFrom(*fromCSSValue) && LengthStyleInterpolation::canCreateFrom(*toCSSValue))
             return LengthStyleInterpolation::create(*fromCSSValue, *toCSSValue, property, range);
         // FIXME: Handle keywords e.g. 'none'.
         if (property == CSSPropertyPerspective)
             useDefaultStyleInterpolation = false;
         break;
+
+    case CSSPropertyOrphans:
+        if (clamp == NoClamp)
+            clamp = ClampOrphans;
+        // Fall through
+    case CSSPropertyWebkitColumnCount:
+    case CSSPropertyZIndex:
+        if (clamp == NoClamp)
+            clamp = ClampInteger;
+        // Fall through
+    case CSSPropertyFillOpacity:
+    case CSSPropertyFloodOpacity:
+    case CSSPropertyOpacity:
+    case CSSPropertyShapeImageThreshold:
+    case CSSPropertyStopOpacity:
+    case CSSPropertyStrokeOpacity:
+        if (clamp == NoClamp)
+            clamp = ClampOpacity;
+        // Fall through
+    case CSSPropertyStrokeMiterlimit:
+    case CSSPropertyWidows:
+        if (clamp == NoClamp)
+            clamp = ClampOne;
+        // Fall through
+    case CSSPropertyZoom:
+        if (clamp == NoClamp)
+            clamp = ClampZoom;
+        // Fall through
+    case CSSPropertyFlexGrow:
+    case CSSPropertyFlexShrink:
+    case CSSPropertyWebkitColumnRuleWidth:
+        if (DoubleStyleInterpolation::canCreateFrom(*fromCSSValue) && DoubleStyleInterpolation::canCreateFrom(*toCSSValue)) {
+            if (property == CSSPropertyOpacity) {
+                m_animatableValueCache = StyleResolver::createAnimatableValueSnapshot(*element, property, *fromCSSValue);
+                RefPtrWillBeRawPtr<AnimatableValue> to = StyleResolver::createAnimatableValueSnapshot(*element, property, *toCSSValue);
+                toStringPropertySpecificKeyframe(end)->m_animatableValueCache = to;

[alancutter (OOO until 2018), 2015/01/19 02:52:30]

This code is identical to the code below. This should be refactored out as a
function like ensureAnimatableValueCaches(fromKeyframe, fromCSSValue,
toKeyframe, toCSSValue, element, property) with a FIXME to remove it.

[jadeg, 2015/01/22 22:14:23]

Done.

+            }
+            return DoubleStyleInterpolation::create(*fromCSSValue, *toCSSValue, property, clamp);
+        }
+        break;
+
     case CSSPropertyMotionRotation: {
         RefPtrWillBeRawPtr<Interpolation> interpolation = DoubleStyleInterpolation::maybeCreateFromMotionRotation(*fromCSSValue, *toCSSValue, property);
         if (interpolation)
             return interpolation.release();
         break;
     }
     case CSSPropertyVisibility:
         if (VisibilityStyleInterpolation::canCreateFrom(*fromCSSValue) && VisibilityStyleInterpolation::canCreateFrom(*toCSSValue) && (VisibilityStyleInterpolation::isVisible(*fromCSSValue) || VisibilityStyleInterpolation::isVisible(*toCSSValue))) {
             return VisibilityStyleInterpolation::create(*fromCSSValue, *toCSSValue, property);
         }
@@ skipping 92 matching lines @@
 }
 
 void StringKeyframe::PropertySpecificKeyframe::trace(Visitor* visitor)
 {
     visitor->trace(m_value);
     visitor->trace(m_animatableValueCache);
     Keyframe::PropertySpecificKeyframe::trace(visitor);
 }
 
 }