RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 20:07:36 +00:00
Code Issues Activity Actions

LibWeb: Determine intrinsic flex container size from content-size

Browse source 
When running the min-content and max-content sizing algorithms and the
target box creates a flex formatting context, we don't need to measure
its children.

FFC has already assigned the content_width and content_height values,
so we just need to pick those up from the container's formatting state.
This commit is contained in:
Andreas Kling 2022-04-06 11:52:13 +02:00
parent 8214a935ab
commit 33887917e4
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Userland/Libraries/LibWeb/Layout/FormattingContext.cpp
View file

@ -816,8 +816,14 @@ FormattingState::IntrinsicSizes FormattingContext::calculate_intrinsic_sizes(Lay
VERIFY(independent_formatting_context); VERIFY(independent_formatting_context);
independent_formatting_context->run(box, LayoutMode::MaxContent); independent_formatting_context->run(box, LayoutMode::MaxContent);
cached_box_sizes.max_content_size.set_width(independent_formatting_context->greatest_child_width(box));
cached_box_sizes.max_content_size.set_height(compute_intrinsic_height(throwaway_state, box)); if (independent_formatting_context->type() == FormattingContext::Type::Flex) {
auto const& box_state = throwaway_state.get(box);
cached_box_sizes.max_content_size = { box_state.content_width, box_state.content_height };
} else {
cached_box_sizes.max_content_size.set_width(independent_formatting_context->greatest_child_width(box));
cached_box_sizes.max_content_size.set_height(compute_intrinsic_height(throwaway_state, box));
}
} }
{ {
@ -828,8 +834,13 @@ FormattingState::IntrinsicSizes FormattingContext::calculate_intrinsic_sizes(Lay
auto independent_formatting_context = const_cast<FormattingContext*>(this)->create_independent_formatting_context_if_needed(throwaway_state, box); auto independent_formatting_context = const_cast<FormattingContext*>(this)->create_independent_formatting_context_if_needed(throwaway_state, box);
VERIFY(independent_formatting_context); VERIFY(independent_formatting_context);
independent_formatting_context->run(box, LayoutMode::MinContent); independent_formatting_context->run(box, LayoutMode::MinContent);
cached_box_sizes.min_content_size.set_width(independent_formatting_context->greatest_child_width(box)); if (independent_formatting_context->type() == FormattingContext::Type::Flex) {
cached_box_sizes.min_content_size.set_height(compute_intrinsic_height(throwaway_state, box)); auto const& box_state = throwaway_state.get(box);
cached_box_sizes.min_content_size = { box_state.content_width, box_state.content_height };
} else {
cached_box_sizes.min_content_size.set_width(independent_formatting_context->greatest_child_width(box));
cached_box_sizes.min_content_size.set_height(compute_intrinsic_height(throwaway_state, box));
}
} }
if (cached_box_sizes.min_content_size.width() > cached_box_sizes.max_content_size.width()) { if (cached_box_sizes.min_content_size.width() > cached_box_sizes.max_content_size.width()) {