Changeset 122408 in webkit

Timestamp:

Jul 11, 2012 7:38:38 PM (12 years ago)

Author:

mitz@apple.com

Message:

When a table row height grows because of pagination, not all cells’ heights are adjusted
​https://bugs.webkit.org/show_bug.cgi?id=91043

Reviewed by Sam Weinig.

Source/WebCore:

The fix for in bug <​http://webkit.org/b/83595> in <​http://trac.webkit.org/r113738> made table
rows grow as necessary to fit cells that grow as a result of pagination. But it had two bad
side effects: earlier cells on the row would not grow by the same amount, and later cells on
the row would factor the existing growth into their intrinsic padding.

Test: fast/multicol/table-row-height-increase.html

• rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::layoutRows): Now when a cell becomes taller than the row height,
the additional height needed is recorded, and the cell is shrunk back to row height. Then
after finishing the row, all cells occurring on the row (including cells spanning it but not
starting on it) are grown by the same amount.

LayoutTests:

• fast/multicol/table-row-height-increase-expected.html: Added.
• fast/multicol/table-row-height-increase.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/table-row-height-increase-expected.html (added)
• LayoutTests/fast/multicol/table-row-height-increase.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderTableSection.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-11  Dan Bernstein  <mitz@apple.com>
+
+        When a table row height grows because of pagination, not all cells’ heights are adjusted
+        https://bugs.webkit.org/show_bug.cgi?id=91043
+
+        Reviewed by Sam Weinig.
+
+        * fast/multicol/table-row-height-increase-expected.html: Added.
+        * fast/multicol/table-row-height-increase.html: Added.
+
 2012-07-11  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-11  Dan Bernstein  <mitz@apple.com>
+
+        When a table row height grows because of pagination, not all cells’ heights are adjusted
+        https://bugs.webkit.org/show_bug.cgi?id=91043
+
+        Reviewed by Sam Weinig.
+
+        The fix for in bug <http://webkit.org/b/83595> in <http://trac.webkit.org/r113738> made table
+        rows grow as necessary to fit cells that grow as a result of pagination. But it had two bad
+        side effects: earlier cells on the row would not grow by the same amount, and later cells on
+        the row would factor the existing growth into their intrinsic padding.
+
+        Test: fast/multicol/table-row-height-increase.html
+
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::layoutRows): Now when a cell becomes taller than the row height,
+        the additional height needed is recorded, and the cell is shrunk back to row height. Then
+        after finishing the row, all cells occurring on the row (including cells spanning it but not
+        starting on it) are grown by the same amount.
+
 2012-07-11  Mark Rowe  <mrowe@apple.com>
 

trunk/Source/WebCore/rendering/RenderTableSection.cpp

@@ -548 +548 @@
         }
 
+        int rowHeightIncreaseForPagination = 0;
+
         for (unsigned c = 0; c < nEffCols; c++) {
             CellStruct& cs = cellAt(r, c);
@@ -672 +674 @@
                 // We'll also do a basic increase of the row height to accommodate the cell if it's bigger, but this isn't quite right
                 // either. It's at least stable though and won't result in an infinite # of relayouts that may never stabilize.
-                if (cell->logicalHeight() > rHeight) {
-                    unsigned delta = cell->logicalHeight() - rHeight;
-                    for (unsigned rowIndex = rindx + cell->rowSpan(); rowIndex <= totalRows; rowIndex++)
-                        m_rowPos[rowIndex] += delta;
-                    rHeight = cell->logicalHeight();
-                } else
-                    cell->setLogicalHeight(rHeight);
+                if (cell->logicalHeight() > rHeight)
+                    rowHeightIncreaseForPagination = max<int>(rowHeightIncreaseForPagination, cell->logicalHeight() - rHeight);
+                cell->setLogicalHeight(rHeight);
             }
 
@@ -690 +688 @@
                 if (!table()->selfNeedsLayout() && cell->checkForRepaintDuringLayout())
                     cell->repaintDuringLayoutIfMoved(oldCellRect);
+            }
+        }
+        if (rowHeightIncreaseForPagination) {
+            for (unsigned rowIndex = r + 1; rowIndex <= totalRows; rowIndex++)
+                m_rowPos[rowIndex] += rowHeightIncreaseForPagination;
+            for (unsigned c = 0; c < nEffCols; ++c) {
+                Vector<RenderTableCell*, 1>& cells = cellAt(r, c).cells;
+                for (size_t i = 0; i < cells.size(); ++i)
+                    cells[i]->setLogicalHeight(cells[i]->logicalHeight() + rowHeightIncreaseForPagination);
             }
         }