Changeset 18634 in webkit

Timestamp:

Jan 5, 2007 3:03:50 PM (17 years ago)

Author:

adele

Message:

LayoutTests:

Reviewed by Hyatt.

• repaint tests and updated results for ​http://bugs.webkit.org/show_bug.cgi?id=12079 Nested tables don't repaint properly when a certain row is added

• fast/repaint/table-section-overflow-expected.checksum: Added.
• fast/repaint/table-section-overflow-expected.png: Added.
• fast/repaint/table-section-overflow-expected.txt: Added.
• fast/repaint/table-section-overflow.html: Added.
• fast/repaint/table-section-repaint-expected.checksum: Added.
• fast/repaint/table-section-repaint-expected.png: Added.
• fast/repaint/table-section-repaint-expected.txt: Added.
• fast/repaint/table-section-repaint.html: Added.
• tables/mozilla/core/misc-expected.txt:
• tables/mozilla/core/misc-expected.png:
• tables/mozilla/core/misc-expected.checksum:

WebCore:

Reviewed by Hyatt.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=12079 Nested tables don't repaint properly when a certain row is added

Tests: fast/repaint/table-section-repaint.html

fast/repaint/table-section-overflow.html

Fixed repainting when table sections move during layout.

Made table cells' overflows propagate to table sections and gave tables
overflows.

• rendering/RenderTable.cpp: (WebCore::RenderTable::layout): Added computation of horizontal and vertical overflows based on the caption's and the table sections' overflows. Added checks for table sections that change position during layout. When that happens, we assume all sections below the first section that moved also moved, and repaint everything downwards from there. Added calls to repaintDuringLayoutIfMoved() for the caption. Changed the way table sections are iterated over and added a FIXME to change it again once bug 12124 is fixed. (WebCore::RenderTable::paint): Changed to paint overflow. (WebCore::RenderTable::outerBorderBottom):
• rendering/RenderTableSection.cpp: (WebCore::RenderTableSection::RenderTableSection): (WebCore::RenderTableSection::layoutRows): Added code to compute the section's overflow and a flag saying whether any cells in this section overflow. (WebCore::RenderTableSection::paint): Changed to paint overflow. If any cell in the section has overflow, then all cells are given a chance to paint. This is needed because there can be internal overflow, and external overflow can be coming from any cell inside.
• rendering/RenderTableSection.h: (WebCore::RenderTableSection::overflowWidth): (WebCore::RenderTableSection::overflowLeft):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/repaint/table-section-overflow-expected.checksum (added)
• LayoutTests/fast/repaint/table-section-overflow-expected.png (added)
• LayoutTests/fast/repaint/table-section-overflow-expected.txt (added)
• LayoutTests/fast/repaint/table-section-overflow.html (added)
• LayoutTests/fast/repaint/table-section-repaint-expected.checksum (added)
• LayoutTests/fast/repaint/table-section-repaint-expected.png (added)
• LayoutTests/fast/repaint/table-section-repaint-expected.txt (added)
• LayoutTests/fast/repaint/table-section-repaint.html (added)
• LayoutTests/tables/mozilla/core/misc-expected.checksum (modified) (1 diff)
• LayoutTests/tables/mozilla/core/misc-expected.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderTable.cpp (modified) (8 diffs)
• WebCore/rendering/RenderTableSection.cpp (modified) (7 diffs)
• WebCore/rendering/RenderTableSection.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-01-05  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Hyatt.
+
+        - repaint tests and updated results for
+          http://bugs.webkit.org/show_bug.cgi?id=12079
+          Nested tables don't repaint properly when a certain row is added
+
+        * fast/repaint/table-section-overflow-expected.checksum: Added.
+        * fast/repaint/table-section-overflow-expected.png: Added.
+        * fast/repaint/table-section-overflow-expected.txt: Added.
+        * fast/repaint/table-section-overflow.html: Added.
+        * fast/repaint/table-section-repaint-expected.checksum: Added.
+        * fast/repaint/table-section-repaint-expected.png: Added.
+        * fast/repaint/table-section-repaint-expected.txt: Added.
+        * fast/repaint/table-section-repaint.html: Added.
+        * tables/mozilla/core/misc-expected.txt:
+        * tables/mozilla/core/misc-expected.png:
+        * tables/mozilla/core/misc-expected.checksum:
+
 2007-01-05  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/LayoutTests/tables/mozilla/core/misc-expected.checksum

