Changeset 140213 in webkit

Timestamp:

Jan 18, 2013 3:22:26 PM (11 years ago)

Author:

eae@chromium.org

Message:

Change RenderStyle::getRoundedInnerBorderFor to take ints for border widths
​https://bugs.webkit.org/show_bug.cgi?id=107331

Reviewed by Levi Weintraub.

Borders are always represented as ints yet RenderStyle::
getRoundedInnerBorderFor upcasts from int to LayoutUnit when
calling getRoundedInnerBorderFor.

No new tests, no change in functionality.

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::getRoundedInnerBorderFor):

• rendering/style/RenderStyle.h:

Change getRoundedInnerBorderFor to use ints for border widths.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/style/RenderStyle.cpp (modified) (2 diffs)
• rendering/style/RenderStyle.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-18  Emil A Eklund  <eae@chromium.org>
+
+        Change RenderStyle::getRoundedInnerBorderFor to take ints for border widths
+        https://bugs.webkit.org/show_bug.cgi?id=107331
+
+        Reviewed by Levi Weintraub.
+        
+        Borders are always represented as ints yet RenderStyle::
+        getRoundedInnerBorderFor upcasts from int to LayoutUnit when
+        calling getRoundedInnerBorderFor.
+
+        No new tests, no change in functionality.
+
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::getRoundedInnerBorderFor):
+        * rendering/style/RenderStyle.h:
+        Change getRoundedInnerBorderFor to use ints for border widths.
+
 2013-01-18  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/rendering/style/RenderStyle.cpp

@@ -1002 +1002 @@
     bool horizontal = isHorizontalWritingMode();
 
-    LayoutUnit leftWidth = (!horizontal || includeLogicalLeftEdge) ? borderLeftWidth() : 0;
-    LayoutUnit rightWidth = (!horizontal || includeLogicalRightEdge) ? borderRightWidth() : 0;
-    LayoutUnit topWidth = (horizontal || includeLogicalLeftEdge) ? borderTopWidth() : 0;
-    LayoutUnit bottomWidth = (horizontal || includeLogicalRightEdge) ? borderBottomWidth() : 0;
+    int leftWidth = (!horizontal || includeLogicalLeftEdge) ? borderLeftWidth() : 0;
+    int rightWidth = (!horizontal || includeLogicalRightEdge) ? borderRightWidth() : 0;
+    int topWidth = (horizontal || includeLogicalLeftEdge) ? borderTopWidth() : 0;
+    int bottomWidth = (horizontal || includeLogicalRightEdge) ? borderBottomWidth() : 0;
 
     return getRoundedInnerBorderFor(borderRect, topWidth, bottomWidth, leftWidth, rightWidth, includeLogicalLeftEdge, includeLogicalRightEdge);
@@ -1011 +1011 @@
 
 RoundedRect RenderStyle::getRoundedInnerBorderFor(const LayoutRect& borderRect,
-    LayoutUnit topWidth, LayoutUnit bottomWidth, LayoutUnit leftWidth, LayoutUnit rightWidth, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
+    int topWidth, int bottomWidth, int leftWidth, int rightWidth, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
 {
     LayoutRect innerRect(borderRect.x() + leftWidth, 

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -1046 +1046 @@
 
     RoundedRect getRoundedInnerBorderFor(const LayoutRect& borderRect,
-        LayoutUnit topWidth, LayoutUnit bottomWidth, LayoutUnit leftWidth, LayoutUnit rightWidth, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const;
+        int topWidth, int bottomWidth, int leftWidth, int rightWidth, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const;
 
     void setBorderLeftWidth(unsigned v) { SET_VAR(surround, border.m_left.m_width, v); }