Clamp animated numbers according to ComputedStyle data type

third_party/WebKit/Source/core/animation/NumberPropertyFunctions.cpp

 // Copyright 2015 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/NumberPropertyFunctions.h"
 
 #include "core/style/ComputedStyle.h"
 
 namespace blink {
@@ skipping 70 matching lines @@
     }
 
     default:
         return false;
     }
 }
 
 double NumberPropertyFunctions::clampNumber(CSSPropertyID property, double value)
 {
     switch (property) {
-    case CSSPropertyOrphans:
-    case CSSPropertyWebkitColumnCount:
-    case CSSPropertyWidows:
-        return clampTo<double>(round(value), 1);
-
     case CSSPropertyStrokeMiterlimit:
-        return clampTo<double>(value, 1);
+        return clampTo<float>(value, 1);
 
     case CSSPropertyFloodOpacity:
     case CSSPropertyStopOpacity:
     case CSSPropertyStrokeOpacity:
     case CSSPropertyShapeImageThreshold:
-        return clampTo<double>(value, 0, 1);
+        return clampTo<float>(value, 0, 1);
 
     case CSSPropertyFillOpacity:
     case CSSPropertyOpacity:
-        return clampTo<double>(value, 0, nextafterf(1, 0));
+        return clampTo<float>(value, 0, nextafterf(1, 0));
 
     case CSSPropertyFlexGrow:
     case CSSPropertyFlexShrink:
     case CSSPropertyFontSizeAdjust:
     case CSSPropertyLineHeight:
-        return clampTo<double>(value, 0);
+        return clampTo<float>(value, 0);
+
+    case CSSPropertyOrphans:
+    case CSSPropertyWidows:
+        return clampTo<short>(round(value), 1);
+
+    case CSSPropertyWebkitColumnCount:
+        return clampTo<unsigned short>(round(value), 1);
 
     case CSSPropertyWebkitColumnRuleWidth:
+        return clampTo<unsigned short>(round(value));
+
     case CSSPropertyZIndex:
-        return round(value);
+        return clampTo<int>(round(value));
 
     default:
         ASSERT_NOT_REACHED();
         return value;
     }
 }
 
 bool NumberPropertyFunctions::setNumber(CSSPropertyID property, ComputedStyle& style, double value)
 {
     ASSERT(value == clampNumber(property, value));
@@ skipping 39 matching lines @@
         return true;
     case CSSPropertyZIndex:
         style.setZIndex(value);
         return true;
     default:
         return false;
     }
 }
 
 } // namespace blink