Changeset 261991 in webkit

Timestamp:

May 21, 2020 5:33:00 AM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][TFC] Collapse in-between cell borders
​https://bugs.webkit.org/show_bug.cgi?id=212183

Reviewed by Antti Koivisto.

Source/WebCore:

This patch expands border collapsing to in-between cell borders.

Test: fast/layoutformattingcontext/table-simple-border-collapse3.html

• layout/tableformatting/TableFormattingContext.cpp:

(WebCore::Layout::TableFormattingContext::layoutCell):

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

(WebCore::Layout::TableFormattingContext::Geometry::computedCellBorder const):
(WebCore::Layout::TableFormattingContext::Geometry::intrinsicWidthConstraintsForCell):

LayoutTests:

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-05-21  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Collapse in-between cell borders
+        https://bugs.webkit.org/show_bug.cgi?id=212183
+
+        Reviewed by Antti Koivisto.
+
+        * fast/layoutformattingcontext/table-simple-border-collapse3-expected.html: Added.
+        * fast/layoutformattingcontext/table-simple-border-collapse3.html: Added.
+
 2020-05-21  Diego Pino Garcia  <dpino@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-21  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Collapse in-between cell borders
+        https://bugs.webkit.org/show_bug.cgi?id=212183
+
+        Reviewed by Antti Koivisto.
+
+        This patch expands border collapsing to in-between cell borders.
+
+        Test: fast/layoutformattingcontext/table-simple-border-collapse3.html
+
+        * layout/tableformatting/TableFormattingContext.cpp:
+        (WebCore::Layout::TableFormattingContext::layoutCell):
+        * layout/tableformatting/TableFormattingContext.h:
+        * layout/tableformatting/TableFormattingContextGeometry.cpp:
+        (WebCore::Layout::TableFormattingContext::Geometry::computedCellBorder const):
+        (WebCore::Layout::TableFormattingContext::Geometry::intrinsicWidthConstraintsForCell):
+
 2020-05-21  Enrique Ocaña González  <eocanha@igalia.com>
 

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

@@ -200 +200 @@
     auto& cellDisplayBox = formattingState().displayBox(cellBox);
 
-    auto computedCellBorder = [&] {
-        auto border = geometry().computedBorder(cellBox);
-        auto collapsedBorder = grid.collapsedBorder();
-        if (!collapsedBorder)
-            return border;
-        auto cellPosition = cell.position();
-        if (!cellPosition.column)
-            border.horizontal.left = collapsedBorder->horizontal.left / 2;
-        if (cellPosition.column == grid.columns().size() - 1)
-            border.horizontal.right = collapsedBorder->horizontal.right / 2;
-        if (!cellPosition.row)
-            border.vertical.top = collapsedBorder->vertical.top / 2;
-        if (cellPosition.row == grid.rows().size() - 1)
-            border.vertical.bottom = collapsedBorder->vertical.bottom / 2;
-        return border;
-    }();
-    cellDisplayBox.setBorder(computedCellBorder);
+    cellDisplayBox.setBorder(geometry().computedCellBorder(cell));
     cellDisplayBox.setPadding(geometry().computedPadding(cellBox, availableHorizontalSpace));
     // Internal table elements do not have margins.

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

@@ -67 +67 @@
     public:
         LayoutUnit cellHeigh(const ContainerBox&) const;
+        Edges computedCellBorder(const TableGrid::Cell&) const;
         Optional<LayoutUnit> computedColumnWidth(const ContainerBox& columnBox) const;
         FormattingContext::IntrinsicWidthConstraints intrinsicWidthConstraintsForCell(const TableGrid::Cell&);

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

@@ -47 +47 @@
 }
 
