LibWeb: Fix buttons with TextNode label

axgallo · awesomekling · commit b34b80104fc0 · 2023-08-11T10:02:27.000+02:00
Fixes #20472.
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/button-should-have-vertically-aligned-content.txt b/Tests/LibWeb/Layout/expected/block-and-inline/button-should-have-vertically-aligned-content.txt
@@ -5,41 +5,39 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         frag 0 from BlockContainer start: 0, length: 0, rect: [22,19 48.6875x178]
       TextNode <#text>
       BlockContainer <button.button.border-black> at (22,19) content-size 48.6875x178 inline-block [BFC] children: not-inline
-        BlockContainer <(anonymous)> at (22,19) content-size 48.6875x0 children: inline
-          TextNode <#text>
-        BlockContainer <(anonymous)> at (22,19) content-size 48.6875x0 children: inline
-          TextNode <#text>
-        BlockContainer <(anonymous)> at (22,19) content-size 48.6875x0 children: inline
-          TextNode <#text>
         TableWrapper <(anonymous)> at (22,19) content-size 48.6875x178 [BFC] children: not-inline
           BlockContainer <(anonymous)> at (22,19) content-size 48.6875x178 table-box [TFC] children: not-inline
             Box <(anonymous)> at (22,19) content-size 48.6875x178 table-row children: not-inline
               BlockContainer <(anonymous)> at (22,29.265625) content-size 48.6875x157.46875 table-cell [BFC] children: not-inline
-                BlockContainer <(anonymous)> at (22,29.265625) content-size 48.6875x157.46875 inline-block [BFC] children: not-inline
-                  BlockContainer <div.border-black> at (32,39.265625) content-size 28.6875x17.46875 children: inline
-                    line 0 width: 28.6875, height: 17.46875, bottom: 17.46875, baseline: 13.53125
-                      frag 0 from TextNode start: 1, length: 3, rect: [32,39.265625 28.6875x17.46875]
-                        "one"
-                    TextNode <#text>
-                  BlockContainer <div.border-black> at (32,76.734375) content-size 28.6875x100 children: inline
-                    line 0 width: 28.4375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
-                      frag 0 from TextNode start: 1, length: 3, rect: [32,76.734375 28.4375x17.46875]
-                        "two"
-                    TextNode <#text>
+                BlockContainer <(anonymous)> at (22,29.265625) content-size 48.6875x0 children: inline
+                  TextNode <#text>
+                BlockContainer <div.border-black> at (32,39.265625) content-size 28.6875x17.46875 children: inline
+                  line 0 width: 28.6875, height: 17.46875, bottom: 17.46875, baseline: 13.53125
+                    frag 0 from TextNode start: 1, length: 3, rect: [32,39.265625 28.6875x17.46875]
+                      "one"
+                  TextNode <#text>
+                BlockContainer <(anonymous)> at (22,66.734375) content-size 48.6875x0 children: inline
+                  TextNode <#text>
+                BlockContainer <div.border-black> at (32,76.734375) content-size 28.6875x100 children: inline
+                  line 0 width: 28.4375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
+                    frag 0 from TextNode start: 1, length: 3, rect: [32,76.734375 28.4375x17.46875]
+                      "two"
+                  TextNode <#text>
+                BlockContainer <(anonymous)> at (22,186.734375) content-size 48.6875x0 children: inline
+                  TextNode <#text>
 
 PaintableWithLines (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x200]
       PaintableWithLines (BlockContainer<BUTTON>.button.border-black) [8,8 76.6875x200]
-        PaintableWithLines (BlockContainer(anonymous)) [22,19 48.6875x0]
-        PaintableWithLines (BlockContainer(anonymous)) [22,19 48.6875x0]
-        PaintableWithLines (BlockContainer(anonymous)) [22,19 48.6875x0]
         PaintableWithLines (TableWrapper(anonymous)) [22,19 48.6875x178]
           PaintableWithLines (BlockContainer(anonymous)) [22,19 48.6875x178]
             PaintableBox (Box(anonymous)) [22,19 48.6875x178]
               PaintableWithLines (BlockContainer(anonymous)) [22,19 48.6875x178]
