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

LibWeb: Move "has-definite-width/height" flags to UsedValues

Browse source 
This state is less static than we originally assumed, and there are
special formatting context-specific rules that say certain sizes are
definite in special circumstances.

To be able to support this, we move the has-definite-size flags from
the layout node to the UsedValues struct instead.
This commit is contained in:
Andreas Kling 2022-07-17 18:46:38 +02:00
parent 25e6ad8d3e
commit 71a707480c
8 changed files with 71 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp
View file

@ -275,7 +275,8 @@ void FlexFormattingContext::generate_anonymous_flex_items()
bool FlexFormattingContext::has_definite_main_size(Box const& box) const
{
return is_row_layout() ? box.has_definite_width() : box.has_definite_height();
auto const& used_values = m_state.get(box);
return is_row_layout() ? used_values.has_definite_width() : used_values.has_definite_height();
}
float FlexFormattingContext::specified_main_size(Box const& box) const
@ -292,10 +293,6 @@ float FlexFormattingContext::specified_cross_size(Box const& box) const
float FlexFormattingContext::resolved_definite_cross_size(Box const& box) const
{
if (is_row_layout())
VERIFY(box.has_definite_height());
else
VERIFY(box.has_definite_width());
auto const& cross_value = is_row_layout() ? box.computed_values().height() : box.computed_values().width();
if (cross_value.is_length())
return cross_value.length().to_px(box);
@ -304,10 +301,6 @@ float FlexFormattingContext::resolved_definite_cross_size(Box const& box) const
float FlexFormattingContext::resolved_definite_main_size(Box const& box) const
{
if (is_row_layout())
VERIFY(box.has_definite_width());
else
VERIFY(box.has_definite_height());
auto const& cross_value = is_row_layout() ? box.computed_values().width() : box.computed_values().height();
if (cross_value.is_length())
return cross_value.length().to_px(box);
@ -328,7 +321,8 @@ bool FlexFormattingContext::has_cross_min_size(Box const& box) const
bool FlexFormattingContext::has_definite_cross_size(Box const& box) const
{
return is_row_layout() ? box.has_definite_height() : box.has_definite_width();
auto const& used_values = m_state.get(box);
return is_row_layout() ? used_values.has_definite_height() : used_values.has_definite_width();
}
float FlexFormattingContext::specified_main_size_of_child_box(Box const& child_box) const