@@ -1 @@
-70242afa1f6d5c7d6c7dc9bec4eeed53
+f3e8ac5f89b07679968161599c0e5f42

trunk/LayoutTests/tables/mozilla/core/misc-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 812x585
   RenderView at (0,0) size 800x585
-layer at (0,0) size 800x585
+layer at (0,0) size 812x585
   RenderBlock {HTML} at (0,0) size 800x585
     RenderBody {BODY} at (8,8) size 784x569

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-05  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Hyatt.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=12079
+          Nested tables don't repaint properly when a certain row is added
+
+        Tests: fast/repaint/table-section-repaint.html
+               fast/repaint/table-section-overflow.html
+
+        Fixed repainting when table sections move during layout.
+
+        Made table cells' overflows propagate to table sections and gave tables
+        overflows.
+
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::layout): Added computation of horizontal and vertical overflows
+        based on the caption's and the table sections' overflows.
+        Added checks for table sections that change position during layout. When that happens,
+        we assume all sections below the first section that moved also moved, and repaint
+        everything downwards from there.
+        Added calls to repaintDuringLayoutIfMoved() for the caption.
+        Changed the way table sections are iterated over and added a FIXME to change it again
+        once bug 12124 is fixed.
+        (WebCore::RenderTable::paint): Changed to paint overflow.
+        (WebCore::RenderTable::outerBorderBottom):
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::RenderTableSection):
+        (WebCore::RenderTableSection::layoutRows): Added code to compute the section's overflow
+        and a flag saying whether any cells in this section overflow.
+        (WebCore::RenderTableSection::paint): Changed to paint overflow. If any cell
+        in the section has overflow, then all cells are given a chance to paint. This is needed
+        because there can be internal overflow, and external overflow can be coming from any
+        cell inside.
+        * rendering/RenderTableSection.h:
+        (WebCore::RenderTableSection::overflowWidth):
+        (WebCore::RenderTableSection::overflowLeft):
+
 2007-01-05  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/rendering/RenderTable.cpp

@@ -33 +33 @@
 #include "Document.h"
 #include "FixedTableLayout.h"
+#include "FrameView.h"
 #include "HTMLNames.h"
 #include "RenderTableCell.h"
 #include "RenderTableCol.h"
 #include "RenderTableSection.h"
+#include "RenderView.h"
 #include "TextStream.h"
 
@@ -256 +258 @@
     m_height = 0;
     m_overflowHeight = 0;
+    m_overflowTop = 0;
     initMaxMarginValues();
     
     //int oldWidth = m_width;
     calcWidth();
+
+    m_overflowWidth = m_width + (collapseBorders() ? outerBorderRight() - borderRight() : 0);
+    m_overflowLeft = collapseBorders() ? borderLeft() - outerBorderLeft() : 0;
 
     // FIXME: The optimisation below doesn't work since the internal table
@@ -272 +278 @@
     // layout child objects
     int calculatedHeight = 0;
+    int oldTableTop = m_caption ? m_caption->height() + m_caption->marginTop() + m_caption->marginBottom() : 0;
 
     RenderObject* child = firstChild();
@@ -285 +292 @@
     }
 
-    m_overflowWidth = m_width + (collapseBorders() ? outerBorderRight() - borderRight() : 0);
-    m_overflowLeft = collapseBorders() ? borderLeft() - outerBorderLeft() : 0;
+    // If any table section moved vertically, we will just repaint everything from that
+    // section down (it is quite unlikely that any of the following sections
+    // did not shift).
+    bool sectionMoved = false;
+    int movedSectionTop = 0;
 
     // FIXME: Collapse caption margin.
     if (m_caption && m_caption->style()->captionSide() != CAPBOTTOM) {
+        IntRect captionRect(m_caption->xPos(), m_caption->yPos(), m_caption->width(), m_caption->height());
+
         m_caption->setPos(m_caption->marginLeft(), m_height);
+        if (!selfNeedsLayout() && m_caption->checkForRepaintDuringLayout())
+            m_caption->repaintDuringLayoutIfMoved(captionRect);
+
         m_height += m_caption->height() + m_caption->marginTop() + m_caption->marginBottom();
+        m_overflowLeft = min(m_overflowLeft, m_caption->xPos() + m_caption->overflowLeft(false));
+        m_overflowWidth = max(m_overflowWidth, m_caption->xPos() + m_caption->overflowWidth(false));
+        m_overflowTop = min(m_overflowTop, m_caption->yPos() + m_caption->overflowTop(false));
+        m_overflowHeight = max(m_overflowHeight, m_caption->yPos() + m_caption->overflowHeight(false));
+
+        if (m_height != oldTableTop) {
+            sectionMoved = true;
+            movedSectionTop = min(m_height, oldTableTop);
+        }
     }
 
