Changeset 261223 in webkit

Timestamp:

May 6, 2020 7:04:11 AM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][BFC] FormattingContext::ConstraintsForInFlowContent should include the computed value of height
​https://bugs.webkit.org/show_bug.cgi?id=211487

Reviewed by Antti Koivisto.

When the formatting context root has fixed height, the computed value should be passed in to the formatting context layout
as the available vertical space.

• layout/FormattingContextGeometry.cpp:

(WebCore::Layout::FormattingContext::Geometry::constraintsForInFlowContent):

• layout/tableformatting/TableFormattingContext.cpp:

(WebCore::Layout::TableFormattingContext::computeAndDistributeExtraVerticalSpace):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/FormattingContextGeometry.cpp (modified) (1 diff)
• layout/tableformatting/TableFormattingContext.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-06  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][BFC] FormattingContext::ConstraintsForInFlowContent should include the computed value of height
+        https://bugs.webkit.org/show_bug.cgi?id=211487
+
+        Reviewed by Antti Koivisto.
+
+        When the formatting context root has fixed height, the computed value should be passed in to the formatting context layout
+        as the available vertical space.
+
+        * layout/FormattingContextGeometry.cpp:
+        (WebCore::Layout::FormattingContext::Geometry::constraintsForInFlowContent):
+        * layout/tableformatting/TableFormattingContext.cpp:
+        (WebCore::Layout::TableFormattingContext::computeAndDistributeExtraVerticalSpace):
+
 2020-04-29  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/layout/FormattingContextGeometry.cpp

@@ -1108 +1108 @@
 {
     auto& boxGeometry = formattingContext().geometryForBox(containerBox, escapeReason);
-    return { { boxGeometry.contentBoxLeft(), boxGeometry.contentBoxWidth() }, { boxGeometry.contentBoxTop(), { } } };
+    // FIXME: Find out if min/max-height properties should also be taken into account here.
+    return { { boxGeometry.contentBoxLeft(), boxGeometry.contentBoxWidth() }, { boxGeometry.contentBoxTop(), computedHeight(containerBox) } };
 }
 

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

@@ -531 +531 @@
 }
 
-void TableFormattingContext::computeAndDistributeExtraVerticalSpace(LayoutUnit availableHorizontalSpace, Optional<LayoutUnit> verticalConstraint)
+void TableFormattingContext::computeAndDistributeExtraVerticalSpace(LayoutUnit availableHorizontalSpace, Optional<LayoutUnit> availableVerticalSpace)
 {
     auto& grid = formattingState().tableGrid();
@@ -572 +572 @@
 
     // Distribute extra space if the table is supposed to be taller than the sum of the row heights.
-    auto minimumTableHeight = verticalConstraint;
-    if (!minimumTableHeight)
-        minimumTableHeight = geometry().fixedValue(root().style().logicalHeight());
     float spaceToDistribute = 0;
-    if (minimumTableHeight)
-        spaceToDistribute = std::max(0.0f, *minimumTableHeight - ((rows.size() + 1) * grid.verticalSpacing()) - tableUsedHeight);
+    if (availableVerticalSpace)
+        spaceToDistribute = std::max(0.0f, *availableVerticalSpace - ((rows.size() + 1) * grid.verticalSpacing()) - tableUsedHeight);
     auto distributedSpaces = distributeAvailableSpace<RowSpan>(grid, spaceToDistribute, [&] (const TableGrid::Slot& slot, size_t rowIndex) {
         if (slot.hasRowSpan())