From ece122353b46a2bb6af7a250af8cc037e56c42b1 Mon Sep 17 00:00:00 2001 From: Andi Gallo Date: Wed, 30 Aug 2023 09:46:26 +0000 Subject: [PATCH] LibWeb: Simplify table_containing_cell signature and implementation Reflect expectations of its only call site. --- .../Libraries/LibWeb/HTML/HTMLTableCellElement.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Userland/Libraries/LibWeb/HTML/HTMLTableCellElement.cpp b/Userland/Libraries/LibWeb/HTML/HTMLTableCellElement.cpp index 9693ea7666..c5f23ae551 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLTableCellElement.cpp +++ b/Userland/Libraries/LibWeb/HTML/HTMLTableCellElement.cpp @@ -32,14 +32,12 @@ void HTMLTableCellElement::initialize(JS::Realm& realm) set_prototype(&Bindings::ensure_web_prototype(realm, "HTMLTableCellElement")); } -static const HTML::HTMLTableElement* table_containing_cell(const DOM::Node* node) +static const HTML::HTMLTableElement& table_containing_cell(const HTML::HTMLTableCellElement& node) { - if (!is(node)) - return nullptr; - auto parent_node = node->parent(); + auto parent_node = node.parent(); while (!is(parent_node)) parent_node = parent_node->parent(); - return static_cast(parent_node); + return static_cast(*parent_node); } void HTMLTableCellElement::apply_presentational_hints(CSS::StyleProperties& style) const @@ -80,14 +78,14 @@ void HTMLTableCellElement::apply_presentational_hints(CSS::StyleProperties& styl return; } }); - auto table_element = table_containing_cell(this); - auto border = table_element->border(); + auto const& table_element = table_containing_cell(*this); + auto border = table_element.border(); if (!border) return; 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(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::BorderTopStyle, CSS::PropertyID::BorderTopWidth, CSS::PropertyID::BorderTopColor);