diff --git a/Tests/LibWeb/Layout/expected/blockify-layout-internal-box-without-crashing.txt b/Tests/LibWeb/Layout/expected/blockify-layout-internal-box-without-crashing.txt index d9b0cd5e1b..8d6174499c 100644 --- a/Tests/LibWeb/Layout/expected/blockify-layout-internal-box-without-crashing.txt +++ b/Tests/LibWeb/Layout/expected/blockify-layout-internal-box-without-crashing.txt @@ -4,6 +4,6 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 0x0 [BFC] children: not-inline Box at (8,8) content-size 0x0 [TFC] children: not-inline Box at (8,8) content-size 0x0 children: not-inline - TableRowBox at (8,8) content-size 0x0 children: not-inline + Box at (8,8) content-size 0x0 children: not-inline TableCellBox <(anonymous)> at (8,8) content-size 0x0 [BFC] children: not-inline BlockContainer
at (9,9) content-size 0x0 positioned [BFC] children: not-inline diff --git a/Tests/LibWeb/Layout/expected/css-pseudo-element-should-not-be-affected-by-presentational-hints.txt b/Tests/LibWeb/Layout/expected/css-pseudo-element-should-not-be-affected-by-presentational-hints.txt index 7819565726..e7d7294d8e 100644 --- a/Tests/LibWeb/Layout/expected/css-pseudo-element-should-not-be-affected-by-presentational-hints.txt +++ b/Tests/LibWeb/Layout/expected/css-pseudo-element-should-not-be-affected-by-presentational-hints.txt @@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline TableWrapper <(anonymous)> at (10,10) content-size 102x102 [BFC] children: not-inline Box at (11,11) content-size 100x100 [TFC] children: not-inline Box at (11,11) content-size 100x100 children: not-inline - TableRowBox at (11,11) content-size 100x100 children: not-inline + Box at (11,11) content-size 100x100 children: not-inline TableCellBox at (8,8) content-size 95.171875x19.46875 children: not-inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> - TableRowBox at (8,8) content-size 95.171875x19.46875 children: not-inline + Box at (8,8) content-size 95.171875x19.46875 children: not-inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> TableCellBox at (8,27.46875) content-size 95.171875x19.46875 children: not-inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> - TableRowBox at (8,27.46875) content-size 95.171875x19.46875 children: not-inline + Box at (8,27.46875) content-size 95.171875x19.46875 children: not-inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> TableCellBox at (8,46.9375) content-size 95.171875x19.46875 children: not-inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> - TableRowBox at (8,46.9375) content-size 95.171875x19.46875 children: not-inline + Box at (8,46.9375) content-size 95.171875x19.46875 children: not-inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> TableCellBox at (9,9) content-size 166.296875x64.40625 children: not-inline - TableRowBox at (9,9) content-size 166.296875x21.46875 children: not-inline + Box at (9,9) content-size 166.296875x21.46875 children: not-inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> TableCellBox at (9,30.46875) content-size 166.296875x21.46875 children: not-inline + Box at (9,30.46875) content-size 166.296875x21.46875 children: not-inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> TableCellBox at (9,51.9375) content-size 166.296875x21.46875 children: not-inline + Box at (9,51.9375) content-size 166.296875x21.46875 children: not-inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> TableCellBox at (8,74.40625) content-size 164.296875x62.40625 children: not-inline - TableRowBox at (8,74.40625) content-size 164.296875x20.46875 children: not-inline + Box at (8,74.40625) content-size 164.296875x20.46875 children: not-inline BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline TextNode <#text> TableCellBox at (8,94.875) content-size 164.296875x21.46875 children: not-inline + Box at (8,94.875) content-size 164.296875x21.46875 children: not-inline BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline TextNode <#text> TableCellBox at (8,116.34375) content-size 164.296875x20.46875 children: not-inline + Box at (8,116.34375) content-size 164.296875x20.46875 children: not-inline BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline TextNode <#text> TableCellBox at (9,9) content-size 780x90.21875 children: not-inline - TableRowBox at (9,9) content-size 780x90.21875 children: not-inline + Box at (9,9) content-size 780x90.21875 children: not-inline TableCellBox at (10,29.109375) content-size 50x50 [BFC] children: not-inline BlockContainer at (10,29.109375) content-size 50x50 children: not-inline TableCellBox at (62,10) content-size 726x88.21875 [BFC] children: inline diff --git a/Tests/LibWeb/Layout/expected/table/fixed-margins.txt b/Tests/LibWeb/Layout/expected/table/fixed-margins.txt index dc85ba7157..c2945e882b 100644 --- a/Tests/LibWeb/Layout/expected/table/fixed-margins.txt +++ b/Tests/LibWeb/Layout/expected/table/fixed-margins.txt @@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer at (8,8) content-size 784x35.40625 children: not-inline TableWrapper <(anonymous)> at (108,8) content-size 584x35.40625 [BFC] children: not-inline Box at (108,8) content-size 584x35.40625 [TFC] children: not-inline - TableRowBox <(anonymous)> at (108,8) content-size 584x35.40625 children: not-inline + Box <(anonymous)> at (108,8) content-size 584x35.40625 children: not-inline TableCellBox at (108,8) content-size 584x35.40625 [BFC] children: inline line 0 width: 569.859375, height: 17.46875, bottom: 17.46875, baseline: 13.53125 frag 0 from TextNode start: 0, length: 58, rect: [108,8 569.859375x17.46875] 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 index a34d70e029..f1ff5f9702 100644 --- a/Tests/LibWeb/Layout/expected/table/in-auto-height-flex-item.txt +++ b/Tests/LibWeb/Layout/expected/table/in-auto-height-flex-item.txt @@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer at (11,11) content-size 41.78125x19.46875 flex-item [BFC] children: not-inline TableWrapper <(anonymous)> at (11,11) content-size 41.78125x19.46875 [BFC] children: not-inline Box <(anonymous)> at (11,11) content-size 41.78125x19.46875 [TFC] children: not-inline - TableRowBox <(anonymous)> at (11,11) content-size 41.78125x19.46875 children: not-inline + Box <(anonymous)> at (11,11) content-size 41.78125x19.46875 children: not-inline TableCellBox at (12,12) content-size 39.78125x17.46875 [BFC] 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] diff --git a/Tests/LibWeb/Layout/expected/table/inline-table-width.txt b/Tests/LibWeb/Layout/expected/table/inline-table-width.txt index 7619e88a3a..12bf3352bf 100644 --- a/Tests/LibWeb/Layout/expected/table/inline-table-width.txt +++ b/Tests/LibWeb/Layout/expected/table/inline-table-width.txt @@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline TableWrapper <(anonymous)> at (9,9) content-size 129.984375x38.9375 inline-block [BFC] children: not-inline Box <(anonymous)> at (9,9) content-size 129.984375x38.9375 inline-table [TFC] children: not-inline Box at (9,9) content-size 129.984375x38.9375 children: not-inline - TableRowBox at (9,9) content-size 129.984375x19.46875 children: not-inline + Box at (9,9) content-size 129.984375x19.46875 children: not-inline TableCellBox at (9,28.46875) content-size 129.984375x19.46875 children: not-inline + Box at (9,28.46875) content-size 129.984375x19.46875 children: not-inline TableCellBox at (8,8) content-size 221.359375x77.875 children: not-inline - TableRowBox at (8,8) content-size 221.359375x19.46875 children: not-inline + Box at (8,8) content-size 221.359375x19.46875 children: not-inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> TableCellBox at (8,27.46875) content-size 221.359375x19.46875 children: not-inline + Box at (8,27.46875) content-size 221.359375x19.46875 children: not-inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> TableCellBox at (8,46.9375) content-size 221.359375x19.46875 children: not-inline + Box at (8,46.9375) content-size 221.359375x19.46875 children: not-inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> TableCellBox at (8,66.40625) content-size 221.359375x19.46875 children: not-inline + Box at (8,66.40625) content-size 221.359375x19.46875 children: not-inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> TableCellBox at (108,108) content-size 584x10 children: not-inline - TableRowBox at (108,108) content-size 584x10 children: not-inline + Box at (108,108) content-size 584x10 children: not-inline TableCellBox at (109,113) content-size 582x0 [BFC] children: not-inline diff --git a/Tests/LibWeb/Layout/expected/table/zero-columns-gridmax.txt b/Tests/LibWeb/Layout/expected/table/zero-columns-gridmax.txt index e8e31c0e53..7ff3a69ee5 100644 --- a/Tests/LibWeb/Layout/expected/table/zero-columns-gridmax.txt +++ b/Tests/LibWeb/Layout/expected/table/zero-columns-gridmax.txt @@ -3,5 +3,5 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer at (8,8) content-size 784x0 children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 200x0 [BFC] children: not-inline Box at (8,8) content-size 200x0 [TFC] children: not-inline - TableRowBox at (8,8) content-size 200x0 children: not-inline + Box at (8,8) content-size 200x0 children: not-inline TableCellBox at (8,8) content-size 200x0 [BFC] children: not-inline diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt index 0fceac04a6..97ae28421e 100644 --- a/Userland/Libraries/LibWeb/CMakeLists.txt +++ b/Userland/Libraries/LibWeb/CMakeLists.txt @@ -420,7 +420,6 @@ set(SOURCES Layout/SVGSVGBox.cpp Layout/TableCellBox.cpp Layout/TableFormattingContext.cpp - Layout/TableRowBox.cpp Layout/TableWrapper.cpp Layout/TextNode.cpp Layout/TreeBuilder.cpp diff --git a/Userland/Libraries/LibWeb/DOM/Element.cpp b/Userland/Libraries/LibWeb/DOM/Element.cpp index f733fe462f..c14879da4d 100644 --- a/Userland/Libraries/LibWeb/DOM/Element.cpp +++ b/Userland/Libraries/LibWeb/DOM/Element.cpp @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include @@ -323,15 +322,12 @@ JS::GCPtr Element::create_layout_node(NonnullRefPtr Element::create_layout_node_for_display_type(DOM::Document& document, CSS::Display const& display, NonnullRefPtr style, Element* element) { - if (display.is_table_inside() || display.is_table_row_group() || display.is_table_header_group() || display.is_table_footer_group()) + if (display.is_table_inside() || display.is_table_row_group() || display.is_table_header_group() || display.is_table_footer_group() || display.is_table_row()) return document.heap().allocate_without_realm(document, element, move(style)); if (display.is_list_item()) return document.heap().allocate_without_realm(document, element, move(style)); - if (display.is_table_row()) - return document.heap().allocate_without_realm(document, element, move(style)); - if (display.is_table_cell()) return document.heap().allocate_without_realm(document, element, move(style)); diff --git a/Userland/Libraries/LibWeb/Layout/TableCellBox.cpp b/Userland/Libraries/LibWeb/Layout/TableCellBox.cpp index 4e968059d1..4f29f7be66 100644 --- a/Userland/Libraries/LibWeb/Layout/TableCellBox.cpp +++ b/Userland/Libraries/LibWeb/Layout/TableCellBox.cpp @@ -6,7 +6,6 @@ #include #include -#include namespace Web::Layout { diff --git a/Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp index f029c5dd61..6d857ee081 100644 --- a/Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp @@ -10,7 +10,6 @@ #include #include #include -#include struct GridPosition { size_t x; @@ -47,6 +46,11 @@ static inline bool is_table_row_group(Box const& box) return display.is_table_row_group() || display.is_table_header_group() || display.is_table_footer_group(); } +static inline bool is_table_row(Box const& box) +{ + return box.display().is_table_row(); +} + template static void for_each_child_box_matching(Box const& parent, Matcher matcher, Callback callback) { @@ -74,12 +78,12 @@ void TableFormattingContext::calculate_row_column_grid(Box const& box) for (auto* child = row.first_child(); child; child = child->next_sibling()) { if (is(*child)) { - Box* box = static_cast(child); + Box const* box = static_cast(child); if (x_current == x_width) x_width++; - const size_t colspan = static_cast(child)->colspan(); - const size_t rowspan = static_cast(child)->rowspan(); + const size_t colspan = static_cast(child)->colspan(); + const size_t rowspan = static_cast(child)->rowspan(); if (x_width < x_current + colspan) x_width = x_current + colspan; @@ -100,14 +104,14 @@ void TableFormattingContext::calculate_row_column_grid(Box const& box) }; for_each_child_box_matching(box, is_table_row_group, [&](auto& row_group_box) { - row_group_box.template for_each_child_of_type([&](auto& row) { - process_row(row); + for_each_child_box_matching(row_group_box, is_table_row, [&](auto& row_box) { + process_row(row_box); return IterationDecision::Continue; }); }); - box.template for_each_child_of_type([&](auto& row) { - process_row(row); + for_each_child_box_matching(box, is_table_row, [&](auto& row_box) { + process_row(row_box); return IterationDecision::Continue; }); @@ -635,7 +639,7 @@ void TableFormattingContext::position_row_boxes(CSSPixels& total_content_height) row_group_box_state.set_content_x(row_group_left_offset); row_group_box_state.set_content_y(row_group_top_offset); - row_group_box.template for_each_child_of_type([&](auto& row) { + for_each_child_box_matching(row_group_box, is_table_row, [&](auto& row) { auto const& row_state = m_state.get(row); row_group_height += row_state.border_box_height(); row_group_width = max(row_group_width, row_state.border_box_width()); diff --git a/Userland/Libraries/LibWeb/Layout/TableFormattingContext.h b/Userland/Libraries/LibWeb/Layout/TableFormattingContext.h index 96db737717..c19872a73c 100644 --- a/Userland/Libraries/LibWeb/Layout/TableFormattingContext.h +++ b/Userland/Libraries/LibWeb/Layout/TableFormattingContext.h @@ -59,7 +59,7 @@ private: }; struct Row { - JS::NonnullGCPtr box; + JS::NonnullGCPtr box; CSSPixels base_height { 0 }; CSSPixels reference_height { 0 }; CSSPixels final_height { 0 }; @@ -67,7 +67,7 @@ private: }; struct Cell { - JS::NonnullGCPtr box; + JS::NonnullGCPtr box; size_t column_index; size_t row_index; size_t column_span; diff --git a/Userland/Libraries/LibWeb/Layout/TableRowBox.cpp b/Userland/Libraries/LibWeb/Layout/TableRowBox.cpp deleted file mode 100644 index 20a207761e..0000000000 --- a/Userland/Libraries/LibWeb/Layout/TableRowBox.cpp +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#include -#include - -namespace Web::Layout { - -TableRowBox::TableRowBox(DOM::Document& document, DOM::Element* element, NonnullRefPtr style) - : Box(document, element, move(style)) -{ -} - -TableRowBox::TableRowBox(DOM::Document& document, DOM::Element* element, CSS::ComputedValues computed_values) - : Box(document, element, move(computed_values)) -{ -} - -TableRowBox::~TableRowBox() = default; - -} diff --git a/Userland/Libraries/LibWeb/Layout/TableRowBox.h b/Userland/Libraries/LibWeb/Layout/TableRowBox.h deleted file mode 100644 index 8623b5dadb..0000000000 --- a/Userland/Libraries/LibWeb/Layout/TableRowBox.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include - -namespace Web::Layout { - -class TableRowBox final : public Box { - JS_CELL(TableRowBox, Box); - -public: - TableRowBox(DOM::Document&, DOM::Element*, NonnullRefPtr); - TableRowBox(DOM::Document&, DOM::Element*, CSS::ComputedValues); - virtual ~TableRowBox() override; -}; - -} diff --git a/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp b/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp index bfa973ae53..94383c748c 100644 --- a/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp +++ b/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -525,26 +524,26 @@ void TreeBuilder::generate_missing_child_wrappers(NodeWithStyle& root) // An anonymous table-row box must be generated around each sequence of consecutive children of a table-root box which are not proper table child boxes. for_each_in_tree_with_inside_display(root, [&](auto& parent) { for_each_sequence_of_consecutive_children_matching(parent, is_not_proper_table_child, [&](auto sequence, auto nearest_sibling) { - wrap_in_anonymous(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow }); + wrap_in_anonymous(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow }); }); }); // An anonymous table-row box must be generated around each sequence of consecutive children of a table-row-group box which are not table-row boxes. for_each_in_tree_with_internal_display(root, [&](auto& parent) { for_each_sequence_of_consecutive_children_matching(parent, is_not_table_row, [&](auto& sequence, auto nearest_sibling) { - wrap_in_anonymous(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow }); + wrap_in_anonymous(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow }); }); }); // Unless explicitly mentioned otherwise, mentions of table-row-groups in this spec also encompass the specialized // table-header-groups and table-footer-groups. for_each_in_tree_with_internal_display(root, [&](auto& parent) { for_each_sequence_of_consecutive_children_matching(parent, is_not_table_row, [&](auto& sequence, auto nearest_sibling) { - wrap_in_anonymous(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow }); + wrap_in_anonymous(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow }); }); }); for_each_in_tree_with_internal_display(root, [&](auto& parent) { for_each_sequence_of_consecutive_children_matching(parent, is_not_table_row, [&](auto& sequence, auto nearest_sibling) { - wrap_in_anonymous(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow }); + wrap_in_anonymous(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow }); }); }); @@ -563,7 +562,7 @@ void TreeBuilder::generate_missing_parents(NodeWithStyle& root) // An anonymous table-row box must be generated around each sequence of consecutive table-cell boxes whose parent is not a table-row. if (is_not_table_row(parent)) { for_each_sequence_of_consecutive_children_matching(parent, is_table_cell, [&](auto& sequence, auto nearest_sibling) { - wrap_in_anonymous(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow }); + wrap_in_anonymous(sequence, nearest_sibling, CSS::Display { CSS::Display::Internal::TableRow }); }); }
at (13,49.082031) content-size 96x23.835937 [BFC] children: not-inline BlockContainer <(anonymous)> at (14,50.082031) content-size 94x21.835937 children: inline line 0 width: 0, height: 21.835937, bottom: 21.835937, baseline: 16.914062 diff --git a/Tests/LibWeb/Layout/expected/display-table-inline-children.txt b/Tests/LibWeb/Layout/expected/display-table-inline-children.txt index a0e04968e1..a4bed777af 100644 --- a/Tests/LibWeb/Layout/expected/display-table-inline-children.txt +++ b/Tests/LibWeb/Layout/expected/display-table-inline-children.txt @@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline TextNode <#text> TableWrapper <(anonymous)> at (8,8) content-size 784x600 [BFC] children: not-inline Box at (8,8) content-size 1200x600 [TFC] children: inline - TableRowBox <(anonymous)> at (8,8) content-size 1200x600 children: inline + Box <(anonymous)> at (8,8) content-size 1200x600 children: inline TableCellBox <(anonymous)> at (8,8) content-size 1200x600 [BFC] children: inline line 0 width: 1200, height: 600, bottom: 600, baseline: 600 frag 0 from ImageBox start: 0, length: 0, rect: [8,8 1200x600] diff --git a/Tests/LibWeb/Layout/expected/table/auto-height.txt b/Tests/LibWeb/Layout/expected/table/auto-height.txt index 1ca86e8a8d..025bbf5a70 100644 --- a/Tests/LibWeb/Layout/expected/table/auto-height.txt +++ b/Tests/LibWeb/Layout/expected/table/auto-height.txt @@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer
at (11,11) content-size 778x19.46875 children: not-inline TableWrapper <(anonymous)> at (11,11) content-size 29.15625x19.46875 [BFC] children: not-inline Box <(anonymous)> at (11,11) content-size 29.15625x19.46875 [TFC] children: not-inline - TableRowBox <(anonymous)> at (11,11) content-size 29.15625x19.46875 children: not-inline + Box <(anonymous)> at (11,11) content-size 29.15625x19.46875 children: not-inline TableCellBox at (12,12) content-size 27.15625x17.46875 [BFC] children: inline line 0 width: 27.15625, height: 17.46875, bottom: 17.46875, baseline: 13.53125 frag 0 from TextNode start: 0, length: 3, rect: [12,12 27.15625x17.46875] @@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer
at (11,32.46875) content-size 778x19.46875 children: not-inline TableWrapper <(anonymous)> at (11,32.46875) content-size 29.640625x19.46875 [BFC] children: not-inline Box <(anonymous)> at (11,32.46875) content-size 29.640625x19.46875 [TFC] children: not-inline - TableRowBox <(anonymous)> at (11,32.46875) content-size 29.640625x19.46875 children: not-inline + Box <(anonymous)> at (11,32.46875) content-size 29.640625x19.46875 children: not-inline TableCellBox at (12,33.46875) content-size 27.640625x17.46875 [BFC] children: inline line 0 width: 27.640625, height: 17.46875, bottom: 17.46875, baseline: 13.53125 frag 0 from TextNode start: 0, length: 3, rect: [12,33.46875 27.640625x17.46875] diff --git a/Tests/LibWeb/Layout/expected/table/auto-margins.txt b/Tests/LibWeb/Layout/expected/table/auto-margins.txt index 9d79082375..1e17ee997a 100644 --- a/Tests/LibWeb/Layout/expected/table/auto-margins.txt +++ b/Tests/LibWeb/Layout/expected/table/auto-margins.txt @@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer at (8,8) content-size 784x17.46875 children: not-inline TableWrapper <(anonymous)> at (235.265625,8) content-size 329.46875x17.46875 [BFC] children: not-inline Box at (235.265625,8) content-size 329.46875x17.46875 [TFC] children: not-inline - TableRowBox <(anonymous)> at (235.265625,8) content-size 329.46875x17.46875 children: not-inline + Box <(anonymous)> at (235.265625,8) content-size 329.46875x17.46875 children: not-inline TableCellBox at (235.265625,8) content-size 329.46875x17.46875 [BFC] children: inline line 0 width: 329.46875, height: 17.46875, bottom: 17.46875, baseline: 13.53125 frag 0 from TextNode start: 0, length: 34, rect: [235.265625,8 329.46875x17.46875] diff --git a/Tests/LibWeb/Layout/expected/table/basic.txt b/Tests/LibWeb/Layout/expected/table/basic.txt index df073da5f6..dd0f9a1bbd 100644 --- a/Tests/LibWeb/Layout/expected/table/basic.txt +++ b/Tests/LibWeb/Layout/expected/table/basic.txt @@ -17,7 +17,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline Box
at (9,9) content-size 93.171875x17.46875 [BFC] children: inline @@ -34,7 +34,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline Box
at (9,28.46875) content-size 93.171875x17.46875 [BFC] children: inline @@ -51,7 +51,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline Box
at (9,47.9375) content-size 93.171875x17.46875 [BFC] children: inline diff --git a/Tests/LibWeb/Layout/expected/table/borders.txt b/Tests/LibWeb/Layout/expected/table/borders.txt index 18fd47f638..3fe4ee1fde 100644 --- a/Tests/LibWeb/Layout/expected/table/borders.txt +++ b/Tests/LibWeb/Layout/expected/table/borders.txt @@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> Box
at (11,11) content-size 82.015625x17.46875 [BFC] children: inline @@ -25,7 +25,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> - TableRowBox
at (11,32.46875) content-size 82.015625x17.46875 [BFC] children: inline @@ -44,7 +44,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> - TableRowBox
at (11,53.9375) content-size 82.015625x17.46875 [BFC] children: inline @@ -71,7 +71,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline TextNode <#text> Box
at (9,75.40625) content-size 82.015625x17.46875 [BFC] children: inline @@ -90,7 +90,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline TextNode <#text> - TableRowBox
at (9,96.875) content-size 82.015625x17.46875 [BFC] children: inline @@ -109,7 +109,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (8,74.40625) content-size 0x0 children: inline TextNode <#text> - TableRowBox
at (9,118.34375) content-size 82.015625x17.46875 [BFC] children: inline @@ -135,7 +135,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline Box at (8,136.8125) content-size 160.296875x56.40625 [TFC] children: not-inline BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline TextNode <#text> - TableRowBox at (8,136.8125) content-size 160.296875x18.46875 children: not-inline + Box at (8,136.8125) content-size 160.296875x18.46875 children: not-inline BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline TextNode <#text> TableCellBox at (8,136.8125) content-size 82.015625x17.46875 [BFC] children: inline @@ -154,7 +154,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline TextNode <#text> - TableRowBox at (8,155.28125) content-size 160.296875x19.46875 children: not-inline + Box at (8,155.28125) content-size 160.296875x19.46875 children: not-inline BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline TextNode <#text> TableCellBox at (8,156.28125) content-size 82.015625x17.46875 [BFC] children: inline @@ -173,7 +173,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline TextNode <#text> - TableRowBox at (8,174.75) content-size 160.296875x18.46875 children: not-inline + Box at (8,174.75) content-size 160.296875x18.46875 children: not-inline BlockContainer <(anonymous)> at (8,136.8125) content-size 0x0 children: inline TextNode <#text> TableCellBox at (8,175.75) content-size 82.015625x17.46875 [BFC] children: inline @@ -199,7 +199,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline Box at (8,193.21875) content-size 178.296875x92.40625 [TFC] children: not-inline BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline TextNode <#text> - TableRowBox at (8,193.21875) content-size 178.296875x27.46875 children: not-inline + Box at (8,193.21875) content-size 178.296875x27.46875 children: not-inline BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline TextNode <#text> TableCellBox at (8,193.21875) content-size 82.015625x17.46875 [BFC] children: inline @@ -218,7 +218,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline TextNode <#text> - TableRowBox at (8,220.6875) content-size 178.296875x37.46875 children: not-inline + Box at (8,220.6875) content-size 178.296875x37.46875 children: not-inline BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline TextNode <#text> TableCellBox at (8,230.6875) content-size 82.015625x17.46875 [BFC] children: inline @@ -237,7 +237,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline TextNode <#text> - TableRowBox at (8,258.15625) content-size 178.296875x27.46875 children: not-inline + Box at (8,258.15625) content-size 178.296875x27.46875 children: not-inline BlockContainer <(anonymous)> at (8,193.21875) content-size 0x0 children: inline TextNode <#text> TableCellBox at (8,268.15625) content-size 82.015625x17.46875 [BFC] children: inline diff --git a/Tests/LibWeb/Layout/expected/table/cell-px-height.txt b/Tests/LibWeb/Layout/expected/table/cell-px-height.txt index 2a09e4b2f9..5a699889d7 100644 --- a/Tests/LibWeb/Layout/expected/table/cell-px-height.txt +++ b/Tests/LibWeb/Layout/expected/table/cell-px-height.txt @@ -2,5 +2,5 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer at (0,0) content-size 800x600 [BFC] children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 102x100 [BFC] children: not-inline Box at (8,8) content-size 102x100 [TFC] children: not-inline - TableRowBox at (8,8) content-size 102x100 children: not-inline + Box at (8,8) content-size 102x100 children: not-inline TableCellBox at (9,9) content-size 100x0 [BFC] children: not-inline diff --git a/Tests/LibWeb/Layout/expected/table/columns-width-distribution-1.txt b/Tests/LibWeb/Layout/expected/table/columns-width-distribution-1.txt index dcc22a7825..8cfe102730 100644 --- a/Tests/LibWeb/Layout/expected/table/columns-width-distribution-1.txt +++ b/Tests/LibWeb/Layout/expected/table/columns-width-distribution-1.txt @@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> Box
at (10,10) content-size 87.90625x17.46875 [BFC] children: inline line 0 width: 15.734375, height: 17.46875, bottom: 17.46875, baseline: 13.53125 frag 0 from TextNode start: 0, length: 2, rect: [10,10 15.734375x17.46875] @@ -18,7 +18,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline frag 0 from TextNode start: 0, length: 4, rect: [99.90625,10 27.84375x17.46875] "null" TextNode <#text> - TableRowBox
at (10,29.46875) content-size 87.90625x17.46875 [BFC] children: inline line 0 width: 87.90625, height: 17.46875, bottom: 17.46875, baseline: 13.53125 frag 0 from TextNode start: 0, length: 11, rect: [10,29.46875 87.90625x17.46875] diff --git a/Tests/LibWeb/Layout/expected/table/row-px-height.txt b/Tests/LibWeb/Layout/expected/table/row-px-height.txt index 2a09e4b2f9..5a699889d7 100644 --- a/Tests/LibWeb/Layout/expected/table/row-px-height.txt +++ b/Tests/LibWeb/Layout/expected/table/row-px-height.txt @@ -2,5 +2,5 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer at (0,0) content-size 800x600 [BFC] children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 102x100 [BFC] children: not-inline Box at (8,8) content-size 102x100 [TFC] children: not-inline - TableRowBox at (8,8) content-size 102x100 children: not-inline + Box at (8,8) content-size 102x100 children: not-inline TableCellBox at (9,9) content-size 100x0 [BFC] children: not-inline diff --git a/Tests/LibWeb/Layout/expected/table/rows-height-distribution-1.txt b/Tests/LibWeb/Layout/expected/table/rows-height-distribution-1.txt index 79e166313a..9576ca43fd 100644 --- a/Tests/LibWeb/Layout/expected/table/rows-height-distribution-1.txt +++ b/Tests/LibWeb/Layout/expected/table/rows-height-distribution-1.txt @@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer at (8,8) content-size 784x150 children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 200x150 [BFC] children: not-inline Box at (8,8) content-size 200x150 [TFC] children: not-inline - TableRowBox at (8,8) content-size 200x50 children: not-inline + Box at (8,8) content-size 200x50 children: not-inline TableCellBox at (8,8) content-size 200x0 [BFC] children: not-inline - TableRowBox at (8,58) content-size 200x100 children: not-inline + Box at (8,58) content-size 200x100 children: not-inline TableCellBox at (8,58) content-size 200x0 [BFC] children: not-inline diff --git a/Tests/LibWeb/Layout/expected/table/rows-height-distribution-2.txt b/Tests/LibWeb/Layout/expected/table/rows-height-distribution-2.txt index 5cff315942..f37ca14519 100644 --- a/Tests/LibWeb/Layout/expected/table/rows-height-distribution-2.txt +++ b/Tests/LibWeb/Layout/expected/table/rows-height-distribution-2.txt @@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer at (8,8) content-size 784x300 children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 200x300 [BFC] children: not-inline Box at (8,8) content-size 200x300 [TFC] children: not-inline - TableRowBox at (8,8) content-size 200x150 children: not-inline + Box at (8,8) content-size 200x150 children: not-inline TableCellBox at (8,8) content-size 200x0 [BFC] children: not-inline - TableRowBox at (8,158) content-size 200x150 children: not-inline + Box at (8,158) content-size 200x150 children: not-inline TableCellBox at (8,158) content-size 200x0 [BFC] children: not-inline diff --git a/Tests/LibWeb/Layout/expected/table/rows-height-distribution-3.txt b/Tests/LibWeb/Layout/expected/table/rows-height-distribution-3.txt index 3f0dca092a..8678e15dd5 100644 --- a/Tests/LibWeb/Layout/expected/table/rows-height-distribution-3.txt +++ b/Tests/LibWeb/Layout/expected/table/rows-height-distribution-3.txt @@ -3,13 +3,13 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer at (8,8) content-size 784x300 children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 200x300 [BFC] children: not-inline Box at (8,8) content-size 200x300 [TFC] children: not-inline - TableRowBox at (8,8) content-size 200x150 children: not-inline + Box at (8,8) content-size 200x150 children: not-inline TableCellBox at (8,8) content-size 200x17.46875 [BFC] children: inline line 0 width: 9.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125 frag 0 from TextNode start: 0, length: 1, rect: [8,8 9.34375x17.46875] "a" TextNode <#text> - TableRowBox at (8,158) content-size 200x150 children: not-inline + Box at (8,158) content-size 200x150 children: not-inline TableCellBox at (8,158) content-size 200x17.46875 [BFC] children: inline line 0 width: 9.46875, height: 17.46875, bottom: 17.46875, baseline: 13.53125 frag 0 from TextNode start: 0, length: 1, rect: [8,158 9.46875x17.46875] diff --git a/Tests/LibWeb/Layout/expected/table/rows-height-distribution-4.txt b/Tests/LibWeb/Layout/expected/table/rows-height-distribution-4.txt index 5fe8943b9c..e86d592cfe 100644 --- a/Tests/LibWeb/Layout/expected/table/rows-height-distribution-4.txt +++ b/Tests/LibWeb/Layout/expected/table/rows-height-distribution-4.txt @@ -3,13 +3,13 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer at (8,8) content-size 784x300 children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 200x300 [BFC] children: not-inline Box at (8,8) content-size 200x300 [TFC] children: not-inline - TableRowBox at (8,8) content-size 200x100 children: not-inline + Box at (8,8) content-size 200x100 children: not-inline TableCellBox at (8,8) content-size 200x17.46875 [BFC] children: inline line 0 width: 9.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125 frag 0 from TextNode start: 0, length: 1, rect: [8,8 9.34375x17.46875] "a" TextNode <#text> - TableRowBox at (8,108) content-size 200x200 children: not-inline + Box at (8,108) content-size 200x200 children: not-inline TableCellBox at (8,108) content-size 200x17.46875 [BFC] children: inline line 0 width: 9.46875, height: 17.46875, bottom: 17.46875, baseline: 13.53125 frag 0 from TextNode start: 0, length: 1, rect: [8,108 9.46875x17.46875] diff --git a/Tests/LibWeb/Layout/expected/table/rowspan.txt b/Tests/LibWeb/Layout/expected/table/rowspan.txt index d258eb6d92..cd0a7d5d32 100644 --- a/Tests/LibWeb/Layout/expected/table/rowspan.txt +++ b/Tests/LibWeb/Layout/expected/table/rowspan.txt @@ -10,7 +10,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> Box
at (9,9) content-size 70.046875x17.46875 [BFC] children: inline @@ -36,7 +36,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> - TableRowBox
at (9,38.203125) content-size 70.046875x17.46875 [BFC] children: inline @@ -62,7 +62,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> - TableRowBox
at (81.046875,47.9375) content-size 72.515625x17.46875 [BFC] children: inline @@ -81,7 +81,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (8,8) content-size 0x0 children: inline TextNode <#text> - TableRowBox
at (9,67.40625) content-size 70.046875x17.46875 [BFC] children: inline diff --git a/Tests/LibWeb/Layout/expected/table/size.txt b/Tests/LibWeb/Layout/expected/table/size.txt index 2d411df51e..c774212112 100644 --- a/Tests/LibWeb/Layout/expected/table/size.txt +++ b/Tests/LibWeb/Layout/expected/table/size.txt @@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer at (8,8) content-size 784x17.46875 children: not-inline TableWrapper <(anonymous)> at (350,8) content-size 100x17.46875 [BFC] children: not-inline Box
at (350,8) content-size 100x17.46875 [TFC] children: not-inline - TableRowBox <(anonymous)> at (350,8) content-size 2000x17.46875 children: not-inline + Box <(anonymous)> at (350,8) content-size 2000x17.46875 children: not-inline TableCellBox <(anonymous)> at (350,8) content-size 2000x17.46875 [BFC] children: not-inline BlockContainer <(anonymous)> at (350,8) content-size 2000x0 children: inline TextNode <#text> diff --git a/Tests/LibWeb/Layout/expected/table/table-width.txt b/Tests/LibWeb/Layout/expected/table/table-width.txt index 6875f25dcb..7bb26a8303 100644 --- a/Tests/LibWeb/Layout/expected/table/table-width.txt +++ b/Tests/LibWeb/Layout/expected/table/table-width.txt @@ -4,5 +4,5 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline TableWrapper <(anonymous)> at (8,8) content-size 584x210 [BFC] children: not-inline Box at (108,108) content-size 584x10 [TFC] children: not-inline Box