Make AnimatedStyleBuilder value rounding consistent with StyleBuilder

Source/core/css/resolver/AnimatedStyleBuilder.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 34 matching lines @@
 #include "core/animation/animatable/AnimatableLengthSize.h"
 #include "core/animation/animatable/AnimatableRepeatable.h"
 #include "core/animation/animatable/AnimatableSVGPaint.h"
 #include "core/animation/animatable/AnimatableShadow.h"
 #include "core/animation/animatable/AnimatableShapeValue.h"
 #include "core/animation/animatable/AnimatableStrokeDasharrayList.h"
 #include "core/animation/animatable/AnimatableTransform.h"
 #include "core/animation/animatable/AnimatableUnknown.h"
 #include "core/animation/animatable/AnimatableValue.h"
 #include "core/animation/animatable/AnimatableVisibility.h"
+#include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSPropertyMetadata.h"
 #include "core/css/resolver/StyleBuilder.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "core/style/ComputedStyle.h"
 #include "wtf/MathExtras.h"
 #include "wtf/TypeTraits.h"
 
 namespace blink {
 
@@ skipping 20 matching lines @@
 BorderImageLength animatableValueToBorderImageLength(const AnimatableValue* value, const StyleResolverState& state)
 {
     if (value->isLength())
         return BorderImageLength(toAnimatableLength(value)->length(state.style()->effectiveZoom(), ValueRangeNonNegative));
     if (value->isDouble())
         return BorderImageLength(clampTo<double>(toAnimatableDouble(value)->toDouble(), 0));
     ASSERT(toAnimatableUnknown(value)->toCSSValueID() == CSSValueAuto);
     return Length(Auto);
 }
 
-template<typename T> T animatableValueRoundClampTo(const AnimatableValue* value, T min = defaultMinimumForClamp<T>(), T max = defaultMaximumForClamp<T>())
+template<typename T> T animatableValueClampTo(const AnimatableValue* value, T min = defaultMinimumForClamp<T>(), T max = defaultMaximumForClamp<T>())
 {
     static_assert(WTF::IsInteger<T>::value, "should use integral type T when rounding values");
-    return clampTo<T>(round(toAnimatableDouble(value)->toDouble()), min, max);
+    return clampTo<T>(roundForImpreciseConversion<T>(toAnimatableDouble(value)->toDouble()), min, max);
 }
 
 LengthBox animatableValueToLengthBox(const AnimatableValue* value, const StyleResolverState& state, ValueRange range = ValueRangeAll)
 {
     const AnimatableLengthBox* animatableLengthBox = toAnimatableLengthBox(value);
     return LengthBox(
         animatableValueToLength(animatableLengthBox->top(), state, range),
         animatableValueToLength(animatableLengthBox->right(), state, range),
         animatableValueToLength(animatableLengthBox->bottom(), state, range),
         animatableValueToLength(animatableLengthBox->left(), state, range));
@@ skipping 198 matching lines @@
         style->setBorderBottomColor(toAnimatableColor(value)->color());
         style->setVisitedLinkBorderBottomColor(toAnimatableColor(value)->visitedLinkColor());
         return;
     case CSSPropertyBorderBottomLeftRadius:
         style->setBorderBottomLeftRadius(animatableValueToLengthSize(value, state, ValueRangeNonNegative));
         return;
     case CSSPropertyBorderBottomRightRadius:
         style->setBorderBottomRightRadius(animatableValueToLengthSize(value, state, ValueRangeNonNegative));
         return;
     case CSSPropertyBorderBottomWidth:
-        style->setBorderBottomWidth(animatableValueRoundClampTo<unsigned>(value));
+        style->setBorderBottomWidth(animatableValueClampTo<unsigned>(value));
         return;
     case CSSPropertyBorderImageOutset:
         style->setBorderImageOutset(animatableValueToBorderImageLengthBox(value, state));
         return;
     case CSSPropertyBorderImageSlice:
         style->setBorderImageSlices(animatableValueToLengthBox(toAnimatableLengthBoxAndBool(value)->box(), state, ValueRangeNonNegative));
         style->setBorderImageSlicesFill(toAnimatableLengthBoxAndBool(value)->flag());
         return;
     case CSSPropertyBorderImageSource:
         style->setBorderImageSource(state.styleImage(property, toAnimatableImage(value)->toCSSValue()));
         return;
     case CSSPropertyBorderImageWidth:
         style->setBorderImageWidth(animatableValueToBorderImageLengthBox(value, state));
         return;
     case CSSPropertyBorderLeftColor:
         style->setBorderLeftColor(toAnimatableColor(value)->color());
         style->setVisitedLinkBorderLeftColor(toAnimatableColor(value)->visitedLinkColor());
         return;
     case CSSPropertyBorderLeftWidth:
-        style->setBorderLeftWidth(animatableValueRoundClampTo<unsigned>(value));
+        style->setBorderLeftWidth(animatableValueClampTo<unsigned>(value));
         return;
     case CSSPropertyBorderRightColor:
         style->setBorderRightColor(toAnimatableColor(value)->color());
         style->setVisitedLinkBorderRightColor(toAnimatableColor(value)->visitedLinkColor());
         return;
     case CSSPropertyBorderRightWidth:
-        style->setBorderRightWidth(animatableValueRoundClampTo<unsigned>(value));
+        style->setBorderRightWidth(animatableValueClampTo<unsigned>(value));
         return;
     case CSSPropertyBorderTopColor:
         style->setBorderTopColor(toAnimatableColor(value)->color());
         style->setVisitedLinkBorderTopColor(toAnimatableColor(value)->visitedLinkColor());
         return;
     case CSSPropertyBorderTopLeftRadius:
         style->setBorderTopLeftRadius(animatableValueToLengthSize(value, state, ValueRangeNonNegative));
         return;
     case CSSPropertyBorderTopRightRadius:
         style->setBorderTopRightRadius(animatableValueToLengthSize(value, state, ValueRangeNonNegative));
         return;
     case CSSPropertyBorderTopWidth:
-        style->setBorderTopWidth(animatableValueRoundClampTo<unsigned>(value));
+        style->setBorderTopWidth(animatableValueClampTo<unsigned>(value));
         return;
     case CSSPropertyBottom:
         style->setBottom(animatableValueToLength(value, state));
         return;
     case CSSPropertyBoxShadow:
         style->setBoxShadow(toAnimatableShadow(value)->shadowList());
         return;
     case CSSPropertyClip:
         style->setClip(animatableValueToLengthBox(value, state));
         return;
@@ skipping 84 matching lines @@
         style->setMinWidth(animatableValueToLength(value, state, ValueRangeNonNegative));
         return;
     case CSSPropertyObjectPosition:
         style->setObjectPosition(animatableValueToLengthPoint(value, state));
         return;
     case CSSPropertyOpacity:
         // Avoiding a value of 1 forces a layer to be created.
         style->setOpacity(clampTo<float>(toAnimatableDouble(value)->toDouble(), 0, nextafterf(1, 0)));
         return;
     case CSSPropertyOrphans:
-        style->setOrphans(animatableValueRoundClampTo<unsigned short>(value, 1));
+        style->setOrphans(clampTo<unsigned short>(round(toAnimatableDouble(value)->toDouble()), 1));
         return;
     case CSSPropertyOutlineColor:
         style->setOutlineColor(toAnimatableColor(value)->color());
         style->setVisitedLinkOutlineColor(toAnimatableColor(value)->visitedLinkColor());
         return;
     case CSSPropertyOutlineOffset:
-        style->setOutlineOffset(animatableValueRoundClampTo<int>(value));
+        style->setOutlineOffset(animatableValueClampTo<int>(value));
         return;
     case CSSPropertyOutlineWidth:
-        style->setOutlineWidth(animatableValueRoundClampTo<unsigned short>(value));
+        style->setOutlineWidth(animatableValueClampTo<unsigned short>(value));
         return;
     case CSSPropertyPaddingBottom:
         style->setPaddingBottom(animatableValueToLength(value, state, ValueRangeNonNegative));
         return;
     case CSSPropertyPaddingLeft:
         style->setPaddingLeft(animatableValueToLength(value, state, ValueRangeNonNegative));
         return;
     case CSSPropertyPaddingRight:
         style->setPaddingRight(animatableValueToLength(value, state, ValueRangeNonNegative));
         return;
@@ skipping 38 matching lines @@
     case CSSPropertyTextIndent:
         style->setTextIndent(animatableValueToLength(value, state));
         return;
     case CSSPropertyTextShadow:
         style->setTextShadow(toAnimatableShadow(value)->shadowList());
         return;
     case CSSPropertyTop:
         style->setTop(animatableValueToLength(value, state));
         return;
     case CSSPropertyWebkitBorderHorizontalSpacing:
-        style->setHorizontalBorderSpacing(animatableValueRoundClampTo<unsigned short>(value));
+        style->setHorizontalBorderSpacing(animatableValueClampTo<unsigned short>(value));
         return;
     case CSSPropertyWebkitBorderVerticalSpacing:
-        style->setVerticalBorderSpacing(animatableValueRoundClampTo<unsigned short>(value));
+        style->setVerticalBorderSpacing(animatableValueClampTo<unsigned short>(value));
         return;
     case CSSPropertyWebkitClipPath:
         style->setClipPath(toAnimatableClipPathOperation(value)->clipPathOperation());
         return;
     case CSSPropertyWebkitColumnCount:
-        style->setColumnCount(animatableValueRoundClampTo<unsigned short>(value, 1));
+        style->setColumnCount(clampTo<unsigned short>(toAnimatableDouble(value)->toDouble(), 1));
         return;
     case CSSPropertyWebkitColumnGap:
         style->setColumnGap(clampTo(toAnimatableDouble(value)->toDouble(), 0));
         return;
     case CSSPropertyWebkitColumnRuleColor:
         style->setColumnRuleColor(toAnimatableColor(value)->color());
         style->setVisitedLinkColumnRuleColor(toAnimatableColor(value)->visitedLinkColor());
         return;
     case CSSPropertyWebkitColumnWidth:
         style->setColumnWidth(clampTo(toAnimatableDouble(value)->toDouble(), std::numeric_limits<float>::epsilon()));
         return;
     case CSSPropertyWebkitColumnRuleWidth:
-        style->setColumnRuleWidth(animatableValueRoundClampTo<unsigned short>(value));
+        style->setColumnRuleWidth(clampTo<unsigned short>(toAnimatableDouble(value)->toDouble()));
         return;
     case CSSPropertyWebkitFilter:
         style->setFilter(toAnimatableFilterOperations(value)->operations());
         return;
     case CSSPropertyWebkitMaskBoxImageOutset:
         style->setMaskBoxImageOutset(animatableValueToBorderImageLengthBox(value, state));
         return;
     case CSSPropertyWebkitMaskBoxImageSlice:
         style->setMaskBoxImageSlices(animatableValueToLengthBox(toAnimatableLengthBoxAndBool(value)->box(), state, ValueRangeNonNegative));
         style->setMaskBoxImageSlicesFill(toAnimatableLengthBoxAndBool(value)->flag());
@@ skipping 72 matching lines @@
     case CSSPropertyWebkitTransformOriginX:
         style->setTransformOriginX(animatableValueToLength(value, state));
         return;
     case CSSPropertyWebkitTransformOriginY:
         style->setTransformOriginY(animatableValueToLength(value, state));
         return;
     case CSSPropertyWebkitTransformOriginZ:
         style->setTransformOriginZ(toAnimatableDouble(value)->toDouble());
         return;
     case CSSPropertyWidows:
-        style->setWidows(animatableValueRoundClampTo<unsigned short>(value, 1));
+        style->setWidows(clampTo<unsigned short>(round(toAnimatableDouble(value)->toDouble()), 1));
         return;
     case CSSPropertyWidth:
         style->setWidth(animatableValueToLength(value, state, ValueRangeNonNegative));
         return;
     case CSSPropertyWordSpacing:
         style->setWordSpacing(clampTo<float>(toAnimatableDouble(value)->toDouble()));
         return;
     case CSSPropertyVerticalAlign:
         style->setVerticalAlignLength(animatableValueToLength(value, state));
         return;
     case CSSPropertyVisibility:
         style->setVisibility(toAnimatableVisibility(value)->visibility());
         return;
     case CSSPropertyZIndex:
-        style->setZIndex(animatableValueRoundClampTo<int>(value));
+        style->setZIndex(clampTo<int>(round(toAnimatableDouble(value)->toDouble())));
         return;
     case CSSPropertyCx:
         style->setCx(animatableValueToLength(value, state));
         return;
     case CSSPropertyCy:
         style->setCy(animatableValueToLength(value, state));
         return;
     case CSSPropertyX:
         style->setX(animatableValueToLength(value, state));
         return;
     case CSSPropertyY:
         style->setY(animatableValueToLength(value, state));
         return;
     case CSSPropertyR:
         style->setR(animatableValueToLength(value, state, ValueRangeNonNegative));
         return;
     case CSSPropertyRx:
         style->setRx(animatableValueToLength(value, state, ValueRangeNonNegative));
         return;
     case CSSPropertyRy:
         style->setRy(animatableValueToLength(value, state, ValueRangeNonNegative));
         return;
 
     default:
         ASSERT_NOT_REACHED();
     }
 }
 
 } // namespace blink