-                PaintableWithLines (BlockContainer(anonymous)) [22,29.265625 48.6875x157.46875]
-                  PaintableWithLines (BlockContainer<DIV>.border-black) [22,29.265625 48.6875x37.46875]
-                    TextPaintable (TextNode<#text>)
-                  PaintableWithLines (BlockContainer<DIV>.border-black) [22,66.734375 48.6875x120]
-                    TextPaintable (TextNode<#text>)
+                PaintableWithLines (BlockContainer(anonymous)) [22,29.265625 48.6875x0]
+                PaintableWithLines (BlockContainer<DIV>.border-black) [22,29.265625 48.6875x37.46875]
+                  TextPaintable (TextNode<#text>)
+                PaintableWithLines (BlockContainer(anonymous)) [22,66.734375 48.6875x0]
+                PaintableWithLines (BlockContainer<DIV>.border-black) [22,66.734375 48.6875x120]
+                  TextPaintable (TextNode<#text>)
+                PaintableWithLines (BlockContainer(anonymous)) [22,186.734375 48.6875x0]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/button-with-multiple-words-text-node-label.txt b/Tests/LibWeb/Layout/expected/block-and-inline/button-with-multiple-words-text-node-label.txt
@@ -0,0 +1,26 @@
+Viewport <#document> at (0,0) content-size 800x600 children: not-inline
+  BlockContainer <html> at (0,0) content-size 800x600 [BFC] children: not-inline
+    BlockContainer <body> at (8,8) content-size 784x21.46875 children: inline
+      line 0 width: 59.921875, height: 21.46875, bottom: 21.46875, baseline: 19.46875
+        frag 0 from BlockContainer start: 0, length: 0, rect: [13,10 49.921875x17.46875]
+      BlockContainer <button> at (13,10) content-size 49.921875x17.46875 inline-block [BFC] children: inline
+        line 0 width: 49.921875, height: 17.46875, bottom: 17.46875, baseline: 17.46875
+          frag 0 from TableWrapper start: 0, length: 0, rect: [13,10 49.921875x17.46875]
+        TableWrapper <(anonymous)> at (13,10) content-size 49.921875x17.46875 [BFC] children: not-inline
+          BlockContainer <(anonymous)> at (13,10) content-size 49.921875x17.46875 table-box [TFC] children: not-inline
+            Box <(anonymous)> at (13,10) content-size 49.921875x17.46875 table-row children: not-inline
+              BlockContainer <(anonymous)> at (13,10) content-size 49.921875x17.46875 table-cell [BFC] children: inline
+                line 0 width: 49.921875, height: 17.46875, bottom: 17.46875, baseline: 13.53125
+                  frag 0 from TextNode start: 0, length: 5, rect: [13,10 49.921875x17.46875]
+                    "A B C"
+                TextNode <#text>
+
+PaintableWithLines (Viewport<#document>) [0,0 800x600]
+  PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
+    PaintableWithLines (BlockContainer<BODY>) [8,8 784x21.46875]
+      PaintableWithLines (BlockContainer<BUTTON>) [8,8 59.921875x21.46875]
+        PaintableWithLines (TableWrapper(anonymous)) [13,10 49.921875x17.46875]
+          PaintableWithLines (BlockContainer(anonymous)) [13,10 49.921875x17.46875]
+            PaintableBox (Box(anonymous)) [13,10 49.921875x17.46875]
+              PaintableWithLines (BlockContainer(anonymous)) [13,10 49.921875x17.46875]
+                TextPaintable (TextNode<#text>)
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/button-with-text-node-label.txt b/Tests/LibWeb/Layout/expected/block-and-inline/button-with-text-node-label.txt
@@ -0,0 +1,26 @@
+Viewport <#document> at (0,0) content-size 800x600 children: not-inline
+  BlockContainer <html> at (0,0) content-size 800x600 [BFC] children: not-inline
+    BlockContainer <body> at (8,8) content-size 784x21.46875 children: inline
+      line 0 width: 47.21875, height: 21.46875, bottom: 21.46875, baseline: 19.46875
+        frag 0 from BlockContainer start: 0, length: 0, rect: [13,10 37.21875x17.46875]
+      BlockContainer <button> at (13,10) content-size 37.21875x17.46875 inline-block [BFC] children: inline
+        line 0 width: 37.21875, height: 17.46875, bottom: 17.46875, baseline: 17.46875
+          frag 0 from TableWrapper start: 0, length: 0, rect: [13,10 37.21875x17.46875]
+        TableWrapper <(anonymous)> at (13,10) content-size 37.21875x17.46875 [BFC] children: not-inline
+          BlockContainer <(anonymous)> at (13,10) content-size 37.21875x17.46875 table-box [TFC] children: not-inline
+            Box <(anonymous)> at (13,10) content-size 37.21875x17.46875 table-row children: not-inline
+              BlockContainer <(anonymous)> at (13,10) content-size 37.21875x17.46875 table-cell [BFC] children: inline
+                line 0 width: 37.21875, height: 17.46875, bottom: 17.46875, baseline: 13.53125
+                  frag 0 from TextNode start: 0, length: 4, rect: [13,10 37.21875x17.46875]
+                    "Test"
+                TextNode <#text>
+
+PaintableWithLines (Viewport<#document>) [0,0 800x600]
+  PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
+    PaintableWithLines (BlockContainer<BODY>) [8,8 784x21.46875]
+      PaintableWithLines (BlockContainer<BUTTON>) [8,8 47.21875x21.46875]
+        PaintableWithLines (TableWrapper(anonymous)) [13,10 37.21875x17.46875]
+          PaintableWithLines (BlockContainer(anonymous)) [13,10 37.21875x17.46875]
+            PaintableBox (Box(anonymous)) [13,10 37.21875x17.46875]
+              PaintableWithLines (BlockContainer(anonymous)) [13,10 37.21875x17.46875]
+                TextPaintable (TextNode<#text>)
diff --git a/Tests/LibWeb/Layout/expected/table/table-cell-not-paintable.txt b/Tests/LibWeb/Layout/expected/table/table-cell-not-paintable.txt
@@ -3,15 +3,17 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     BlockContainer <body> at (8,8) content-size 784x17.46875 children: inline
       line 0 width: 10, height: 17.46875, bottom: 17.46875, baseline: 13.53125
         frag 0 from BlockContainer start: 0, length: 0, rect: [13,19 0x0]
-      BlockContainer <button> at (13,19) content-size 0x0 inline-block [BFC] children: inline
-        TextNode <#text>
-        TableWrapper <(anonymous)> (not painted) [BFC] children: not-inline
-          BlockContainer <(anonymous)> (not painted) table-box [TFC] children: not-inline
-            Box <(anonymous)> (not painted) table-row children: not-inline
-              BlockContainer <(anonymous)> (not painted) table-cell [BFC] children: not-inline
-                BlockContainer <(anonymous)> (not painted) inline-block [BFC] children: not-inline
+      BlockContainer <button> at (13,19) content-size 0x0 inline-block [BFC] children: not-inline
+        TableWrapper <(anonymous)> at (13,19) content-size 0x0 [BFC] children: not-inline
+          BlockContainer <(anonymous)> at (13,19) content-size 0x0 table-box [TFC] children: not-inline
+            Box <(anonymous)> at (13,19) content-size 0x0 table-row children: not-inline
+              BlockContainer <(anonymous)> at (13,19) content-size 0x0 table-cell [BFC] children: not-inline
 
 PaintableWithLines (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableWithLines (BlockContainer<BUTTON>) [8,17 10x4]
+        PaintableWithLines (TableWrapper(anonymous)) [13,19 0x0]
+          PaintableWithLines (BlockContainer(anonymous)) [13,19 0x0]
+            PaintableBox (Box(anonymous)) [13,19 0x0]
+              PaintableWithLines (BlockContainer(anonymous)) [13,19 0x0]
diff --git a/Tests/LibWeb/Layout/input/block-and-inline/button-with-multiple-words-text-node-label.html b/Tests/LibWeb/Layout/input/block-and-inline/button-with-multiple-words-text-node-label.html
@@ -0,0 +1 @@
+<button>A B C</button>
diff --git a/Tests/LibWeb/Layout/input/block-and-inline/button-with-text-node-label.html b/Tests/LibWeb/Layout/input/block-and-inline/button-with-text-node-label.html
@@ -0,0 +1 @@
+<button>Test</button>
diff --git a/Tests/LibWeb/Layout/input/table/table-cell-not-paintable.html b/Tests/LibWeb/Layout/input/table/table-cell-not-paintable.html
@@ -1,2 +1 @@
-<button type="button">
-</button>
+<button type="button"></button>
diff --git a/Userland/Libraries/LibWeb/Layout/Node.h b/Userland/Libraries/LibWeb/Layout/Node.h
@@ -207,6 +207,7 @@ class NodeWithStyle : public Node {
 
     Gfx::Font const& font() const { return *m_font; }
     CSSPixels line_height() const { return m_line_height; }
+    void set_line_height(CSSPixels line_height) { m_line_height = line_height; }
     Vector<CSS::BackgroundLayerData> const& background_layers() const { return computed_values().background_layers(); }
     const CSS::AbstractImageStyleValue* list_style_image() const { return m_list_style_image; }
 
diff --git a/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp b/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp
@@ -387,27 +387,28 @@ ErrorOr<void> TreeBuilder::create_layout_tree(DOM::Node& dom_node, TreeBuilder::
         auto cell_computed_values = CSS::ComputedValues();
         static_cast<CSS::MutableComputedValues&>(cell_computed_values).set_display(CSS::Display { CSS::Display::Internal::TableCell });
         static_cast<CSS::MutableComputedValues&>(cell_computed_values).set_vertical_align(CSS::VerticalAlign::Middle);
+        static_cast<CSS::MutableComputedValues&>(cell_computed_values).set_white_space(CSS::WhiteSpace::Nowrap);
 
         auto flow_root_computed_values = CSS::ComputedValues();
         static_cast<CSS::MutableComputedValues&>(flow_root_computed_values).set_width(CSS::Size::make_percentage(CSS::Percentage(100)));
         static_cast<CSS::MutableComputedValues&>(flow_root_computed_values).set_display(CSS::Display::from_short(CSS::Display::Short::InlineBlock));
 
         auto table_wrapper = parent.heap().template allocate_without_realm<BlockContainer>(parent.document(), nullptr, move(table_computed_values));
         auto cell_wrapper = parent.heap().template allocate_without_realm<BlockContainer>(parent.document(), nullptr, move(cell_computed_values));
-        auto flow_root_wrapper = parent.heap().template allocate_without_realm<BlockContainer>(parent.document(), nullptr, move(flow_root_computed_values));
+
+        cell_wrapper->set_line_height(parent.line_height());
+        cell_wrapper->set_children_are_inline(parent.children_are_inline());
 
         Vector<JS::Handle<Node>> sequence;
         for (auto child = parent.first_child(); child; child = child->next_sibling()) {
-            if (!is_ignorable_whitespace(*child))
-                sequence.append(*child);
+            sequence.append(*child);
         }
 
         for (auto& node : sequence) {
             parent.remove_child(*node);
-            flow_root_wrapper->append_child(*node);
+            cell_wrapper->append_child(*node);
         }
 
-        cell_wrapper->append_child(*flow_root_wrapper);
         table_wrapper->append_child(*cell_wrapper);
         parent.append_child(*table_wrapper);
     }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-<button type="button">`
`2`		`-</button>`
	`1`	`+<button type="button"></button>`