mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-07-31 05:09:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

Browse source 
Previously, attempting to get the computed value for a
grid-template-rows or grid-template-columns property would cause a
crash for inline elements.
This commit is contained in:
Tim Ledbetter 2024-09-19 22:51:57 +01:00 • committed by Andreas Kling
commit 087fcb84cb
Notes: github-actions[bot] 2024-09-20 06:17:26 +00:00
4 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

0
Tests/LibWeb/Text/expected/css/getComputedStyle-no-paintable.txt → Tests/LibWeb/Text/expected/css/getComputedStyle-no-paintable-box.txt
View file

21
Tests/LibWeb/Text/input/css/getComputedStyle-no-paintable-box.html Normal file
View file

@ -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>

15
Tests/LibWeb/Text/input/css/getComputedStyle-no-paintable.html
View file

@ -1,15 +0,0 @@
<!DOCTYPE html>
<script src="../include.js"></script>
<script>
test(() => {
const noPaintableElement = document.createElement("br");
document.body.appendChild(noPaintableElement);
const style = getComputedStyle(noPaintableElement);
let values = [];
for (const propertyName of style) {
values.push(style[propertyName]);
}
noPaintableElement.remove();
println("PASS (didn't crash)");
});
</script>

4
Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp
View file

@ -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;