diff --git a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp index 71316af2cb..d70d27e319 100644 --- a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp @@ -1248,8 +1248,9 @@ void GridFormattingContext::place_grid_items() auto& boxes_to_place = order_item_bucket.get(key).value(); for (size_t i = 0; i < boxes_to_place.size(); i++) { auto const& child_box = boxes_to_place[i]; - if (is_auto_positioned_row(child_box->computed_values().grid_row_start(), child_box->computed_values().grid_row_end()) - || is_auto_positioned_column(child_box->computed_values().grid_column_start(), child_box->computed_values().grid_column_end())) + auto const& computed_values = child_box->computed_values(); + if (is_auto_positioned_track(computed_values.grid_row_start(), computed_values.grid_row_end()) + || is_auto_positioned_track(computed_values.grid_column_start(), computed_values.grid_column_end())) continue; place_item_with_row_and_column_position(child_box); boxes_to_place.remove(i); @@ -1263,7 +1264,8 @@ void GridFormattingContext::place_grid_items() auto& boxes_to_place = order_item_bucket.get(key).value(); for (size_t i = 0; i < boxes_to_place.size(); i++) { auto const& child_box = boxes_to_place[i]; - if (is_auto_positioned_row(child_box->computed_values().grid_row_start(), child_box->computed_values().grid_row_end())) + auto const& computed_values = child_box->computed_values(); + if (is_auto_positioned_track(computed_values.grid_row_start(), computed_values.grid_row_end())) continue; place_item_with_row_position(child_box); boxes_to_place.remove(i); @@ -1313,11 +1315,12 @@ void GridFormattingContext::place_grid_items() auto& boxes_to_place = order_item_bucket.get(key).value(); for (size_t i = 0; i < boxes_to_place.size(); i++) { auto const& child_box = boxes_to_place[i]; + auto const& computed_values = child_box->computed_values(); // 4.1. For sparse packing: // FIXME: no distinction made. See #4.2 // 4.1.1. If the item has a definite column position: - if (!is_auto_positioned_column(child_box->computed_values().grid_column_start(), child_box->computed_values().grid_column_end())) + if (!is_auto_positioned_track(computed_values.grid_column_start(), computed_values.grid_column_end())) place_item_with_column_position(child_box, auto_placement_cursor_x, auto_placement_cursor_y); // 4.1.2. If the item has an automatic grid position in both axes: @@ -2012,16 +2015,6 @@ CSSPixels GridFormattingContext::automatic_content_height() const return m_automatic_content_height; } -bool GridFormattingContext::is_auto_positioned_row(CSS::GridTrackPlacement const& grid_row_start, CSS::GridTrackPlacement const& grid_row_end) const -{ - return is_auto_positioned_track(grid_row_start, grid_row_end); -} - -bool GridFormattingContext::is_auto_positioned_column(CSS::GridTrackPlacement const& grid_column_start, CSS::GridTrackPlacement const& grid_column_end) const -{ - return is_auto_positioned_track(grid_column_start, grid_column_end); -} - bool GridFormattingContext::is_auto_positioned_track(CSS::GridTrackPlacement const& grid_track_start, CSS::GridTrackPlacement const& grid_track_end) const { return grid_track_start.is_auto_positioned() && grid_track_end.is_auto_positioned(); diff --git a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.h b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.h index 67c15a1789..a0e58df1ad 100644 --- a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.h +++ b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.h @@ -119,8 +119,7 @@ private: void resolve_items_box_metrics(GridDimension const dimension); CSSPixels m_automatic_content_height { 0 }; - bool is_auto_positioned_row(CSS::GridTrackPlacement const&, CSS::GridTrackPlacement const&) const; - bool is_auto_positioned_column(CSS::GridTrackPlacement const&, CSS::GridTrackPlacement const&) const; + bool is_auto_positioned_track(CSS::GridTrackPlacement const&, CSS::GridTrackPlacement const&) const; struct GridTrack {