Skip to content

Commit 0258fd8

Browse files
committed
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.
1 parent 71ec46b commit 0258fd8

File tree

2 files changed

+6
-22
lines changed

2 files changed

+6
-22
lines changed

Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -443,20 +443,6 @@ bool FlexFormattingContext::is_cross_auto(Box const& box) const
443443
return cross_length.is_auto();
444444
}
445445

446-
bool FlexFormattingContext::is_main_axis_margin_first_auto(Box const& box) const
447-
{
448-
if (is_row_layout())
449-
return box.computed_values().margin().left.is_auto();
450-
return box.computed_values().margin().top.is_auto();
451-
}
452-
453-
bool FlexFormattingContext::is_main_axis_margin_second_auto(Box const& box) const
454-
{
455-
if (is_row_layout())
456-
return box.computed_values().margin().right.is_auto();
457-
return box.computed_values().margin().bottom.is_auto();
458-
}
459-
460446
void FlexFormattingContext::set_main_size(Box const& box, float size)
461447
{
462448
if (is_row_layout())
@@ -1163,10 +1149,10 @@ void FlexFormattingContext::distribute_any_remaining_free_space()
11631149
size_t auto_margins = 0;
11641150
for (auto& flex_item : flex_line.items) {
11651151
used_main_space += flex_item->main_size;
1166-
if (is_main_axis_margin_first_auto(flex_item->box))
1152+
if (flex_item->margins.main_before_is_auto)
11671153
++auto_margins;
11681154

1169-
if (is_main_axis_margin_second_auto(flex_item->box))
1155+
if (flex_item->margins.main_after_is_auto)
11701156
++auto_margins;
11711157

11721158
used_main_space += flex_item->margins.main_before + flex_item->margins.main_after
@@ -1177,16 +1163,16 @@ void FlexFormattingContext::distribute_any_remaining_free_space()
11771163
if (flex_line.remaining_free_space > 0) {
11781164
float size_per_auto_margin = flex_line.remaining_free_space / (float)auto_margins;
11791165
for (auto& flex_item : flex_line.items) {
1180-
if (is_main_axis_margin_first_auto(flex_item->box))
1166+
if (flex_item->margins.main_before_is_auto)
11811167
set_main_axis_first_margin(*flex_item, size_per_auto_margin);
1182-
if (is_main_axis_margin_second_auto(flex_item->box))
1168+
if (flex_item->margins.main_after_is_auto)
11831169
set_main_axis_second_margin(*flex_item, size_per_auto_margin);
11841170
}
11851171
} else {
11861172
for (auto& flex_item : flex_line.items) {
1187-
if (is_main_axis_margin_first_auto(flex_item->box))
1173+
if (flex_item->margins.main_before_is_auto)
11881174
set_main_axis_first_margin(*flex_item, 0);
1189-
if (is_main_axis_margin_second_auto(flex_item->box))
1175+
if (flex_item->margins.main_after_is_auto)
11901176
set_main_axis_second_margin(*flex_item, 0);
11911177
}
11921178
}

Userland/Libraries/LibWeb/Layout/FlexFormattingContext.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ class FlexFormattingContext final : public FormattingContext {
9393
float specified_cross_max_size(Box const&) const;
9494
float calculated_main_size(Box const&) const;
9595
bool is_cross_auto(Box const&) const;
96-
bool is_main_axis_margin_first_auto(Box const&) const;
97-
bool is_main_axis_margin_second_auto(Box const&) const;
9896
float specified_main_size_of_child_box(Box const& child_box) const;
9997
float specified_main_min_size(Box const&) const;
10098
float specified_cross_min_size(Box const&) const;

0 commit comments

Comments
 (0)