Changeset 263268 in webkit

Timestamp:

Jun 19, 2020, 8:39:55 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][TFC] Do not special-case empty tables
​https://bugs.webkit.org/show_bug.cgi?id=213378

Reviewed by Antti Koivisto.

Source/WebCore:

Now that min/max-width support is added, empty tables can just go through the normal width computation path.

Test: fast/layoutformattingcontext/table-min-max-width-empty-content-simple.html

• layout/blockformatting/tablewrapper/TableWrapperBlockFormattingContext.cpp:

(WebCore::Layout::TableWrapperBlockFormattingContext::computeWidthAndMarginForTableBox):

LayoutTests:

• fast/layoutformattingcontext/table-min-max-width-empty-content-simple-expected.html: Added.
• fast/layoutformattingcontext/table-min-max-width-empty-content-simple.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/layoutformattingcontext/table-min-max-width-empty-content-simple-expected.html (added)
• LayoutTests/fast/layoutformattingcontext/table-min-max-width-empty-content-simple.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/blockformatting/tablewrapper/TableWrapperBlockFormattingContext.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-06-19  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Do not special-case empty tables
+        https://bugs.webkit.org/show_bug.cgi?id=213378
+
+        Reviewed by Antti Koivisto.
+
+        * fast/layoutformattingcontext/table-min-max-width-empty-content-simple-expected.html: Added.
+        * fast/layoutformattingcontext/table-min-max-width-empty-content-simple.html: Added.
+
 2020-06-19  Jason Lawrence  <lawrence.j@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-06-19  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Do not special-case empty tables
+        https://bugs.webkit.org/show_bug.cgi?id=213378
+
+        Reviewed by Antti Koivisto.
+
+        Now that min/max-width support is added, empty tables can just go through the normal width computation path. 
+
+        Test: fast/layoutformattingcontext/table-min-max-width-empty-content-simple.html
+
+        * layout/blockformatting/tablewrapper/TableWrapperBlockFormattingContext.cpp:
+        (WebCore::Layout::TableWrapperBlockFormattingContext::computeWidthAndMarginForTableBox):
+
 2020-06-10  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/layout/blockformatting/tablewrapper/TableWrapperBlockFormattingContext.cpp

@@ -145 +145 @@
 {
     ASSERT(tableBox.isTableBox());
-    if (!tableBox.hasChild()) {
-        auto computedWidthAndMargin = geometry().computedWidthAndMargin(tableBox, horizontalConstraints, { });
-        auto& displayBox = formattingState().displayBox(tableBox);
-        displayBox.setContentBoxWidth(computedWidthAndMargin.contentWidth);
-        displayBox.setHorizontalMargin(computedWidthAndMargin.usedMargin);
-        displayBox.setHorizontalComputedMargin(computedWidthAndMargin.computedMargin);
-        return;
-    }
-
     // This is a special table "fit-content size" behavior handling. Not in the spec though.
     // Table returns its final width as min/max. Use this final width value to computed horizontal margins etc.
@@ -161 +152 @@
         intrinsicWidthConstraints = *precomputedIntrinsicWidthConstraints;
     else {
-        intrinsicWidthConstraints = LayoutContext::createFormattingContext(tableBox, layoutState())->computedIntrinsicWidthConstraints();
+        if (tableBox.hasChild())
+            intrinsicWidthConstraints = LayoutContext::createFormattingContext(tableBox, layoutState())->computedIntrinsicWidthConstraints();
         formattingStateForTableBox.setIntrinsicWidthConstraints(intrinsicWidthConstraints);
     }
 
+    auto availableHorizontalSpace = horizontalConstraints.logicalWidth;
     auto geometry = this->geometry();
-    auto computedWidth = geometry.computedWidth(tableBox, horizontalConstraints.logicalWidth);
-    auto computedMaxWidth = geometry.computedMaxWidth(tableBox, horizontalConstraints.logicalWidth);
-    auto computedMinWidth = geometry.computedMinWidth(tableBox, horizontalConstraints.logicalWidth);
+    auto computedWidth = geometry.computedWidth(tableBox, availableHorizontalSpace);
+    auto computedMaxWidth = geometry.computedMaxWidth(tableBox, availableHorizontalSpace);
+    auto computedMinWidth = geometry.computedMinWidth(tableBox, availableHorizontalSpace);
     // Use the generic shrink-to-fit-width logic as the initial width for the table.
-    auto usedWidth = std::min(std::max(intrinsicWidthConstraints.minimum, horizontalConstraints.logicalWidth), intrinsicWidthConstraints.maximum);
+    auto usedWidth = std::min(std::max(intrinsicWidthConstraints.minimum, availableHorizontalSpace), intrinsicWidthConstraints.maximum);
     if (computedWidth || computedMinWidth || computedMaxWidth) {
         if (computedWidth) {