@@ -333 +357 @@
 
     // position the table sections
-    if (m_head) {
-        m_head->setPos(bl, m_height);
-        m_height += m_head->height();
-    }
-    for (RenderObject* body = m_firstBody; body; body = body->nextSibling()) {
-        if (body != m_head && body != m_foot && body->isTableSection()) {
-            body->setPos(bl, m_height);
-            m_height += body->height();
-        }
-    }
-    if (m_foot) {
-        m_foot->setPos(bl, m_height);
-        m_height += m_foot->height();
+    RenderObject* section = m_head ? m_head : (m_firstBody ? m_firstBody : m_foot);
+    while (section) {
+        if (!sectionMoved && section->yPos() != m_height) {
+            sectionMoved = true;
+            movedSectionTop = min(m_height, section->yPos());
+        }
+        section->setPos(bl, m_height);
+
+        m_height += section->height();
+        m_overflowLeft = min(m_overflowLeft, section->xPos() + section->overflowLeft(false));
+        m_overflowWidth = max(m_overflowWidth, section->xPos() + section->overflowWidth(false));
+        // FIXME: Use sectionBelow() instead of the following once sectionBelow() is fixed.
+        // See http://bugs.webkit.org/show_bug.cgi?id=12124
+        if (section == m_foot)
+            break;
+        if (section == m_head)
+            section = m_firstBody ? m_firstBody : m_foot;
+        else {
+            do {
+                section = section->nextSibling();
+            } while (section && (section == m_head || section == m_foot || !section->isTableSection()));
+            if (!section)
+                section = m_foot;
+        }
     }
 
     m_height += bpBottom;
-               
+
     if (m_caption && m_caption->style()->captionSide() == CAPBOTTOM) {
+        IntRect captionRect(m_caption->xPos(), m_caption->yPos(), m_caption->width(), m_caption->height());
+
         m_caption->setPos(m_caption->marginLeft(), m_height);
+        if (!selfNeedsLayout() && m_caption->checkForRepaintDuringLayout())
+            m_caption->repaintDuringLayoutIfMoved(captionRect);
+
         m_height += m_caption->height() + m_caption->marginTop() + m_caption->marginBottom();
+        m_overflowLeft = min(m_overflowLeft, m_caption->xPos() + m_caption->overflowLeft(false));
+        m_overflowWidth = max(m_overflowWidth, m_caption->xPos() + m_caption->overflowWidth(false));
     }
 
     if (isPositioned())
         calcHeight();
+
+    m_overflowHeight = max(m_overflowHeight, m_height);
 
     // table can be containing block of positioned elements.
@@ -362 +406 @@
     layoutPositionedObjects(true);
 
+    bool didFullRepaint = true;
     // Repaint with our new bounds if they are different from our old bounds.
     if (checkForRepaint)
-        repaintAfterLayoutIfNeeded(oldBounds, oldFullBounds);
+        didFullRepaint = repaintAfterLayoutIfNeeded(oldBounds, oldFullBounds);
+    if (!didFullRepaint && sectionMoved) {
+        IntRect repaintRect(m_overflowLeft, movedSectionTop, m_overflowWidth - m_overflowLeft, m_overflowHeight - movedSectionTop);
+        view()->frameView()->addRepaintInfo(this, repaintRect);
+    }
     
     setNeedsLayout(false);
@@ -385 +434 @@
 
     int os = 2 * maximalOutlineSize(paintPhase);
-    if (ty >= paintInfo.rect.bottom() + os || ty + height() <= paintInfo.rect.y() - os)
+    if (ty + overflowTop() >= paintInfo.rect.bottom() + os || ty + overflowHeight() <= paintInfo.rect.y() - os)
         return;
-    if (tx >= paintInfo.rect.right() + os || tx + width() <= paintInfo.rect.x() - os)
+    if (tx + overflowLeft() >= paintInfo.rect.right() + os || tx + overflowWidth() <= paintInfo.rect.x() - os)
         return;
 
@@ -797 +846 @@
     else {
         RenderObject* child;
-        for (child = lastChild(); child && !child->isTableSection(); child = child->previousSibling());
+        for (child = lastChild(); child && !child->isTableSection(); child = child->previousSibling())
+            ;
         bottomSection = child ? static_cast<RenderTableSection*>(child) : 0;
     }

trunk/WebCore/rendering/RenderTableSection.cpp

@@ -54 +54 @@
     , m_outerBorderTop(0)
     , m_outerBorderBottom(0)
+    , m_overflowLeft(0)
+    , m_overflowWidth(0)
+    , m_hasOverflowingCell(false)
 {
     // init RenderObject attributes
@@ -362 +365 @@
     // Set the width of our section now.  The rows will also be this width.
     m_width = table()->contentWidth();
+    m_overflowLeft = 0;
+    m_overflowWidth = m_width;
+    m_hasOverflowingCell = false;
+
     if (table()->collapseBorders())
         recalcOuterBorder();
@@ -430 +437 @@
     for (int r = 0; r < totalRows; r++) {
         // Set the row's x/y position and width/height.
-        if (m_grid[r].rowRenderer) {
-            m_grid[r].rowRenderer->setPos(0, m_rowPos[r]);
-            m_grid[r].rowRenderer->setWidth(m_width);
-            m_grid[r].rowRenderer->setHeight(m_rowPos[r + 1] - m_rowPos[r] - vspacing);
+        if (RenderObject* rowRenderer = m_grid[r].rowRenderer) {
+            rowRenderer->setPos(0, m_rowPos[r]);
+            rowRenderer->setWidth(m_width);
+            rowRenderer->setHeight(m_rowPos[r + 1] - m_rowPos[r] - vspacing);
         }
 
@@ -444 +451 @@
                 continue;
 
-            if ((rindx = r - cell->rowSpan() + 1) < 0)
-                rindx = 0;
+            rindx = max(0, r - cell->rowSpan() + 1);
 
             rHeight = m_rowPos[r + 1] - m_rowPos[rindx] - vspacing;
@@ -516 +522 @@
                 cell->setCellTopExtra(te);
                 cell->setCellBottomExtra(be);
-                if (!table()->selfNeedsLayout() && cell->checkForRepaintDuringLayout() && (te != oldTe || be > oldBe))
+                if ((te != oldTe || be > oldBe) && !table()->selfNeedsLayout() && cell->checkForRepaintDuringLayout())
                     cell->repaint();
             }
@@ -526 +532 @@
             } else
                 cell->setPos(table()->columnPositions()[c] + hspacing, m_rowPos[rindx]);
+
+            m_overflowLeft = min(m_overflowLeft, cell->xPos() + cell->overflowLeft(false));
+            m_overflowWidth = max(m_overflowWidth, cell->xPos() + cell->overflowWidth(false));
+            m_hasOverflowingCell |= cell->overflowLeft(false) || cell->overflowWidth(false) > cell->width();
 
             // If the cell moved, we have to repaint it as well as any floating/positioned
@@ -835 +845 @@
     unsigned startcol = 0;
     unsigned endcol = totalCols;
-    if (style()->direction() == LTR) {
+    // If some cell overflows, just paint all of them.
+    // FIXME: Implement RTL.
+    if (!m_hasOverflowingCell && style()->direction() == LTR) {
         for (; startcol < totalCols; startcol++) {
             if (tx + table()->columnPositions()[startcol + 1] >= x - os)

trunk/WebCore/rendering/RenderTableSection.h

@@ -81 +81 @@
     void splitColumn(int pos, int newSize);
 
+    virtual int overflowWidth(bool includeInterior = true) const { return (!includeInterior && hasOverflowClip()) ? m_width : m_overflowWidth; }
+    virtual int overflowLeft(bool includeInterior = true) const { return (!includeInterior && hasOverflowClip()) ? 0 : m_overflowLeft; }
+
     virtual int lowestPosition(bool includeOverflowInterior, bool includeSelf) const;
     virtual int rightmostPosition(bool includeOverflowInterior, bool includeSelf) const;
@@ -141 +144 @@
     int m_outerBorderTop;
     int m_outerBorderBottom;
+    int m_overflowLeft;
+    int m_overflowWidth;
+    bool m_hasOverflowingCell;
 };