Implement animations for Independent CSS Transform Properties

Source/core/animation/DoubleStyleInterpolation.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/DoubleStyleInterpolation.h"
 
 #include "core/css/CSSCalculationValue.h"
 #include "core/css/resolver/StyleBuilder.h"
 
 namespace blink {
 
 bool DoubleStyleInterpolation::canCreateFrom(const CSSValue& value)
 {
     return value.isPrimitiveValue() && (toCSSPrimitiveValue(value).isNumber() || toCSSPrimitiveValue(value).isAngle());
 }
 
 PassOwnPtrWillBeRawPtr<InterpolableValue> DoubleStyleInterpolation::doubleToInterpolableValue(const CSSValue& value)
 {
     ASSERT(canCreateFrom(value));
     const CSSPrimitiveValue& primitive = toCSSPrimitiveValue(value);
     if (primitive.isNumber())
         return InterpolableNumber::create(primitive.getDoubleValue());
     if (primitive.isAngle())
         return InterpolableNumber::create(primitive.computeDegrees());
     ASSERT_NOT_REACHED();
     return nullptr;
 }
 
+static double clampToRange(double value, InterpolationRange clamp)
+{
+    switch (clamp) {
+    case RangeAll:
+        // Do nothing
+        return value;
+    case RangeZeroToOne:
+        return clampTo<float>(value, 0, 1);
+    case RangeOpacityFIXME:
+        return clampTo<float>(value, 0, nextafterf(1, 0));
+    case RangeFloor:
+        return floor(value);
+    case RangeRound:
+        return round(value);
+    case RangeRoundGreaterThanOrEqualToOne:
+        return clampTo<float>(round(value), 1);
+    case RangeGreaterThanOrEqualToOne:
+        return clampTo<float>(value, 1);
+    case RangeNonNegative:
+        return clampTo<float>(value, 0);
+    default:
+        ASSERT_NOT_REACHED();

[alancutter (OOO until 2018), 2015/06/25 01:33:09]

You still need a return value here.

+    }
+}
+
 PassRefPtrWillBeRawPtr<CSSValue> DoubleStyleInterpolation::interpolableValueToDouble(InterpolableValue* value, bool isNumber, InterpolationRange clamp)
 {
     ASSERT(value->isNumber());
-    double doubleValue = toInterpolableNumber(value)->value();
+    double doubleValue = clampToRange(toInterpolableNumber(value)->value(), clamp);
 
-    switch (clamp) {
-    case RangeAll:
-        // Do nothing
-        break;
-    case RangeZeroToOne:
-        doubleValue = clampTo<float>(doubleValue, 0, 1);
-        break;
-    case RangeOpacityFIXME:
-        doubleValue = clampTo<float>(doubleValue, 0, nextafterf(1, 0));
-        break;
-    case RangeFloor:
-        doubleValue = floor(doubleValue);
-        break;
-    case RangeRound:
-        doubleValue = round(doubleValue);
-        break;
-    case RangeRoundGreaterThanOrEqualToOne:
-        doubleValue = clampTo<float>(round(doubleValue), 1);
-        break;
-    case RangeGreaterThanOrEqualToOne:
-        doubleValue = clampTo<float>(doubleValue, 1);
-        break;
-    case RangeNonNegative:
-        doubleValue = clampTo<float>(doubleValue, 0);
-        break;
-    default:
-        ASSERT_NOT_REACHED();
-    }
     if (isNumber)
         return CSSPrimitiveValue::create(doubleValue, CSSPrimitiveValue::CSS_NUMBER);
     return CSSPrimitiveValue::create(doubleValue, CSSPrimitiveValue::CSS_DEG);
 }
 
 void DoubleStyleInterpolation::apply(StyleResolverState& state) const
 {
     if (m_id != CSSPropertyMotionRotation) {
         StyleBuilder::applyProperty(m_id, state, interpolableValueToDouble(m_cachedValue.get(), m_isNumber, m_clamp).get());
         return;
     }
 
     StyleBuilder::applyProperty(m_id, state, interpolableValueToMotionRotation(m_cachedValue.get(), m_flag).get());
 }
 
 DEFINE_TRACE(DoubleStyleInterpolation)
 {
     StyleInterpolation::trace(visitor);
 }
 
+PassOwnPtrWillBeRawPtr<InterpolableValue> DoubleStyleInterpolation::toInterpolableValue(const CSSValue& value, CSSPropertyID property)
+{
+    ASSERT(canCreateFrom(value));
+    return doubleToInterpolableValue(value);
+}
+
+PassRefPtrWillBeRawPtr<CSSPrimitiveValue> DoubleStyleInterpolation::fromInterpolableValue(const InterpolableValue& value, InterpolationRange range)
+{
+    double doubleValue = clampToRange(toInterpolableNumber(value).value(), range);
+    return CSSPrimitiveValue::create(doubleValue, CSSPrimitiveValue::CSS_NUMBER);

[alancutter (OOO until 2018), 2015/06/25 01:33:09]

This can just call interpolableValueToDouble().

+}
+
 namespace {
 
 bool extractMotionRotation(const CSSValue& value, float* rotation, MotionRotationType* rotationType)
 {
     *rotation = 0;
     *rotationType = MotionRotationFixed;
 
     if (!value.isValueList())
         return false;
     const CSSValueList& list = toCSSValueList(value);
@@ skipping 49 matching lines @@
         || startRotationType != endRotationType)
         return nullptr;
 
     return adoptRefWillBeNoop(new DoubleStyleInterpolation(
         motionRotationToInterpolableValue(start),
         motionRotationToInterpolableValue(end),
         id, true, InterpolationRange::RangeAll, startRotationType == MotionRotationAuto));
 }
 
 }