Changeset 18516 in webkit

Timestamp:

Jan 1, 2007 8:37:43 PM (17 years ago)

Author:

ddkilzer

Message:

LayoutTests:

Reviewed by Darin.

• repaint test for ​http://bugs.webkit.org/show_bug.cgi?id=11359 Incomplete repaint of table cell's collapsed border when changing only the cell

• fast/repaint/table-cell-collapsed-border-expected.checksum: Added.
• fast/repaint/table-cell-collapsed-border-expected.png: Added.
• fast/repaint/table-cell-collapsed-border-expected.txt: Added.
• fast/repaint/table-cell-collapsed-border.html: Added.

WebCore:

Reviewed by Darin.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=11359 Incomplete repaint of table cell's collapsed border when changing only the cell

Test: fast/repaint/table-cell-collapsed-border.html

• rendering/RenderTable.h: Added needsSectionRecalc() accessor.
• rendering/RenderTableCell.cpp: (WebCore::RenderTableCell::getAbsoluteRepaintRect): Overloaded to add the outer half of any collapsed borders. This function checks the cell's borders' widths but also the widths of the adjoining cells' borders, since they can contribute to the length of this cell's borders perpendicular to them, making such a border overflow the cell in both dimensions. (WebCore::RenderTableCell::borderLeft): Split the collapsing borders case off to borderHalfLeft(). (WebCore::RenderTableCell::borderRight): Ditto. (WebCore::RenderTableCell::borderTop): Ditto. (WebCore::RenderTableCell::borderBottom): Ditto. (WebCore::RenderTableCell::borderHalfLeft): Added. Takes an 'outer' boolean parameter. When true, this function returns the width of the part of the border that is outside the cell (different from the inner width when the total width is odd). (WebCore::RenderTableCell::borderHalfRight): Ditto. (WebCore::RenderTableCell::borderHalfTop): Ditto. (WebCore::RenderTableCell::borderHalfBottom): Ditto.
• rendering/RenderTableCell.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/repaint/table-cell-collapsed-border-expected.checksum (added)
• LayoutTests/fast/repaint/table-cell-collapsed-border-expected.png (added)
• LayoutTests/fast/repaint/table-cell-collapsed-border-expected.txt (added)
• LayoutTests/fast/repaint/table-cell-collapsed-border.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderTable.h (modified) (1 diff)
• WebCore/rendering/RenderTableCell.cpp (modified) (2 diffs)
• WebCore/rendering/RenderTableCell.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-01-01  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Darin.
+
+        - repaint test for http://bugs.webkit.org/show_bug.cgi?id=11359
+          Incomplete repaint of table cell's collapsed border when changing only the cell
+
+        * fast/repaint/table-cell-collapsed-border-expected.checksum: Added.
+        * fast/repaint/table-cell-collapsed-border-expected.png: Added.
+        * fast/repaint/table-cell-collapsed-border-expected.txt: Added.
+        * fast/repaint/table-cell-collapsed-border.html: Added.
+
 2007-01-01  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-01  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Darin.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=11359
+          Incomplete repaint of table cell's collapsed border when changing only the cell
+
+        Test: fast/repaint/table-cell-collapsed-border.html
+
+        * rendering/RenderTable.h:
+        Added needsSectionRecalc() accessor.
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::getAbsoluteRepaintRect): Overloaded to add the
+        outer half of any collapsed borders. This function checks the cell's borders'
+        widths but also the widths of the adjoining cells' borders, since they can
+        contribute to the length of this cell's borders perpendicular to them, making
+        such a border overflow the cell in both dimensions.
+        (WebCore::RenderTableCell::borderLeft): Split the collapsing borders case off to
+        borderHalfLeft().
+        (WebCore::RenderTableCell::borderRight): Ditto.
+        (WebCore::RenderTableCell::borderTop): Ditto.
+        (WebCore::RenderTableCell::borderBottom): Ditto.
+        (WebCore::RenderTableCell::borderHalfLeft): Added. Takes an 'outer' boolean
+        parameter. When true, this function returns the width of the part of the border
+        that is outside the cell (different from the inner width when the total width is odd).
+        (WebCore::RenderTableCell::borderHalfRight): Ditto.
+        (WebCore::RenderTableCell::borderHalfTop): Ditto.
+        (WebCore::RenderTableCell::borderHalfBottom): Ditto.
+        * rendering/RenderTableCell.h:
+
 2007-01-01  David Kilzer  <ddkilzer@webkit.org>
 

trunk/WebCore/rendering/RenderTable.h

@@ -160 +160 @@
     RenderTableCol* colElement(int col) const;
 
+    bool needsSectionRecalc() const { return needSectionRecalc; }
     void setNeedSectionRecalc() { needSectionRecalc = true; }
 

trunk/WebCore/rendering/RenderTableCell.cpp

@@ -136 +136 @@
 }
 
