Changeset 261980 in webkit

Timestamp:

May 20, 2020 6:58:33 PM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][TFC] Preferred width computation should take border collapsing into account
​https://bugs.webkit.org/show_bug.cgi?id=212141

Reviewed by Antti Koivisto.

Source/WebCore:

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

• layout/tableformatting/TableFormattingContext.cpp:

(WebCore::Layout::TableFormattingContext::computedPreferredWidthForColumns):

• layout/tableformatting/TableFormattingContext.h:

(WebCore::Layout::TableFormattingContext::Geometry::Geometry):

• layout/tableformatting/TableFormattingContextGeometry.cpp:

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

LayoutTests:

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-05-20  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Preferred width computation should take border collapsing into account
+        https://bugs.webkit.org/show_bug.cgi?id=212141
+
+        Reviewed by Antti Koivisto.
+
+        * fast/layoutformattingcontext/table-simple-border-collapse2-expected.html: Added.
+        * fast/layoutformattingcontext/table-simple-border-collapse2.html: Added.
+
 2020-05-20  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-20  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Preferred width computation should take border collapsing into account
+        https://bugs.webkit.org/show_bug.cgi?id=212141
+
+        Reviewed by Antti Koivisto.
+
+        Test: fast/layoutformattingcontext/table-simple-border-collapse2.html
+
+        * layout/tableformatting/TableFormattingContext.cpp:
+        (WebCore::Layout::TableFormattingContext::computedPreferredWidthForColumns):
+        * layout/tableformatting/TableFormattingContext.h:
+        (WebCore::Layout::TableFormattingContext::Geometry::Geometry):
+        * layout/tableformatting/TableFormattingContextGeometry.cpp:
+        (WebCore::Layout::TableFormattingContext::Geometry::intrinsicWidthConstraintsForCell):
+
 2020-05-20  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -322 +322 @@
         auto intrinsicWidth = formattingState.intrinsicWidthConstraintsForBox(cellBox);
         if (!intrinsicWidth) {
-            intrinsicWidth = geometry().intrinsicWidthConstraintsForCell(cellBox);
+            intrinsicWidth = geometry().intrinsicWidthConstraintsForCell(*cell);
             formattingState.setIntrinsicWidthConstraintsForBox(cellBox, *intrinsicWidth);
         }

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

@@ -68 +68 @@
         LayoutUnit cellHeigh(const ContainerBox&) const;
         Optional<LayoutUnit> computedColumnWidth(const ContainerBox& columnBox) const;
-        FormattingContext::IntrinsicWidthConstraints intrinsicWidthConstraintsForCell(const ContainerBox& cellBox);
+        FormattingContext::IntrinsicWidthConstraints intrinsicWidthConstraintsForCell(const TableGrid::Cell&);
         InlineLayoutUnit usedBaselineForCell(const ContainerBox& cellBox);
 
     private:
         friend class TableFormattingContext;
-        Geometry(const TableFormattingContext&);
+        Geometry(const TableFormattingContext&, const TableGrid&);
 
         const TableFormattingContext& formattingContext() const { return downcast<TableFormattingContext>(FormattingContext::Geometry::formattingContext()); }
+        const TableGrid& m_grid;
     };
-    TableFormattingContext::Geometry geometry() const { return Geometry(*this); }
+    TableFormattingContext::Geometry geometry() const { return Geometry(*this, formattingState().tableGrid()); }
     TableFormattingContext::TableLayout tableLayout() const { return TableLayout(*this, formattingState().tableGrid()); }
 
@@ -93 +94 @@
 };
 
-inline TableFormattingContext::Geometry::Geometry(const TableFormattingContext& tableFormattingContext)
+inline TableFormattingContext::Geometry::Geometry(const TableFormattingContext& tableFormattingContext, const TableGrid& grid)
     : FormattingContext::Geometry(tableFormattingContext)
+    , m_grid(grid)
 {
 }

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

@@ -56 +56 @@
 }
 
-FormattingContext::IntrinsicWidthConstraints TableFormattingContext::Geometry::intrinsicWidthConstraintsForCell(const ContainerBox& cellBox)
+FormattingContext::IntrinsicWidthConstraints TableFormattingContext::Geometry::intrinsicWidthConstraintsForCell(const TableGrid::Cell& cell)
 {
-    auto fixedMarginBorderAndPadding = [&] {
-        auto& style = cellBox.style();
-        return fixedValue(style.marginStart()).valueOr(0)
-            + LayoutUnit { style.borderLeftWidth() }
-            + fixedValue(style.paddingLeft()).valueOr(0)
-            + fixedValue(style.paddingRight()).valueOr(0)
-            + LayoutUnit { style.borderRightWidth() }
-            + fixedValue(style.marginEnd()).valueOr(0);
+    auto& cellBox = cell.box();
+    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;
     };
 
@@ -80 +86 @@
     // FIXME Check for box-sizing: border-box;
     auto intrinsicWidthConstraints = constrainByMinMaxWidth(cellBox, computedIntrinsicWidthConstraints());
-    intrinsicWidthConstraints.expand(fixedMarginBorderAndPadding());
+    // Expand with border
+    intrinsicWidthConstraints.expand(computedHorizontalBorder());
+    // padding
+    intrinsicWidthConstraints.expand(fixedValue(style.paddingLeft()).valueOr(0) + fixedValue(style.paddingRight()).valueOr(0));
+    // and margin
+    intrinsicWidthConstraints.expand(fixedValue(style.marginStart()).valueOr(0) + fixedValue(style.marginEnd()).valueOr(0));
     return intrinsicWidthConstraints;
 }