Changeset 147019 in webkit

Timestamp:

Mar 27, 2013 4:49:48 PM (11 years ago)

Author:

robert@webkit.org

Message:

Growing a position:absolute element in a position:relative one in a table does not update scrollHeight
​https://bugs.webkit.org/show_bug.cgi?id=111977

Reviewed by David Hyatt.

Source/WebCore:

During simplified layout tables still need to know about overflow from positioned objects in any of
their cells.

Test: fast/table/cell-overflow-simplified-layout.html

• rendering/RenderBlock.h:

(RenderBlock):

• rendering/RenderTable.cpp:

(WebCore::RenderTable::simplifiedNormalFlowLayout):
(WebCore):

• rendering/RenderTable.h:
• rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::layoutRows):
(WebCore):
(WebCore::RenderTableSection::computeOverflowFromCells):

• rendering/RenderTableSection.h:

(RenderTableSection):

LayoutTests:

• fast/table/cell-overflow-simplified-layout-expected.html: Added.
• fast/table/cell-overflow-simplified-layout.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/table/cell-overflow-simplified-layout-expected.html (added)
• LayoutTests/fast/table/cell-overflow-simplified-layout.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.h (modified) (1 diff)
• Source/WebCore/rendering/RenderTable.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderTable.h (modified) (1 diff)
• Source/WebCore/rendering/RenderTableSection.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderTableSection.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-27  Robert Hogan  <robert@webkit.org>
+
+        Growing a position:absolute element in a position:relative one in a table does not update scrollHeight
+        https://bugs.webkit.org/show_bug.cgi?id=111977
+
+        Reviewed by David Hyatt.
+
+        * fast/table/cell-overflow-simplified-layout-expected.html: Added.
+        * fast/table/cell-overflow-simplified-layout.html: Added.
+
 2013-03-22  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-27  Robert Hogan  <robert@webkit.org>
+
+        Growing a position:absolute element in a position:relative one in a table does not update scrollHeight
+        https://bugs.webkit.org/show_bug.cgi?id=111977
+
+        Reviewed by David Hyatt.
+
+        During simplified layout tables still need to know about overflow from positioned objects in any of
+        their cells.
+
+        Test: fast/table/cell-overflow-simplified-layout.html
+
+        * rendering/RenderBlock.h:
+        (RenderBlock):
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::simplifiedNormalFlowLayout):
+        (WebCore):
+        * rendering/RenderTable.h:
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::layoutRows):
+        (WebCore):
+        (WebCore::RenderTableSection::computeOverflowFromCells):
+        * rendering/RenderTableSection.h:
+        (RenderTableSection):
+
 2013-03-22  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -547 +547 @@
     
     bool simplifiedLayout();
-    void simplifiedNormalFlowLayout();
+    virtual void simplifiedNormalFlowLayout();
 
     void setDesiredColumnCountAndWidth(int, LayoutUnit);

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -380 +380 @@
     // However our current distribution algorithm does not round properly and thus we can have some remaining height.
     // ASSERT(!topSection() || !extraLogicalHeight);
+}
+
+void RenderTable::simplifiedNormalFlowLayout()
+{
+    for (RenderTableSection* section = topSection(); section; section = sectionBelow(section)) {
+        section->layoutIfNeeded();
+        section->computeOverflowFromCells();
+    }
 }
 

trunk/Source/WebCore/rendering/RenderTable.h

@@ -265 +265 @@
 protected:
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
+    virtual void simplifiedNormalFlowLayout();
 
 private:

trunk/Source/WebCore/rendering/RenderTableSection.cpp

@@ -637 +637 @@
     setLogicalHeight(m_rowPos[totalRows]);
 
+    computeOverflowFromCells(totalRows, nEffCols);
+
+    statePusher.pop();
+}
+
+void RenderTableSection::computeOverflowFromCells()
+{
+    unsigned totalRows = m_grid.size();
+    unsigned nEffCols = table()->numEffCols();
+    computeOverflowFromCells(totalRows, nEffCols);
+}
+
+void RenderTableSection::computeOverflowFromCells(unsigned totalRows, unsigned nEffCols)
+{
     unsigned totalCellsCount = nEffCols * totalRows;
     int maxAllowedOverflowingCellsCount = totalCellsCount < gMinTableSizeToUseFastPaintPathWithOverflowingCell ? 0 : gMaxAllowedOverflowingCellRatioForFastPaintPath * totalCellsCount;
@@ -669 +683 @@
 
     ASSERT(hasOverflowingCell == this->hasOverflowingCell());
-
-    statePusher.pop();
 }
 

trunk/Source/WebCore/rendering/RenderTableSection.h

@@ -80 +80 @@
     int calcRowLogicalHeight();
     void layoutRows();
+    void computeOverflowFromCells();
 
     RenderTable* table() const { return toRenderTable(parent()); }
@@ -233 +234 @@
 
     bool hasOverflowingCell() const { return m_overflowingCells.size() || m_forceSlowPaintPathWithOverflowingCell; }
+    void computeOverflowFromCells(unsigned totalRows, unsigned nEffCols);
 
     CellSpan fullTableRowSpan() const { return CellSpan(0, m_grid.size()); }