0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

LibWeb: Do not layout grid items during grid container intrinsic sizing

Browse source 
There is not need to run layout inside grid items for intrinsic sizing
of grid container.
This commit is contained in:
Aliaksandr Kalenik 2023-05-15 15:54:25 +03:00 • committed by Andreas Kling
parent 1ecbbadf3a
commit ae5bb13f1f
Notes: sideshowbarker 2024-07-16 20:21:48 +09:00
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp
View file

@ -1316,6 +1316,14 @@ void GridFormattingContext::place_grid_items(AvailableSpace const& available_spa
} }
} }
void GridFormattingContext::determine_grid_container_height()
{
CSSPixels total_y = 0;
for (auto& grid_row : m_grid_rows_and_gaps)
total_y += grid_row.full_vertical_size();
m_automatic_content_height = total_y;
}
void GridFormattingContext::run(Box const& box, LayoutMode, AvailableSpace const& available_space) void GridFormattingContext::run(Box const& box, LayoutMode, AvailableSpace const& available_space)
{ {
place_grid_items(available_space); place_grid_items(available_space);
@ -1327,6 +1335,13 @@ void GridFormattingContext::run(Box const& box, LayoutMode, AvailableSpace const
run_track_sizing(available_space, GridDimension::Column); run_track_sizing(available_space, GridDimension::Column);
run_track_sizing(available_space, GridDimension::Row); run_track_sizing(available_space, GridDimension::Row);
determine_grid_container_height();
if (available_space.height.is_intrinsic_sizing_constraint() || available_space.width.is_intrinsic_sizing_constraint()) {
determine_intrinsic_size_of_grid_container(available_space);
return;
}
auto layout_box = [&](int row_start, int row_end, int column_start, int column_end, Box const& child_box) -> void { auto layout_box = [&](int row_start, int row_end, int column_start, int column_end, Box const& child_box) -> void {
if (column_start < 0 || row_start < 0) if (column_start < 0 || row_start < 0)
return; return;
@ -1393,14 +1408,6 @@ void GridFormattingContext::run(Box const& box, LayoutMode, AvailableSpace const
grid_item.gap_adjusted_column(box) + resolved_column_span, grid_item.gap_adjusted_column(box) + resolved_column_span,
grid_item.box()); grid_item.box());
} }
if (available_space.height.is_intrinsic_sizing_constraint() || available_space.width.is_intrinsic_sizing_constraint())
determine_intrinsic_size_of_grid_container(available_space);
CSSPixels total_y = 0;
for (auto& grid_row : m_grid_rows_and_gaps)
total_y += grid_row.full_vertical_size();
m_automatic_content_height = total_y;
} }
void GridFormattingContext::determine_intrinsic_size_of_grid_container(AvailableSpace const& available_space) void GridFormattingContext::determine_intrinsic_size_of_grid_container(AvailableSpace const& available_space)

1
Userland/Libraries/LibWeb/Layout/GridFormattingContext.h
View file

@ -167,6 +167,7 @@ private:
Vector<GridItem> m_grid_items; Vector<GridItem> m_grid_items;
Vector<JS::NonnullGCPtr<Box const>> m_boxes_to_place; Vector<JS::NonnullGCPtr<Box const>> m_boxes_to_place;
void determine_grid_container_height();
void determine_intrinsic_size_of_grid_container(AvailableSpace const& available_space); void determine_intrinsic_size_of_grid_container(AvailableSpace const& available_space);
AvailableSize get_free_space(AvailableSpace const&, GridDimension const) const; AvailableSize get_free_space(AvailableSpace const&, GridDimension const) const;