+Edges TableFormattingContext::Geometry::computedCellBorder(const TableGrid::Cell& cell) const
+{
+    auto& cellBox = cell.box();
+    auto border = computedBorder(cellBox);
+    auto collapsedBorder = m_grid.collapsedBorder();
+    if (!collapsedBorder)
+        return border;
+
+    // We might want to cache these collapsed borders on the grid.
+    auto cellPosition = cell.position();
+    if (!cellPosition.column)
+        border.horizontal.left = collapsedBorder->horizontal.left / 2;
+    else {
+        auto adjacentBorderRight = computedBorder(m_grid.slot({ cellPosition.column - 1, cellPosition.row })->cell().box()).horizontal.right;
+        border.horizontal.left = std::max(border.horizontal.left, adjacentBorderRight) / 2;
+    }
+    if (cellPosition.column == m_grid.columns().size() - 1)
+        border.horizontal.right = collapsedBorder->horizontal.right / 2;
+    else {
+        auto adjacentBorderLeft = computedBorder(m_grid.slot({ cellPosition.column + 1, cellPosition.row })->cell().box()).horizontal.left;
+        border.horizontal.right = std::max(border.horizontal.right, adjacentBorderLeft) / 2;
+    }
+    if (!cellPosition.row)
+        border.vertical.top = collapsedBorder->vertical.top / 2;
+    else {
+        auto adjacentBorderBottom = computedBorder(m_grid.slot({ cellPosition.column, cellPosition.row - 1 })->cell().box()).vertical.bottom;
+        border.vertical.top = std::max(border.vertical.top, adjacentBorderBottom) / 2;
+    }
+    if (cellPosition.row == m_grid.rows().size() - 1)
+        border.vertical.bottom = collapsedBorder->vertical.bottom / 2;
+    else {
+        auto adjacentBorderTop = computedBorder(m_grid.slot({ cellPosition.column, cellPosition.row + 1 })->cell().box()).vertical.top;
+        border.vertical.bottom = std::max(border.vertical.bottom, adjacentBorderTop) / 2;
+    }
+    return border;
+}
+
 Optional<LayoutUnit> TableFormattingContext::Geometry::computedColumnWidth(const ContainerBox& columnBox) const
 {
@@ -61 +98 @@
     auto& style = cellBox.style();
 
-    auto computedHorizontalBorder = [&] {
-        auto leftBorderWidth = LayoutUnit { style.borderLeftWidth() };
-        auto rightBorderWidth = LayoutUnit { style.borderRightWidth() };
-        if (auto collapsedBorder = m_grid.collapsedBorder()) {
-            auto cellPosition = cell.position();
-            if (!cellPosition.column)
-                leftBorderWidth = collapsedBorder->horizontal.left / 2;
-            if (cellPosition.column == m_grid.columns().size() - 1)
-                rightBorderWidth = collapsedBorder->horizontal.right / 2;
-        }
-        return leftBorderWidth + rightBorderWidth;
-    };
-
     auto computedIntrinsicWidthConstraints = [&] {
         // Even fixed width cells expand to their minimum content width
@@ -80 +104 @@
         if (cellBox.hasChild())
             intrinsicWidthConstraints = LayoutContext::createFormattingContext(cellBox, layoutState())->computedIntrinsicWidthConstraints();
-        if (auto width = fixedValue(cellBox.style().logicalWidth()))
+        if (auto width = fixedValue(style.logicalWidth()))
             return FormattingContext::IntrinsicWidthConstraints { std::max(intrinsicWidthConstraints.minimum, *width), *width };
         return intrinsicWidthConstraints;
@@ -87 +111 @@
     auto intrinsicWidthConstraints = constrainByMinMaxWidth(cellBox, computedIntrinsicWidthConstraints());
     // Expand with border
-    intrinsicWidthConstraints.expand(computedHorizontalBorder());
+    intrinsicWidthConstraints.expand(computedCellBorder(cell).horizontal.width());
     // padding
     intrinsicWidthConstraints.expand(fixedValue(style.paddingLeft()).valueOr(0) + fixedValue(style.paddingRight()).valueOr(0));