Changeset 86449 in webkit

Timestamp:

May 13, 2011 11:21:12 AM (13 years ago)

Author:

leviw@chromium.org

Message:

2011-05-13 Levi Weintraub <​leviw@chromium.org>

Reviewed by Eric Seidel.

Switch paintCollapsedBorder to use IntRect
​https://bugs.webkit.org/show_bug.cgi?id=60739

Updating the last offending paint function that takes four ints
instead of an IntRect.

No new tests as this is simple refactoring.

• rendering/RenderTableCell.cpp: (WebCore::RenderTableCell::paint): (WebCore::RenderTableCell::paintCollapsedBorder):
• rendering/RenderTableCell.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderTableCell.cpp (modified) (4 diffs)
• rendering/RenderTableCell.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-13  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Switch paintCollapsedBorder to use IntRect
+        https://bugs.webkit.org/show_bug.cgi?id=60739
+
+        Updating the last offending paint function that takes four ints
+        instead of an IntRect.
+
+        No new tests as this is simple refactoring.
+
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::paint):
+        (WebCore::RenderTableCell::paintCollapsedBorder):
+        * rendering/RenderTableCell.h:
+
 2011-05-13  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/rendering/RenderTableCell.cpp

@@ -813 +813 @@
         if (ty - table()->outerBorderTop() < paintInfo.rect.maxY() + os
             && ty + height() + table()->outerBorderBottom() > paintInfo.rect.y() - os)
-            paintCollapsedBorder(paintInfo.context, tx, ty, width(), height());
+            paintCollapsedBorder(paintInfo.context, IntRect(tx, ty, width(), height()));
         return;
     } 
@@ -913 +913 @@
 }
 
-void RenderTableCell::paintCollapsedBorder(GraphicsContext* graphicsContext, int tx, int ty, int w, int h)
+void RenderTableCell::paintCollapsedBorder(GraphicsContext* graphicsContext, const IntRect& paintRect)
 {
     if (!table()->currentBorderStyle())
@@ -929 +929 @@
     int rightWidth = rightVal.width();
     
-    tx -= leftWidth / 2;
-    ty -= topWidth / 2;
-    w += leftWidth / 2 + (rightWidth + 1) / 2;
-    h += topWidth / 2 + (bottomWidth + 1) / 2;
+    int x = paintRect.x() - leftWidth / 2;
+    int y = paintRect.y() - topWidth / 2;
+    int w = paintRect.width() + leftWidth / 2 + (rightWidth + 1) / 2;
+    int h = paintRect.height() + topWidth / 2 + (bottomWidth + 1) / 2;
     
     EBorderStyle topStyle = collapsedBorderStyle(topVal.style());
@@ -947 +947 @@
     // precedence paint on top of borders with lower precedence.  
     CollapsedBorders borders;
-    borders.addBorder(topVal, BSTop, renderTop, tx, ty, tx + w, ty + topWidth, topStyle);
-    borders.addBorder(bottomVal, BSBottom, renderBottom, tx, ty + h - bottomWidth, tx + w, ty + h, bottomStyle);
-    borders.addBorder(leftVal, BSLeft, renderLeft, tx, ty, tx + leftWidth, ty + h, leftStyle);
-    borders.addBorder(rightVal, BSRight, renderRight, tx + w - rightWidth, ty, tx + w, ty + h, rightStyle);
+    borders.addBorder(topVal, BSTop, renderTop, x, y, x + w, y + topWidth, topStyle);
+    borders.addBorder(bottomVal, BSBottom, renderBottom, x, y + h - bottomWidth, x + w, y + h, bottomStyle);
+    borders.addBorder(leftVal, BSLeft, renderLeft, x, y, x + leftWidth, y + h, leftStyle);
+    borders.addBorder(rightVal, BSRight, renderRight, x + w - rightWidth, y, x + w, y + h, rightStyle);
     
     for (CollapsedBorder* border = borders.nextBorder(); border; border = borders.nextBorder()) {

trunk/Source/WebCore/rendering/RenderTableCell.h

@@ -150 +150 @@
     virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false);
 
-    void paintCollapsedBorder(GraphicsContext*, int x, int y, int w, int h);
+    void paintCollapsedBorder(GraphicsContext*, const IntRect&);
 
     int m_row;