RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 12:48:10 +00:00
Code Issues Activity Actions

LibWeb: Don't assume HTMLTableCellElement always has table ancestor

Browse source 
That's not actually a DOM invariant, just something the HTML parser
refuses to build. You can still construct table-less th and td elements
using the DOM API.
This commit is contained in:
Andreas Kling 2024-03-09 20:53:43 +01:00
parent 80547ffc2d
commit b9bacb3ff4
3 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Tests/LibWeb/Text/expected/table-cell-without-table-ancestor.txt Normal file
View file

@ -0,0 +1 @@
PASS (didn't crash)

12
Tests/LibWeb/Text/input/table-cell-without-table-ancestor.html Normal file
View file

@ -0,0 +1,12 @@
<body>
<script src="include.js"></script>
<script>
test(() => {
let mfrac = document.createElement("mfrac");
let th = document.createElement("th");
mfrac.appendChild(th);
document.body.appendChild(mfrac);
println("PASS (didn't crash)");
});
</script>
</body>

19
Userland/Libraries/LibWeb/HTML/HTMLTableCellElement.cpp
View file

@ -34,14 +34,6 @@ void HTMLTableCellElement::initialize(JS::Realm& realm)
set_prototype(&Bindings::ensure_web_prototype<Bindings::HTMLTableCellElementPrototype>(realm, "HTMLTableCellElement"_fly_string)); set_prototype(&Bindings::ensure_web_prototype<Bindings::HTMLTableCellElementPrototype>(realm, "HTMLTableCellElement"_fly_string));
} }
static const HTML::HTMLTableElement& table_containing_cell(const HTML::HTMLTableCellElement& node)
{
auto parent_node = node.parent();
while (!is<HTML::HTMLTableElement>(parent_node))
parent_node = parent_node->parent();
return static_cast<const HTML::HTMLTableElement&>(*parent_node);
}
void HTMLTableCellElement::apply_presentational_hints(CSS::StyleProperties& style) const void HTMLTableCellElement::apply_presentational_hints(CSS::StyleProperties& style) const
{ {
for_each_attribute([&](auto& name, auto& value) { for_each_attribute([&](auto& name, auto& value) {
@ -84,23 +76,26 @@ void HTMLTableCellElement::apply_presentational_hints(CSS::StyleProperties& styl
return; return;
} }
}); });
auto const& table_element = table_containing_cell(*this);
if (auto padding = table_element.padding()) { auto const table_element = first_ancestor_of_type<HTMLTableElement>();
if (!table_element)
return;
if (auto padding = table_element->padding()) {
style.set_property(CSS::PropertyID::PaddingTop, CSS::LengthStyleValue::create(CSS::Length::make_px(padding))); style.set_property(CSS::PropertyID::PaddingTop, CSS::LengthStyleValue::create(CSS::Length::make_px(padding)));
style.set_property(CSS::PropertyID::PaddingBottom, CSS::LengthStyleValue::create(CSS::Length::make_px(padding))); style.set_property(CSS::PropertyID::PaddingBottom, CSS::LengthStyleValue::create(CSS::Length::make_px(padding)));
style.set_property(CSS::PropertyID::PaddingLeft, CSS::LengthStyleValue::create(CSS::Length::make_px(padding))); style.set_property(CSS::PropertyID::PaddingLeft, CSS::LengthStyleValue::create(CSS::Length::make_px(padding)));
style.set_property(CSS::PropertyID::PaddingRight, CSS::LengthStyleValue::create(CSS::Length::make_px(padding))); style.set_property(CSS::PropertyID::PaddingRight, CSS::LengthStyleValue::create(CSS::Length::make_px(padding)));
} }
auto border = table_element.border(); auto border = table_element->border();
if (!border) if (!border)
return; return;
auto apply_border_style = [&](CSS::PropertyID style_property, CSS::PropertyID width_property, CSS::PropertyID color_property) { auto apply_border_style = [&](CSS::PropertyID style_property, CSS::PropertyID width_property, CSS::PropertyID color_property) {
style.set_property(style_property, CSS::IdentifierStyleValue::create(CSS::ValueID::Inset)); style.set_property(style_property, CSS::IdentifierStyleValue::create(CSS::ValueID::Inset));
style.set_property(width_property, CSS::LengthStyleValue::create(CSS::Length::make_px(1))); style.set_property(width_property, CSS::LengthStyleValue::create(CSS::Length::make_px(1)));
style.set_property(color_property, table_element.computed_css_values()->property(color_property)); style.set_property(color_property, table_element->computed_css_values()->property(color_property));
}; };
apply_border_style(CSS::PropertyID::BorderLeftStyle, CSS::PropertyID::BorderLeftWidth, CSS::PropertyID::BorderLeftColor); apply_border_style(CSS::PropertyID::BorderLeftStyle, CSS::PropertyID::BorderLeftWidth, CSS::PropertyID::BorderLeftColor);
apply_border_style(CSS::PropertyID::BorderTopStyle, CSS::PropertyID::BorderTopWidth, CSS::PropertyID::BorderTopColor); apply_border_style(CSS::PropertyID::BorderTopStyle, CSS::PropertyID::BorderTopWidth, CSS::PropertyID::BorderTopColor);