Changeset 258480 in webkit

Timestamp:

Mar 15, 2020 8:33:24 AM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][TFC] Add basic column span support for content box width
​https://bugs.webkit.org/show_bug.cgi?id=209120
<rdar://problem/60463424>

Reviewed by Antti Koivisto.

Source/WebCore:

Take the column spanning into account when computing the content width for the table cell.
[content box width = column width(1) + column width(2) + .. + column width(spanning value) + ((spanning value - 1) * horizontal spacing)]

Test: fast/layoutformattingcontext/table-colspan-simple.html

• layout/tableformatting/TableFormattingContext.cpp:

(WebCore::Layout::TableFormattingContext::layoutInFlowContent):
(WebCore::Layout::TableFormattingContext::layoutTableCellBox):
(WebCore::Layout::TableFormattingContext::positionTableCells):

• layout/tableformatting/TableFormattingContext.h:
• layout/tableformatting/TableGrid.cpp:

(WebCore::Layout::TableGrid::appendCell):

• layout/tableformatting/TableGrid.h:

(WebCore::Layout::TableGrid::CellInfo::startColumn const):
(WebCore::Layout::TableGrid::CellInfo::endColumn const):
(WebCore::Layout::TableGrid::CellInfo::startRow const):
(WebCore::Layout::TableGrid::CellInfo::endRow const):
(WebCore::Layout::TableGrid::CellInfo::columnSpan const):
(WebCore::Layout::TableGrid::CellInfo::rowSpan const):

LayoutTests:

• fast/layoutformattingcontext/table-colspan-simple-expected.html: Added.
• fast/layoutformattingcontext/table-colspan-simple.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/layoutformattingcontext/table-colspan-simple-expected.html (added)
• LayoutTests/fast/layoutformattingcontext/table-colspan-simple.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/tableformatting/TableFormattingContext.cpp (modified) (4 diffs)
• Source/WebCore/layout/tableformatting/TableFormattingContext.h (modified) (1 diff)
• Source/WebCore/layout/tableformatting/TableGrid.cpp (modified) (1 diff)
• Source/WebCore/layout/tableformatting/TableGrid.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-03-15  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Add basic column span support for content box width
+        https://bugs.webkit.org/show_bug.cgi?id=209120
+        <rdar://problem/60463424>
+
+        Reviewed by Antti Koivisto.
+
+        * fast/layoutformattingcontext/table-colspan-simple-expected.html: Added.
+        * fast/layoutformattingcontext/table-colspan-simple.html: Added.
+
 2020-03-14  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-15  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Add basic column span support for content box width
+        https://bugs.webkit.org/show_bug.cgi?id=209120
+        <rdar://problem/60463424>
+
+        Reviewed by Antti Koivisto.
+
+        Take the column spanning into account when computing the content width for the table cell.
+        [content box width = column width(1) + column width(2) + .. + column width(spanning value) + ((spanning value - 1) * horizontal spacing)]
+
+        Test: fast/layoutformattingcontext/table-colspan-simple.html
+
+        * layout/tableformatting/TableFormattingContext.cpp:
+        (WebCore::Layout::TableFormattingContext::layoutInFlowContent):
+        (WebCore::Layout::TableFormattingContext::layoutTableCellBox):
+        (WebCore::Layout::TableFormattingContext::positionTableCells):
+        * layout/tableformatting/TableFormattingContext.h:
+        * layout/tableformatting/TableGrid.cpp:
+        (WebCore::Layout::TableGrid::appendCell):
+        * layout/tableformatting/TableGrid.h:
+        (WebCore::Layout::TableGrid::CellInfo::startColumn const):
+        (WebCore::Layout::TableGrid::CellInfo::endColumn const):
+        (WebCore::Layout::TableGrid::CellInfo::startRow const):
+        (WebCore::Layout::TableGrid::CellInfo::endRow const):
+        (WebCore::Layout::TableGrid::CellInfo::columnSpan const):
+        (WebCore::Layout::TableGrid::CellInfo::rowSpan const):
+
 2020-03-15  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp

@@ -77 +77 @@
 
     // 2. Layout each table cell (and compute row height as well).
-    auto& columnList = columnsContext.columns();
     auto& cellList = grid.cells();
     ASSERT(!cellList.isEmpty());
     for (auto& cell : cellList) {
         auto& cellLayoutBox = cell->tableCellBox;
-        layoutTableCellBox(cellLayoutBox, columnList.at(cell->position.x()), invalidationState, horizontalConstraints);
+        layoutTableCellBox(*cell, invalidationState, horizontalConstraints);
         // FIXME: Add support for column and row spanning and this requires a 2 pass layout.
-        auto& row = grid.rows().at(cell->position.y());
+        auto& row = grid.rows().at(cell->startRow());
         row.setLogicalHeight(std::max(row.logicalHeight(), geometryForBox(cellLayoutBox).marginBoxHeight()));
     }
