Changeset 157238 in webkit

Timestamp:

Oct 10, 2013 12:22:57 PM (11 years ago)

Author:

hmuller@adobe.com

Message:

[CSS Shapes] clampToUnsigned() should return unsigned, not int
​https://bugs.webkit.org/show_bug.cgi?id=122601

Source/WebCore:

Reviewed by Andreas Kling.

Corrected the return type for clampToUnsigned() in MathExtras.h. It's now unsigned.
No new tests since this is just an internal refactoring of existing code.

• rendering/shapes/RasterShape.cpp:

(WebCore::RasterShape::marginIntervals): Use the redefined clampToUnsigned method.

Source/WTF:

Corrected the return type for clampToUnsigned() in MathExtras.h. It's now unsigned.

Reviewed by Andreas Kling.

• wtf/MathExtras.h:

(clampToUnsigned):

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/MathExtras.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/shapes/RasterShape.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-10-10  Hans Muller  <hmuller@adobe.com>
+
+        [CSS Shapes] clampToUnsigned() should return unsigned, not int
+        https://bugs.webkit.org/show_bug.cgi?id=122601
+
+        Corrected the return type for clampToUnsigned() in MathExtras.h. It's now unsigned.
+
+        Reviewed by Andreas Kling.
+
+        * wtf/MathExtras.h:
+        (clampToUnsigned):
+
 2013-10-08  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/WTF/wtf/MathExtras.h

@@ -297 +297 @@
 }
 
-inline int clampToUnsigned(double value)
+inline unsigned clampToUnsigned(double value)
 {
     return clampTo<unsigned>(value);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-10  Hans Muller  <hmuller@adobe.com>
+
+        [CSS Shapes] clampToUnsigned() should return unsigned, not int
+        https://bugs.webkit.org/show_bug.cgi?id=122601
+
+        Reviewed by Andreas Kling.
+
+        Corrected the return type for clampToUnsigned() in MathExtras.h. It's now unsigned.
+        No new tests since this is just an internal refactoring of existing code.
+
+        * rendering/shapes/RasterShape.cpp:
+        (WebCore::RasterShape::marginIntervals): Use the redefined clampToUnsigned method.
+
 2013-10-10  Bem Jones-Bey  <bjonesbe@adobe.com>
 

trunk/Source/WebCore/rendering/shapes/RasterShape.cpp

@@ -245 +245 @@
         return *m_intervals;
 
-    unsigned marginBoundaryRadius = std::min(clampToUnsigned(ceil(shapeMargin())), std::max(m_imageSize.width(), m_imageSize.height()));
+    unsigned marginBoundaryRadius = std::min(clampToUnsigned(ceil(shapeMargin())), std::max<unsigned>(m_imageSize.width(), m_imageSize.height()));
     if (!m_marginIntervals)
         m_marginIntervals = m_intervals->computeShapeMarginIntervals(marginBoundaryRadius);