Changeset 278403 in webkit

Timestamp:

Jun 3, 2021, 6:02:37 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][TFC] Use the fixed table height value to resolve percent column height values
​https://bugs.webkit.org/show_bug.cgi?id=226566

Reviewed by Antti Koivisto.

Source/WebCore:

Test: fast/layoutformattingcontext/table-with-percent-columns-simple.html

• layout/formattingContexts/table/TableFormattingContext.cpp:

(WebCore::Layout::TableFormattingContext::layoutInFlowContent):
(WebCore::Layout::TableFormattingContext::setUsedGeometryForCells):
(WebCore::Layout::TableFormattingContext::computeAndDistributeExtraSpace):

• layout/formattingContexts/table/TableFormattingContext.h:
• layout/formattingContexts/table/TableFormattingGeometry.cpp:

(WebCore::Layout::TableFormattingGeometry::verticalSpaceForCellContent const):

• layout/formattingContexts/table/TableFormattingGeometry.h:

LayoutTests:

• fast/layoutformattingcontext/table-with-percent-columns-and-spacing-expected.html:
• fast/layoutformattingcontext/table-with-percent-columns-and-spacing.html:
• fast/layoutformattingcontext/table-with-percent-columns-simple-expected.html: Added.
• fast/layoutformattingcontext/table-with-percent-columns-simple.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/layoutformattingcontext/table-with-percent-columns-and-spacing-expected.html (modified) (1 diff)
• LayoutTests/fast/layoutformattingcontext/table-with-percent-columns-and-spacing.html (modified) (1 diff)
• LayoutTests/fast/layoutformattingcontext/table-with-percent-columns-simple-expected.html (added)
• LayoutTests/fast/layoutformattingcontext/table-with-percent-columns-simple.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/formattingContexts/table/TableFormattingContext.cpp (modified) (4 diffs)
• Source/WebCore/layout/formattingContexts/table/TableFormattingContext.h (modified) (1 diff)
• Source/WebCore/layout/formattingContexts/table/TableFormattingGeometry.cpp (modified) (1 diff)
• Source/WebCore/layout/formattingContexts/table/TableFormattingGeometry.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-06-03  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Use the fixed table height value to resolve percent column height values
+        https://bugs.webkit.org/show_bug.cgi?id=226566
+
+        Reviewed by Antti Koivisto.
+
+        * fast/layoutformattingcontext/table-with-percent-columns-and-spacing-expected.html:
+        * fast/layoutformattingcontext/table-with-percent-columns-and-spacing.html:
+        * fast/layoutformattingcontext/table-with-percent-columns-simple-expected.html: Added.
+        * fast/layoutformattingcontext/table-with-percent-columns-simple.html: Added.
+
 2021-06-03  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/LayoutTests/fast/layoutformattingcontext/table-with-percent-columns-and-spacing-expected.html

