Changeset 113738 in webkit

Timestamp:

Apr 10, 2012, 11:14:20 AM (13 years ago)

Author:

hyatt@apple.com

Message:

Source/WebCore: ​https://bugs.webkit.org/show_bug.cgi?id=83595
<rdar://problem/10443278> Overlapping text in table cell across column break

If a cell's height changes such that it is taller than the overall row height because
of pagination, then grow the entire row height to enclose the cell instead of shrinking
the cell.

Reviewed by Dan Bernstein.

Added fast/multicol/cell-shrinkback.html

• rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::layoutRows):

LayoutTests: ​https://bugs.webkit.org/show_bug.cgi?id=83595

Add new layout test for cells paginating across columns.

Reviewed by Dan Bernstein.

• fast/multicol/cell-shrinkback.html: Added.
• fast/multicol/cell-shrinkback-expected.html: Added.
• platform/mac/fast/multicol/table-vertical-align-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/cell-shrinkback.html (added)
• LayoutTests/platform/mac/fast/multicol/table-vertical-align-expected.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderTableSection.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-04-10  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=83595
+        
+        Add new layout test for cells paginating across columns.
+
+        Reviewed by Dan Bernstein.
+
+        * fast/multicol/cell-shrinkback.html: Added.
+        * fast/multicol/cell-shrinkback-expected.html: Added.
+        * platform/mac/fast/multicol/table-vertical-align-expected.txt:
+
 2012-04-10  David Dorwin  <ddorwin@chromium.org>
 

trunk/LayoutTests/platform/mac/fast/multicol/table-vertical-align-expected.txt

@@ -139 +139 @@
 layer at (8,376) size 769x300
   RenderBlock {DIV} at (0,368) size 769x300
-    RenderTable {TABLE} at (0,0) size 376x1129 [border: (1px outset #808080)]
-      RenderTableSection {TBODY} at (1,1) size 374x1127
+    RenderTable {TABLE} at (0,0) size 376x1166 [border: (1px outset #808080)]
+      RenderTableSection {TBODY} at (1,1) size 374x1164
         RenderTableRow {TR} at (0,0) size 374x1127
           RenderTableCell {TD} at (0,0) size 140x1127 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
@@ -263 +263 @@
               text run at (11,1098) width 44: "of text."
             RenderBR {BR} at (55,1112) size 0x0
-          RenderTableCell {TD} at (140,478) size 234x170 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+          RenderTableCell {TD} at (140,478) size 234x207 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
             RenderInline {SPAN} at (0,0) size 145x185
               RenderText {#text} at (11,11) size 145x185

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-10  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=83595
+        <rdar://problem/10443278> Overlapping text in table cell across column break
+
+        If a cell's height changes such that it is taller than the overall row height because
+        of pagination, then grow the entire row height to enclose the cell instead of shrinking
+        the cell.
+
+        Reviewed by Dan Bernstein.
+
+        Added fast/multicol/cell-shrinkback.html
+
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::layoutRows):
+
 2012-04-10  Luke Macpherson  <macpherson@chromium.org>
 

trunk/Source/WebCore/rendering/RenderTableSection.cpp

@@ -673 +673 @@
 
             // FIXME: Make pagination work with vertical tables.
-            if (style()->isHorizontalWritingMode() && view()->layoutState()->pageLogicalHeight() && cell->height() != rHeight)
-                cell->setHeight(rHeight); // FIXME: Pagination might have made us change size.  For now just shrink or grow the cell to fit without doing a relayout.
+            if (view()->layoutState()->pageLogicalHeight() && cell->logicalHeight() != rHeight) {
+                // FIXME: Pagination might have made us change size. For now just shrink or grow the cell to fit without doing a relayout.
+                // 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);
+            }
 
             LayoutSize childOffset(cell->location() - oldCellRect.location());