Animation: Implement DoubleStyleInterpolation in StringKeyframe

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"
 
@@ skipping 14 matching lines @@
     if (primitive.isAngle())
         return InterpolableNumber::create(primitive.computeDegrees());
     ASSERT_NOT_REACHED();
     return nullptr;
 }
 
 PassRefPtrWillBeRawPtr<CSSValue> DoubleStyleInterpolation::interpolableValueToDouble(InterpolableValue* value, bool isNumber, InterpolationRange clamp)
 {
     ASSERT(value->isNumber());
     double doubleValue = toInterpolableNumber(value)->value();
-
     switch (clamp) {
-    case RangeOpacityFIXME:
-        doubleValue = clampTo<float>(doubleValue, 0, nextafterf(1, 0));
+    case RangeAll:
+        // Do nothing
+        break;
+    case RangeFractions:

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

Why did this one get renamed from RangeOpacityFIXME?

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

RangeZeroToLessThanOne for clarity.
BTW, you should add RangeZeroToOne for shape-image-threshold since it doesn't
require opacity's hacky hacks.

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

I renamed it because Eve named it this in her Interpolation change anticipating
that I would come and rename it according to its properties, as the Ranges are
supposed to be non property specific.

Renamed to RangeZeroToLessThanOne.

Also done with ShapeImageThreshold

+        doubleValue = clampTo<float>(doubleValue, 0, nextafter(1, 0));
+        break;
+    case RangeFloor:
+        doubleValue = floor(doubleValue);
+        break;
+    case RangeGreaterThanZero:

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

RangePositive?

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

Done.

+        doubleValue = clampTo<double>(doubleValue, nextafterf(0, 1));
+        break;
+    case RangeRound:

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

RangeRoundPositive for clarity.

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

Done.

+        doubleValue = clampTo<int>((doubleValue + 0.5), 1);

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

Just use round?

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

Done.

+        break;
+    case RangeGreaterThanOne:

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

Isn't this RangeGreaterThanOrEqualToOne?

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

Done.

+        doubleValue = clampTo<float>(doubleValue, 1);
         break;

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

RangeAtLeastOne for correctness.

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

Done.

     case RangeNonNegative:
         doubleValue = clampTo<float>(doubleValue, 0);
         break;
-    case RangeAll:
+    case RangeAbsoluteValueFloor:

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

RangeRound.

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

Done.

+        if (doubleValue < 0)

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

Doesn't this use round() in AnimatedStyleBuidler.cpp?

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

Done.

+            doubleValue = clampTo<int>(doubleValue - 0.5);
+        if (doubleValue > 0)
+            doubleValue = clampTo<int>(doubleValue + 0.5);

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

Does this still work without the clampTo<int>? (just rounding)

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

Just use round() instead of (doubleValue + 0.5) here and above.

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

Done.

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

Done.

         break;
-    default:
-        ASSERT_NOT_REACHED();

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

Leave this assert in.

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

Done.

     }
-
     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;
@@ skipping 69 matching lines @@
         || startRotationType != endRotationType)
         return nullptr;
 
     return adoptRefWillBeNoop(new DoubleStyleInterpolation(
         motionRotationToInterpolableValue(start),
         motionRotationToInterpolableValue(end),
         id, true, InterpolationRange::RangeAll, startRotationType == MotionRotationAuto));
 }
 
 }