@@ -100 +99 @@
 }
 
-void TableFormattingContext::layoutTableCellBox(const Box& cellLayoutBox, const TableGrid::Column& column, InvalidationState& invalidationState, const HorizontalConstraints& horizontalConstraints)
-{
+void TableFormattingContext::layoutTableCellBox(const TableGrid::CellInfo& cell, InvalidationState& invalidationState, const HorizontalConstraints& horizontalConstraints)
+{
+    auto& cellLayoutBox = cell.tableCellBox;
     computeBorderAndPadding(cellLayoutBox, horizontalConstraints);
     // Margins do not apply to internal table elements.
@@ -109 +109 @@
     // Don't know the actual position yet.
     cellDisplayBox.setTopLeft({ });
-    cellDisplayBox.setContentBoxWidth(column.logicalWidth() - cellDisplayBox.horizontalMarginBorderAndPadding());
+    auto contentWidth = [&] {
+        auto& grid = formattingState().tableGrid();
+        auto& columnList = grid.columnsContext().columns();
+        auto logicalWidth = LayoutUnit { };
+        for (auto columnIndex = cell.startColumn(); columnIndex < cell.endColumn(); ++columnIndex)
+            logicalWidth += columnList.at(columnIndex).logicalWidth();
+        // No column spacing when spanning.
+        logicalWidth += (cell.columnSpan() - 1) * grid.horizontalSpacing();
+        return logicalWidth - cellDisplayBox.horizontalMarginBorderAndPadding();
+    }();
+    cellDisplayBox.setContentBoxWidth(contentWidth);
 
     ASSERT(cellLayoutBox.establishesBlockFormattingContext());
@@ -131 +141 @@
     for (auto& cell : grid.cells()) {
         auto& cellDisplayBox = formattingState().displayBox(cell->tableCellBox);
-        cellDisplayBox.setTop(rowList.at(cell->position.y()).logicalTop());
-        cellDisplayBox.setLeft(columnList.at(cell->position.x()).logicalLeft());
+        cellDisplayBox.setTop(rowList.at(cell->startRow()).logicalTop());
+        cellDisplayBox.setLeft(columnList.at(cell->startColumn()).logicalLeft());
     }
 }

trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.h

@@ -60 +60 @@
 
     IntrinsicWidthConstraints computedIntrinsicWidthConstraints() override;
-    void layoutTableCellBox(const Box& cellLayoutBox, const TableGrid::Column&, InvalidationState&, const HorizontalConstraints&);
+    void layoutTableCellBox(const TableGrid::CellInfo&, InvalidationState&, const HorizontalConstraints&);
     void positionTableCells();
     void setComputedGeometryForRows();

trunk/Source/WebCore/layout/tableformatting/TableGrid.cpp

@@ -143 +143 @@
         }
     }
-    auto cellInfo = makeUnique<CellInfo>(tableCellBox, initialSlotPosition, CellSize { rowSpan, columnSpan });
+    auto cellInfo = makeUnique<CellInfo>(tableCellBox, initialSlotPosition, CellSize { columnSpan, rowSpan });
     // Row and column spanners create additional slots.
     for (int row = 1; row <= rowSpan; ++row) {
         for (int column = 1; column <= columnSpan; ++column) {
-            auto position = SlotPosition { initialSlotPosition.x() + row - 1, initialSlotPosition.y() + column - 1 };
+            auto position = SlotPosition { initialSlotPosition.x() + column - 1, initialSlotPosition.y() + row - 1 };
             ASSERT(!m_slotMap.contains(position));
             m_slotMap.add(position, makeUnique<SlotInfo>(*cellInfo));

trunk/Source/WebCore/layout/tableformatting/TableGrid.h

@@ -62 +62 @@
         WTF_MAKE_STRUCT_FAST_ALLOCATED;
         CellInfo(const Box& tableCellBox, SlotPosition, CellSize);
+
+        size_t startColumn() const { return position.x(); }
+        size_t endColumn() const { return position.x() + size.width(); }
+
+        size_t startRow() const { return position.y(); }
+        size_t endRow() const { return position.y() + size.height(); }
+
+        size_t columnSpan() const { return size.width(); }
+        size_t rowSpan() const { return size.height(); }
 
         const Box& tableCellBox;