From 7225087fa2015925d0a63dd103ac0157ffafd5d8 Mon Sep 17 00:00:00 2001 From: Aliaksandr Kalenik Date: Sun, 6 Oct 2024 16:36:04 +0200 Subject: [PATCH] LibWeb: Replaced remaining usage and delete Size::resolved() --- Userland/Libraries/LibWeb/CSS/Size.cpp | 5 ----- Userland/Libraries/LibWeb/CSS/Size.h | 3 --- Userland/Libraries/LibWeb/Layout/FormattingContext.cpp | 4 ++-- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Userland/Libraries/LibWeb/CSS/Size.cpp b/Userland/Libraries/LibWeb/CSS/Size.cpp index 295ee4079d8..42d05bb17ad 100644 --- a/Userland/Libraries/LibWeb/CSS/Size.cpp +++ b/Userland/Libraries/LibWeb/CSS/Size.cpp @@ -19,11 +19,6 @@ CSSPixels Size::to_px(Layout::Node const& node, CSSPixels reference_value) const return m_length_percentage.resolved(node, reference_value).to_px(node); } -CSS::Length Size::resolved(Layout::Node const& node, CSSPixels reference_value) const -{ - return m_length_percentage.resolved(node, reference_value); -} - Size Size::make_auto() { return Size { Type::Auto, Length::make_auto() }; diff --git a/Userland/Libraries/LibWeb/CSS/Size.h b/Userland/Libraries/LibWeb/CSS/Size.h index 8d3e57ba8f2..0c68e7f2282 100644 --- a/Userland/Libraries/LibWeb/CSS/Size.h +++ b/Userland/Libraries/LibWeb/CSS/Size.h @@ -45,9 +45,6 @@ public: bool is_fit_content() const { return m_type == Type::FitContent; } bool is_none() const { return m_type == Type::None; } - // FIXME: This is a stopgap API that will go away once all layout code is aware of CSS::Size. - CSS::Length resolved(Layout::Node const&, CSSPixels reference_value) const; - [[nodiscard]] CSSPixels to_px(Layout::Node const&, CSSPixels reference_value) const; bool contains_percentage() const; diff --git a/Userland/Libraries/LibWeb/Layout/FormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/FormattingContext.cpp index f241c725b4a..477ec6b20d7 100644 --- a/Userland/Libraries/LibWeb/Layout/FormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/FormattingContext.cpp @@ -1600,7 +1600,7 @@ CSSPixels FormattingContext::calculate_inner_width(Layout::Box const& box, Avail return max(inner_width, 0); } - return width.resolved(box, width_of_containing_block).to_px(box); + return width.to_px(box, width_of_containing_block); } CSSPixels FormattingContext::calculate_inner_height(Layout::Box const& box, AvailableSize const& available_height, CSS::Size const& height) const @@ -1618,7 +1618,7 @@ CSSPixels FormattingContext::calculate_inner_height(Layout::Box const& box, Avai return max(inner_height, 0); } - return height.resolved(box, height_of_containing_block).to_px(box); + return height.to_px(box, height_of_containing_block); } CSSPixels FormattingContext::containing_block_width_for(NodeWithStyleAndBoxModelMetrics const& node) const