@@ +1 @@
+<!-- webkit-test-runner [ LayoutFormattingContextEnabled=true LayoutFormattingContextIntegrationEnabled=false ] -->
 <style>
 div {

trunk/LayoutTests/fast/layoutformattingcontext/table-with-percent-columns-and-spacing.html

@@ +1 @@
+<!-- webkit-test-runner [ LayoutFormattingContextEnabled=true LayoutFormattingContextIntegrationEnabled=false ] -->
 <style>
 td {

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-03  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Use the fixed table height value to resolve percent column height values
+        https://bugs.webkit.org/show_bug.cgi?id=226566
+
+        Reviewed by Antti Koivisto.
+
+        Test: fast/layoutformattingcontext/table-with-percent-columns-simple.html
+
+        * layout/formattingContexts/table/TableFormattingContext.cpp:
+        (WebCore::Layout::TableFormattingContext::layoutInFlowContent):
+        (WebCore::Layout::TableFormattingContext::setUsedGeometryForCells):
+        (WebCore::Layout::TableFormattingContext::computeAndDistributeExtraSpace):
+        * layout/formattingContexts/table/TableFormattingContext.h:
+        * layout/formattingContexts/table/TableFormattingGeometry.cpp:
+        (WebCore::Layout::TableFormattingGeometry::verticalSpaceForCellContent const):
+        * layout/formattingContexts/table/TableFormattingGeometry.h:
+
 2021-06-03  Julian Gonzalez  <julian_a_gonzalez@apple.com>
 

trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContext.cpp

@@ -62 +62 @@
     computeAndDistributeExtraSpace(availableHorizontalSpace, availableVerticalSpace);
     // 2. Finalize cells.
-    setUsedGeometryForCells(availableHorizontalSpace);
+    setUsedGeometryForCells(availableHorizontalSpace, availableVerticalSpace);
     // 3. Finalize rows.
     setUsedGeometryForRows(availableHorizontalSpace);
@@ -77 +77 @@
 }
 
-void TableFormattingContext::setUsedGeometryForCells(LayoutUnit availableHorizontalSpace)
+void TableFormattingContext::setUsedGeometryForCells(LayoutUnit availableHorizontalSpace, std::optional<LayoutUnit> availableVerticalSpace)
 {
     auto& grid = formattingState().tableGrid();
@@ -112 +112 @@
             LayoutContext::createFormattingContext(cellBox, layoutState())->layoutInFlowContent(invalidationState, formattingGeometry.constraintsForInFlowContent(cellBox));
         }
-        cellBoxGeometry.setContentBoxHeight(formattingGeometry.verticalSpaceForCellContent(*cell));
+        cellBoxGeometry.setContentBoxHeight(formattingGeometry.verticalSpaceForCellContent(*cell, availableVerticalSpace));
 
         auto computeIntrinsicVerticalPaddingForCell = [&] {
@@ -445 +445 @@
                     LayoutContext::createFormattingContext(cellBox, layoutState())->layoutInFlowContent(invalidationState, formattingGeometry.constraintsForInFlowContent(cellBox));
                 }
-                cellBoxGeometry.setContentBoxHeight(formattingGeometry.verticalSpaceForCellContent(cell));
+                cellBoxGeometry.setContentBoxHeight(formattingGeometry.verticalSpaceForCellContent(cell, availableVerticalSpace));
             };
             layoutCellContent(slot.cell());

trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContext.h

@@ -73 +73 @@
 
     IntrinsicWidthConstraints computedIntrinsicWidthConstraints() override;
-    void setUsedGeometryForCells(LayoutUnit availableHorizontalSpace);
+    void setUsedGeometryForCells(LayoutUnit availableHorizontalSpace, std::optional<LayoutUnit> availableVerticalSpace);
     void setUsedGeometryForRows(LayoutUnit availableHorizontalSpace);
     void setUsedGeometryForSections(const ConstraintsForInFlowContent&);

trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingGeometry.cpp

@@ -181 +181 @@
 }
 
-LayoutUnit TableFormattingGeometry::verticalSpaceForCellContent(const TableGrid::Cell& cell) const
+LayoutUnit TableFormattingGeometry::verticalSpaceForCellContent(const TableGrid::Cell& cell, std::optional<LayoutUnit> availableVerticalSpace) const
 {
     auto& cellBox = cell.box();
     auto contentHeight = cellBoxContentHeight(cellBox);
-    auto computedHeight = this->computedHeight(cellBox);
+    auto computedHeight = this->computedHeight(cellBox, availableVerticalSpace);
     if (!computedHeight)
         return contentHeight;

trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingGeometry.h

@@ -46 +46 @@
     InlineLayoutUnit usedBaselineForCell(const ContainerBox& cellBox) const;
     LayoutUnit horizontalSpaceForCellContent(const TableGrid::Cell&) const;
-    LayoutUnit verticalSpaceForCellContent(const TableGrid::Cell&) const;
+    LayoutUnit verticalSpaceForCellContent(const TableGrid::Cell&, std::optional<LayoutUnit> availableVerticalSpace) const;
 
 private: