LibWeb: Don't crash when resolving grid properties of inline elements

Previously, attempting to get the computed value for a grid-template-rows or grid-template-columns property would cause a crash for inline elements.
LadybirdBrowser · Sep 20, 2024 · 087fcb8 · 087fcb8
1 parent f65df3f
commit 087fcb8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/...ted/css/getComputedStyle-no-paintable.txt → ...css/getComputedStyle-no-paintable-box.txt b/...ted/css/getComputedStyle-no-paintable.txt → ...css/getComputedStyle-no-paintable-box.txt
diff --git a/Tests/LibWeb/Text/input/css/getComputedStyle-no-paintable-box.html b/Tests/LibWeb/Text/input/css/getComputedStyle-no-paintable-box.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<script src="../include.js"></script>
+<script>
+    test(() => {
+        const elementsToTest = [
+            "br",
+            "span",
+        ];
+        for (const elementName of elementsToTest) {
+            const element = document.createElement(elementName);
+            document.body.appendChild(element);
+            const style = getComputedStyle(element);
+            let values = [];
+            for (const propertyName of style) {
+                values.push(style[propertyName]);
+            }
+            element.remove();
+        }
+        println("PASS (didn't crash)");
+    });
+</script>
diff --git a/Tests/LibWeb/Text/input/css/getComputedStyle-no-paintable.html b/Tests/LibWeb/Text/input/css/getComputedStyle-no-paintable.html
diff --git a/Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp b/Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp
@@ -523,14 +523,14 @@ RefPtr<CSSStyleValue const> ResolvedCSSStyleDeclaration::style_value_for_propert
         // For grid-template-columns and grid-template-rows the resolved value is the used value.
         // https://www.w3.org/TR/css-grid-2/#resolved-track-list-standalone
         if (property_id == PropertyID::GridTemplateColumns) {
-            if (layout_node.paintable()) {
+            if (layout_node.paintable() && layout_node.paintable()->is_paintable_box()) {
                 auto const& paintable_box = verify_cast<Painting::PaintableBox const>(*layout_node.paintable());
                 if (auto used_values_for_grid_template_columns = paintable_box.used_values_for_grid_template_columns()) {
                     return used_values_for_grid_template_columns;
                 }
             }
         } else if (property_id == PropertyID::GridTemplateRows) {
-            if (layout_node.paintable()) {
+            if (layout_node.paintable() && layout_node.paintable()->is_paintable_box()) {
                 auto const& paintable_box = verify_cast<Painting::PaintableBox const>(*layout_node.paintable());
                 if (auto used_values_for_grid_template_rows = paintable_box.used_values_for_grid_template_rows()) {
                     return used_values_for_grid_template_rows;