Changeset 87103 in webkit for trunk/Source/JavaScriptCore/wtf/MathExtras.h

Timestamp:

May 23, 2011, 3:33:39 PM (14 years ago)

Author:

[email protected]

Message:

2011-05-23 Matthew Delaney <​[email protected]>

Reviewed by Simon Fraser.

Remove safeFloatToInt() in FloatRect.cpp and replace with working version of clampToInteger()
​https://bugs.webkit.org/show_bug.cgi?id=58216

• wtf/MathExtras.h: (clampToInteger): (clampToPositiveInteger):

2011-05-23 Matthew Delaney <​[email protected]>

Reviewed by Simon Fraser.

Remove safeFloatToInt() in FloatRect.cpp and replace with working version of clampToInteger()
​https://bugs.webkit.org/show_bug.cgi?id=58216

No new tests. The SVG tests mask-excessive-malloc.svg and pattern-excessive-malloc.svg exercise this code path.

• platform/graphics/FloatRect.cpp: (WebCore::enclosingIntRect):

File:

• trunk/Source/JavaScriptCore/wtf/MathExtras.h (modified) (1 diff)

trunk/Source/JavaScriptCore/wtf/MathExtras.h

@@ -221 +221 @@
 }
 
-inline int clampToInteger(float d)
-{
-    const float minIntAsFloat = static_cast<float>(std::numeric_limits<int>::min());
-    const float maxIntAsFloat = static_cast<float>(std::numeric_limits<int>::max());
-    return static_cast<int>(std::max(std::min(d, maxIntAsFloat), minIntAsFloat));
-}
-
-inline int clampToPositiveInteger(float d)
-{
-    const float maxIntAsFloat = static_cast<float>(std::numeric_limits<int>::max());
-    return static_cast<int>(std::max<float>(std::min(d, maxIntAsFloat), 0));
+inline int clampToInteger(float x)
+{
+    static const int s_intMax = std::numeric_limits<int>::max();
+    static const int s_intMin = std::numeric_limits<int>::min();
+    
+    if (x >= static_cast<float>(s_intMax))
+        return s_intMax;
+    if (x < static_cast<float>(s_intMin))
+        return s_intMin;
+    return static_cast<int>(x);
+}
+
+inline int clampToPositiveInteger(float x)
+{
+    static const int s_intMax = std::numeric_limits<int>::max();
+    
+    if (x >= static_cast<float>(s_intMax))
+        return s_intMax;
+    if (x < 0)
+        return 0;
+    return static_cast<int>(x);
 }