RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:57:44 +00:00
Code Issues Activity Actions

LibWeb: Calculate calc() lengths in to_px()

Browse source 
to_px() has the layout node available, so let's use it.
This commit is contained in:
Sam Atkins 2022-02-18 16:20:16 +00:00 • committed by Andreas Kling
parent 67066c5140
commit 6df3f9920d
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Libraries/LibWeb/CSS/Length.cpp
View file

@ -93,6 +93,9 @@ float Length::relative_length_to_px(Gfx::IntRect const& viewport_rect, Gfx::Font
float Length::to_px(Layout::Node const& layout_node) const float Length::to_px(Layout::Node const& layout_node) const
{ {
if (is_calculated())
return m_calculated_style->resolve_length(layout_node)->to_px(layout_node);
if (!layout_node.document().browsing_context()) if (!layout_node.document().browsing_context())
return 0; return 0;
auto viewport_rect = layout_node.document().browsing_context()->viewport_rect(); auto viewport_rect = layout_node.document().browsing_context()->viewport_rect();

2
Userland/Libraries/LibWeb/CSS/Length.h
View file

@ -86,6 +86,8 @@ public:
return 0; return 0;
if (is_relative()) if (is_relative())
return relative_length_to_px(viewport_rect, font_metrics, root_font_size); return relative_length_to_px(viewport_rect, font_metrics, root_font_size);
if (is_calculated())
VERIFY_NOT_REACHED(); // We can't resolve a calculated length from here. :^(
return absolute_length_to_px(); return absolute_length_to_px();
} }