From 0258fd8043a52bec99aeea86649a369925ecd4fe Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 26 Jul 2022 00:38:08 +0200 Subject: [PATCH] LibWeb: Remove FFC helpers is_{main,cross}_axis_margin_first_auto() We already cache these values with each flex item, so let's just use those instead. --- .../LibWeb/Layout/FlexFormattingContext.cpp | 26 +++++-------------- .../LibWeb/Layout/FlexFormattingContext.h | 2 -- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp index 2488e033f0..6ba615ad54 100644 --- a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp @@ -443,20 +443,6 @@ bool FlexFormattingContext::is_cross_auto(Box const& box) const return cross_length.is_auto(); } -bool FlexFormattingContext::is_main_axis_margin_first_auto(Box const& box) const -{ - if (is_row_layout()) - return box.computed_values().margin().left.is_auto(); - return box.computed_values().margin().top.is_auto(); -} - -bool FlexFormattingContext::is_main_axis_margin_second_auto(Box const& box) const -{ - if (is_row_layout()) - return box.computed_values().margin().right.is_auto(); - return box.computed_values().margin().bottom.is_auto(); -} - void FlexFormattingContext::set_main_size(Box const& box, float size) { if (is_row_layout()) @@ -1163,10 +1149,10 @@ void FlexFormattingContext::distribute_any_remaining_free_space() size_t auto_margins = 0; for (auto& flex_item : flex_line.items) { used_main_space += flex_item->main_size; - if (is_main_axis_margin_first_auto(flex_item->box)) + if (flex_item->margins.main_before_is_auto) ++auto_margins; - if (is_main_axis_margin_second_auto(flex_item->box)) + if (flex_item->margins.main_after_is_auto) ++auto_margins; used_main_space += flex_item->margins.main_before + flex_item->margins.main_after @@ -1177,16 +1163,16 @@ void FlexFormattingContext::distribute_any_remaining_free_space() if (flex_line.remaining_free_space > 0) { float size_per_auto_margin = flex_line.remaining_free_space / (float)auto_margins; for (auto& flex_item : flex_line.items) { - if (is_main_axis_margin_first_auto(flex_item->box)) + if (flex_item->margins.main_before_is_auto) set_main_axis_first_margin(*flex_item, size_per_auto_margin); - if (is_main_axis_margin_second_auto(flex_item->box)) + if (flex_item->margins.main_after_is_auto) set_main_axis_second_margin(*flex_item, size_per_auto_margin); } } else { for (auto& flex_item : flex_line.items) { - if (is_main_axis_margin_first_auto(flex_item->box)) + if (flex_item->margins.main_before_is_auto) set_main_axis_first_margin(*flex_item, 0); - if (is_main_axis_margin_second_auto(flex_item->box)) + if (flex_item->margins.main_after_is_auto) set_main_axis_second_margin(*flex_item, 0); } } diff --git a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.h b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.h index b6873edc3d..585057b75d 100644 --- a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.h +++ b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.h @@ -93,8 +93,6 @@ private: float specified_cross_max_size(Box const&) const; float calculated_main_size(Box const&) const; bool is_cross_auto(Box const&) const; - bool is_main_axis_margin_first_auto(Box const&) const; - bool is_main_axis_margin_second_auto(Box const&) const; float specified_main_size_of_child_box(Box const& child_box) const; float specified_main_min_size(Box const&) const; float specified_cross_min_size(Box const&) const;