Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Allow lazy resolution of automatic minimum sizes (#35965)

Browse source 
`Size::resolve_for_min()` had an `Au` parameter, representing the value
to be used for an automatic minimum size. However, this amount isn't
trivial to compute in flexbox, so this patch changes the parameter to a
function that can be called lazily.

Note flexbox isn't currently using `Size::resolve_for_min()`, but it
will in #35961.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-03-13 23:50:16 +01:00 • committed by GitHub
parent 62d6759106
commit 7cf2fc88a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/layout_2020/flow/mod.rs
View file

@ -170,7 +170,7 @@ impl BlockLevelBox {
let inline_size = content_box_sizes.inline.resolve(
Direction::Inline,
Size::Stretch,
Au::zero(),
Au::zero,
Some(available_inline_size),
get_inline_content_sizes,
false, /* is_table */
@ -1034,7 +1034,7 @@ fn layout_in_flow_non_replaced_block_level_same_formatting_context(
let block_size = block_sizes.resolve(
Direction::Block,
Size::FitContent,
Au::zero(),
Au::zero,
available_block_size,
|| content_block_size.into(),
false, /* is_table */
@ -1158,7 +1158,7 @@ impl IndependentNonReplacedContents {
let block_size = block_sizes.resolve(
Direction::Block,
Size::FitContent,
Au::zero(),
Au::zero,
available_block_size,
|| layout.content_block_size.into(),
layout_style.is_table(),
@ -1292,7 +1292,7 @@ impl IndependentNonReplacedContents {
content_box_sizes.inline.resolve(
Direction::Inline,
automatic_inline_size,
Au::zero(),
Au::zero,
Some(stretch_size),
get_inline_content_sizes,
is_table,
@ -1303,7 +1303,7 @@ impl IndependentNonReplacedContents {
content_box_sizes.block.resolve(
Direction::Block,
Size::FitContent,
Au::zero(),
Au::zero,
available_block_size,
|| layout.content_block_size.into(),
is_table,
@ -1741,7 +1741,7 @@ fn solve_containing_block_padding_and_border_for_in_flow_box<'a>(
let inline_size = content_box_sizes.inline.resolve(
Direction::Inline,
automatic_inline_size,
Au::zero(),
Au::zero,
Some(available_inline_size),
get_inline_content_sizes,
is_table,
@ -2252,7 +2252,7 @@ impl IndependentFormattingContext {
let inline_size = content_box_sizes_and_pbm.content_box_sizes.inline.resolve(
Direction::Inline,
Size::FitContent,
Au::zero(),
Au::zero,
Some(available_inline_size),
get_content_size,
is_table,
@ -2283,7 +2283,7 @@ impl IndependentFormattingContext {
let block_size = content_box_sizes_and_pbm.content_box_sizes.block.resolve(
Direction::Block,
Size::FitContent,
Au::zero(),
Au::zero,
available_block_size,
|| independent_layout.content_block_size.into(),
is_table,