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/ConstantStyleInterpolation.h"
 #include "core/animation/DefaultStyleInterpolation.h"
@@ skipping 79 matching lines @@
 
         if (fromCSSValue == toCSSValue)
             return ConstantStyleInterpolation::create(fromCSSValue, property);
 
         return nullptr;
     }
 
     // FIXME: Generate this giant switch statement.
     switch (property) {
     case CSSPropertyLineHeight:
-        if (LengthStyleInterpolation::canCreateFrom(*fromCSSValue) && LengthStyleInterpolation::canCreateFrom(*toCSSValue))
-            return LengthStyleInterpolation::create(*fromCSSValue, *toCSSValue, property, RangeNonNegative);
-
         if (DoubleStyleInterpolation::canCreateFrom(*fromCSSValue) && DoubleStyleInterpolation::canCreateFrom(*toCSSValue))
             return DoubleStyleInterpolation::create(*fromCSSValue, *toCSSValue, property, CSSPrimitiveValue::CSS_NUMBER, RangeNonNegative);
-
-        break;
+        // 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:

[alancutter (OOO until 2018), 2015/02/04 20:24:37]

Adding more LengthStyleInterpolation handling should be done in a separate
patch.

[jadeg, 2015/02/05 23:37:03]

Done.

     case CSSPropertyWidth:
         range = RangeNonNegative;
         // 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)
             fallBackToLegacy = true;
-
         // FIXME: Handle keywords e.g. 'smaller', 'larger'.
         if (property == CSSPropertyFontSize)
             fallBackToLegacy = true;
 
         // FIXME: Handle keywords e.g. 'normal'
         if (property == CSSPropertyLetterSpacing)
             fallBackToLegacy = true;
 
         // FIXME: Handle keywords e.g. 'thick'
         if (property == CSSPropertyOutlineWidth)
             fallBackToLegacy = true;
+        break;
+    case CSSPropertyWidows:
+    case CSSPropertyOrphans:
+        if (range == RangeAll)
+            range = RangeRound;
+        // Fall through
+    case CSSPropertyWebkitColumnCount:
+        if (range == RangeAll)

[dstockwell, 2015/02/04 11:09:28]

This fall through logic is a bit complicated, perhaps this should be extracted
into a separate function?

[jadeg, 2015/02/05 23:37:03]

Done.

+            range = RangeFloor;

[dstockwell, 2015/02/04 11:09:28]

AnimatedStyleBuilder rounds and then clamps greater than 1.

[jadeg, 2015/02/05 23:37:03]

Im confused if you mean that I should change the name of this or change the
clamping?

+        // Fall through
+    case CSSPropertyZIndex:
+        if (range == RangeAll)
+            range = RangeAbsoluteValueFloor;
+        // Fall through
+    case CSSPropertyShapeImageThreshold:

[alancutter (OOO until 2018), 2015/02/04 20:24:37]

This should clamp to [0, 1] instead of [0, 1).

[jadeg, 2015/02/05 23:37:03]

Done.

+    case CSSPropertyFillOpacity:
+    case CSSPropertyFloodOpacity:
+    case CSSPropertyOpacity:
+    case CSSPropertyStopOpacity:
+    case CSSPropertyStrokeOpacity:
+        if (range == RangeAll)
+            range = RangeFractions;

[dstockwell, 2015/02/04 11:09:28]

This seems different to AnimatedStyleBuidler. The clamping here seems to exclude
1?

[jadeg, 2015/02/05 23:37:03]

Yes now has been changed to RangeZeroToLessThanOne

+        // Fall through
+    case CSSPropertyStrokeMiterlimit:
+        if (range == RangeAll)
+            range = RangeGreaterThanOne;
+        // Fall through
+    case CSSPropertyZoom:
+        if (range == RangeAll)
+            range = RangeGreaterThanZero;
+        // Fall through
+    case CSSPropertyWebkitColumnRuleWidth:
+        if (DoubleStyleInterpolation::canCreateFrom(*fromCSSValue) && DoubleStyleInterpolation::canCreateFrom(*toCSSValue)) {
+            if (property == CSSPropertyOpacity) {
+                StringKeyframe::PropertySpecificKeyframe::ensureAnimatableValueCaches(property, end, element, fromCSSValue, toCSSValue);
+            }

[alancutter (OOO until 2018), 2015/02/04 20:24:37]

No need for braces around single line if body.

[jadeg, 2015/02/05 23:37:03]

Done.

+            return DoubleStyleInterpolation::create(*fromCSSValue, *toCSSValue, property, toCSSPrimitiveValue(fromCSSValue)->primitiveType(), range);
+        }
+        break;
+    case CSSPropertyFlexGrow:

[Eric Willigers, 2015/02/04 06:16:27]

Can we use  RangeNonNegative  for flex-grow and flex-shrink?

[jadeg, 2015/02/05 23:37:02]

Done.

+    case CSSPropertyFlexShrink:
+        fallBackToLegacy = true;
+        break;
 
-        break;
-    case CSSPropertyMotionRotation:
-        {
-            RefPtrWillBeRawPtr<Interpolation> interpolation = DoubleStyleInterpolation::maybeCreateFromMotionRotation(*fromCSSValue, *toCSSValue, property);
-            if (interpolation)
-                return interpolation.release();
-
+    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);
 
         break;
 
     case CSSPropertyBackgroundColor:
     case CSSPropertyBorderBottomColor:
@@ skipping 78 matching lines @@
     if (fromCSSValue->isUnsetValue() || fromCSSValue->isInheritedValue() || fromCSSValue->isInitialValue()
         || toCSSValue->isUnsetValue() || toCSSValue->isInheritedValue() || toCSSValue->isInitialValue())
         fallBackToLegacy = true;
 
     if (fallBackToLegacy) {
         if (DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(*fromCSSValue) || DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(*toCSSValue)) {
             // FIXME: Handle these cases outside of DeferredLegacyStyleInterpolation.
             return DeferredLegacyStyleInterpolation::create(fromCSSValue, toCSSValue, property);
         }
 
-        // FIXME: Remove the use of AnimatableValues, RenderStyles and Elements here.
-        // FIXME: Remove this cache
-        ASSERT(element);
-        if (!m_animatableValueCache)
-            m_animatableValueCache = StyleResolver::createAnimatableValueSnapshot(*element, property, *fromCSSValue);
+        StringKeyframe::PropertySpecificKeyframe::ensureAnimatableValueCaches(property, end, element, fromCSSValue, toCSSValue);
 
-        RefPtrWillBeRawPtr<AnimatableValue> to = StyleResolver::createAnimatableValueSnapshot(*element, property, *toCSSValue);
-        toStringPropertySpecificKeyframe(end).m_animatableValueCache = to;
-
-        return LegacyStyleInterpolation::create(m_animatableValueCache.get(), to.release(), property);
+        return LegacyStyleInterpolation::create(m_animatableValueCache.get(), toStringPropertySpecificKeyframe(end).m_animatableValueCache.release(), property);
     }
 
     ASSERT(AnimatableValue::usesDefaultInterpolation(
         StyleResolver::createAnimatableValueSnapshot(*element, property, *fromCSSValue).get(),
         StyleResolver::createAnimatableValueSnapshot(*element, property, *toCSSValue).get()));
 
-
     // FIXME: Remove this once TimingFunction partitioning is implemented for all types.
     if (!RuntimeEnabledFeatures::webAnimationsAPITimingFunctionPartitioningEnabled())
         return DefaultStyleInterpolation::create(fromCSSValue, toCSSValue, property);
 
     if (fromCSSValue == toCSSValue)
         return ConstantStyleInterpolation::create(fromCSSValue, property);
 
     return nullptr;
 
 }
 