+IntRect RenderTableCell::getAbsoluteRepaintRect()
+{
+    // If the table grid is dirty, we cannot get reliable information about adjoining cells,
+    // so we ignore outside borders. This should not be a problem because it means that
+    // the table is going to recalculate the grid, relayout and repaint its current rect, which
+    // includes any outside borders of this cell.
+    if (table()->collapseBorders() && !table()->needsSectionRecalc()) {
+        bool rtl = table()->style()->direction() == RTL;
+        int outlineSize = style()->outlineSize();
+        int left = max(borderHalfLeft(true), outlineSize);
+        int right = max(borderHalfRight(true), outlineSize);
+        int top = max(borderHalfTop(true), outlineSize);
+        int bottom = max(borderHalfBottom(true), outlineSize);
+        if (left && !rtl || right && rtl) {
+            if (RenderTableCell* before = table()->cellBefore(this)) {
+                top = max(top, before->borderHalfTop(true));
+                bottom = max(bottom, before->borderHalfBottom(true));
+            }
+        }
+        if (left && rtl || right && !rtl) {
+            if (RenderTableCell* after = table()->cellAfter(this)) {
+                top = max(top, after->borderHalfTop(true));
+                bottom = max(bottom, after->borderHalfBottom(true));
+            }
+        }
+        if (top) {
+            if (RenderTableCell* above = table()->cellAbove(this)) {
+                left = max(left, above->borderHalfLeft(true));
+                right = max(right, above->borderHalfRight(true));
+            }
+        }
+        if (bottom) {
+            if (RenderTableCell* below = table()->cellBelow(this)) {
+                left = max(left, below->borderHalfLeft(true));
+                right = max(right, below->borderHalfRight(true));
+            }
+        }
+        left = max(left, -overflowLeft(false));
+        top = max(top, -overflowTop(false) - borderTopExtra());
+        IntRect r(-left, -borderTopExtra() - top, left + max(width() + right, overflowWidth(false)), borderTopExtra() + top + max(height() + bottom + borderBottomExtra(), overflowHeight(false)));
+        computeAbsoluteRepaintRect(r);
+        return r;
+    }
+    return RenderBlock::getAbsoluteRepaintRect();
+}
+
 void RenderTableCell::computeAbsoluteRepaintRect(IntRect& r, bool f)
 {
@@ -488 +534 @@
 int RenderTableCell::borderLeft() const
 {
-    if (table()->collapseBorders()) {
-        CollapsedBorderValue border = collapsedLeftBorder(table()->style()->direction() == RTL);
-        if (border.exists())
-            return (border.width() + 1) / 2; // Give the extra pixel to top and left.
-        return 0;
-    }
-    return RenderBlock::borderLeft();
-}
-    
+    return table()->collapseBorders() ? borderHalfLeft(false) : RenderBlock::borderLeft();
+}
+
 int RenderTableCell::borderRight() const
 {
-    if (table()->collapseBorders()) {
-        CollapsedBorderValue border = collapsedRightBorder(table()->style()->direction() == RTL);
-        if (border.exists())
-            return border.width() / 2;
-        return 0;
-    }
-    return RenderBlock::borderRight();
+    return table()->collapseBorders() ? borderHalfRight(false) : RenderBlock::borderRight();
 }
 
 int RenderTableCell::borderTop() const
 {
-    if (table()->collapseBorders()) {
-        CollapsedBorderValue border = collapsedTopBorder();
-        if (border.exists())
-            return (border.width() + 1) / 2; // Give the extra pixel to top and left.
-        return 0;
-    }
-    return RenderBlock::borderTop();
+    return table()->collapseBorders() ? borderHalfTop(false) : RenderBlock::borderTop();
 }
 
 int RenderTableCell::borderBottom() const
 {
-    if (table()->collapseBorders()) {
-        CollapsedBorderValue border = collapsedBottomBorder();
-        if (border.exists())
-            return border.width() / 2;
-        return 0;
-    }
-    return RenderBlock::borderBottom();
+    return table()->collapseBorders() ? borderHalfBottom(false) : RenderBlock::borderBottom();
+}
+
+int RenderTableCell::borderHalfLeft(bool outer) const
+{
+    CollapsedBorderValue border = collapsedLeftBorder(table()->style()->direction() == RTL);
+    if (border.exists())
+        return (border.width() + (outer ? 0 : 1)) / 2; // Give the extra pixel to top and left.
+    return 0;
+}
+    
+int RenderTableCell::borderHalfRight(bool outer) const
+{
+    CollapsedBorderValue border = collapsedRightBorder(table()->style()->direction() == RTL);
+    if (border.exists())
+        return (border.width() + (outer ? 1 : 0)) / 2;
+    return 0;
+}
+
+int RenderTableCell::borderHalfTop(bool outer) const
+{
+    CollapsedBorderValue border = collapsedTopBorder();
+    if (border.exists())
+        return (border.width() + (outer ? 0 : 1)) / 2; // Give the extra pixel to top and left.
+    return 0;
+}
+
+int RenderTableCell::borderHalfBottom(bool outer) const
+{
+    CollapsedBorderValue border = collapsedBottomBorder();
+    if (border.exists())
+        return (border.width() + (outer ? 1 : 0)) / 2;
+    return 0;
 }
 

trunk/WebCore/rendering/RenderTableCell.h

@@ -72 +72 @@
     int borderBottom() const;
 
+    int borderHalfLeft(bool outer) const;
+    int borderHalfRight(bool outer) const;
+    int borderHalfTop(bool outer) const;
+    int borderHalfBottom(bool outer) const;
+
     CollapsedBorderValue collapsedLeftBorder(bool rtl) const;
     CollapsedBorderValue collapsedRightBorder(bool rtl) const;
@@ -92 +97 @@
     virtual int yPos() const { return m_y + _topExtra; }
 
+    virtual IntRect getAbsoluteRepaintRect();
     virtual void computeAbsoluteRepaintRect(IntRect&, bool f=false);
     virtual bool absolutePosition(int& xPos, int& yPos, bool f = false);