LibWeb/HTML: Skip layout for an empty label that controls nothing

LadybirdBrowser · Dec 29, 2024 · 3958d52 · 3958d52
1 parent f8dacda
commit 3958d52
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/Libraries/LibWeb/HTML/HTMLLabelElement.cpp b/Libraries/LibWeb/HTML/HTMLLabelElement.cpp
@@ -29,6 +29,12 @@ void HTMLLabelElement::initialize(JS::Realm& realm)
 
 GC::Ptr<Layout::Node> HTMLLabelElement::create_layout_node(GC::Ref<CSS::ComputedProperties> style)
 {
+    bool const has_control = (control() != nullptr);
+    bool const is_child_text_empty = this->child_text_content().is_empty();
+
+    if(!has_control && is_child_text_empty) // Skip layout for an empty label that controls nothing.
+        return nullptr;
+
     return heap().allocate<Layout::Label>(document(), this, move(style));
 }
 

diff --git a/Tests/LibWeb/Layout/expected/misc/label-empty-nocontrol.txt b/Tests/LibWeb/Layout/expected/misc/label-empty-nocontrol.txt
@@ -0,0 +1,19 @@
+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 784x17 children: not-inline
+      BlockContainer <(anonymous)> at (8,8) content-size 784x0 children: inline
+        TextNode <#text>
+      BlockContainer <div> at (8,8) content-size 784x17 children: inline
+        frag 0 from TextNode start: 0, length: 5, rect: [8,8 36.84375x17] baseline: 13.296875
+            "hello"
+        TextNode <#text>
+      BlockContainer <(anonymous)> at (8,25) content-size 784x0 children: inline
+        TextNode <#text>
+
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
+  PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
+    PaintableWithLines (BlockContainer<BODY>) [8,8 784x17]
+      PaintableWithLines (BlockContainer(anonymous)) [8,8 784x0]
+      PaintableWithLines (BlockContainer<DIV>) [8,8 784x17]
+        TextPaintable (TextNode<#text>)
+      PaintableWithLines (BlockContainer(anonymous)) [8,25 784x0]
diff --git a/Tests/LibWeb/Layout/input/misc/label-empty-nocontrol.html b/Tests/LibWeb/Layout/input/misc/label-empty-nocontrol.html
@@ -0,0 +1,2 @@
+<label></label>
+<div>hello</div>