+// FIXME: Remove the use of AnimatableValues, RenderStyles and Elements here.
+// FIXME: Remove this cache
+void StringKeyframe::PropertySpecificKeyframe::ensureAnimatableValueCaches(CSSPropertyID property, Keyframe::PropertySpecificKeyframe& end, Element* element, CSSValue* fromCSSValue, CSSValue* toCSSValue) const

[alancutter (OOO until 2018), 2015/02/04 20:24:37]

element, from and to should be references.

[jadeg, 2015/02/05 23:37:03]

Done.

+{
+    ASSERT(element);
+    if (!m_animatableValueCache)
+        m_animatableValueCache = StyleResolver::createAnimatableValueSnapshot(*element, property, *fromCSSValue);
+    RefPtrWillBeRawPtr<AnimatableValue> to = StyleResolver::createAnimatableValueSnapshot(*element, property, *toCSSValue);
+    toStringPropertySpecificKeyframe(end).m_animatableValueCache = to;
+}
+
+
 PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::PropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const
 {
     return adoptPtrWillBeNoop(new PropertySpecificKeyframe(offset, easing, 0, AnimationEffect::CompositeAdd));
 }
 
 PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::PropertySpecificKeyframe::cloneWithOffset(double offset) const
 {
     Keyframe::PropertySpecificKeyframe* theClone = new PropertySpecificKeyframe(offset, m_easing, m_value.get());
     toStringPropertySpecificKeyframe(theClone)->m_animatableValueCache = m_animatableValueCache;
     return adoptPtrWillBeNoop(theClone);
 }
 
 void StringKeyframe::PropertySpecificKeyframe::trace(Visitor* visitor)
 {
     visitor->trace(m_value);
     visitor->trace(m_animatableValueCache);
     Keyframe::PropertySpecificKeyframe::trace(visitor);
 }
 
 }