From 1ee99017e2de7c1a2bc540bf808ec36520e6a57d Mon Sep 17 00:00:00 2001 From: Aliaksandr Kalenik Date: Mon, 27 Mar 2023 19:06:21 +0300 Subject: [PATCH] LibWeb: Fix intrinsic sizing early return condition in TFC Early return before running full TFC algorithm is only possible when just table width need to be calculated. --- .../expected/table-in-auto-height-flex-item.txt | 12 ++++++++++++ .../input/table-in-auto-height-flex-item.html | 15 +++++++++++++++ .../LibWeb/Layout/TableFormattingContext.cpp | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 Tests/LibWeb/Layout/expected/table-in-auto-height-flex-item.txt create mode 100644 Tests/LibWeb/Layout/input/table-in-auto-height-flex-item.html diff --git a/Tests/LibWeb/Layout/expected/table-in-auto-height-flex-item.txt b/Tests/LibWeb/Layout/expected/table-in-auto-height-flex-item.txt new file mode 100644 index 0000000000..60623d70d7 --- /dev/null +++ b/Tests/LibWeb/Layout/expected/table-in-auto-height-flex-item.txt @@ -0,0 +1,12 @@ +Viewport <#document> at (0,0) content-size 800x600 children: not-inline + BlockContainer at (1,1) content-size 798x39.46875 children: not-inline + Box at (10,10) content-size 764x21.46875 flex-container(row) children: not-inline + BlockContainer at (11,11) content-size 41.78125x19.46875 flex-item children: not-inline + TableWrapper <(anonymous)> at (11,11) content-size 41.78125x19.46875 children: not-inline + TableBox <(anonymous)> at (11,11) content-size 41.78125x19.46875 children: not-inline + TableRowBox <(anonymous)> at (11,11) content-size 41.78125x19.46875 children: not-inline + TableCellBox at (12,12) content-size 39.78125x17.46875 children: inline + line 0 width: 39.78125, height: 17.46875, bottom: 17.46875, baseline: 13.53125 + frag 0 from TextNode start: 0, length: 5, rect: [12,12 39.78125x17.46875] + "Hello" + TextNode <#text> diff --git a/Tests/LibWeb/Layout/input/table-in-auto-height-flex-item.html b/Tests/LibWeb/Layout/input/table-in-auto-height-flex-item.html new file mode 100644 index 0000000000..ebea3c8a39 --- /dev/null +++ b/Tests/LibWeb/Layout/input/table-in-auto-height-flex-item.html @@ -0,0 +1,15 @@ +
Hello
\ No newline at end of file diff --git a/Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp index 1f75270c54..dad77c8e88 100644 --- a/Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp @@ -521,7 +521,7 @@ void TableFormattingContext::run(Box const& box, LayoutMode layout_mode, Availab // Compute the minimum width of each column. compute_table_measures(); - if (available_space.width.is_intrinsic_sizing_constraint()) { + if (available_space.width.is_intrinsic_sizing_constraint() && !available_space.height.is_intrinsic_sizing_constraint()) { determine_intrisic_size_of_table_container(available_space); return; }