Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

layout: Ignore indefinite stretch on min and max sizing properties (#35630)

Browse source 
We were always treating an indefinite `stretch` as the automatic size.
This instead treats it as `0px` on min sizing properties, and as `none`
on max sizing properties, aligning with Blink and this recent CSSWG
resolution: https://github.com/w3c/csswg-drafts/issues/11006

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-02-24 14:51:08 +01:00 • committed by GitHub
parent e74bb8de15
commit 41c2422a66
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 266 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

45
components/layout_2020/flexbox/layout.rs
View file

@ -2753,14 +2753,11 @@ impl FlexItemBox {
}
});
let flex_base_size = if let Some(container_size) = container_definite_inner_size.main {
let stretch_size = Au::zero().max(container_size - pbm_auto_is_zero.main);
used_flex_basis.resolve(Size::MaxContent, stretch_size, &content_size)
} else if matches!(used_flex_basis, Size::Stretch | Size::FitContent) {
content_size.max_content
} else {
used_flex_basis.resolve(Size::MaxContent, Au::zero(), &content_size)
};
let stretch_size = container_definite_inner_size
.main
.map(|container_size| Au::zero().max(container_size - pbm_auto_is_zero.main));
let flex_base_size =
used_flex_basis.resolve_for_preferred(Size::MaxContent, stretch_size, &content_size);
(flex_base_size, flex_base_size_is_definite)
}
@ -2849,7 +2846,7 @@ impl FlexItemBox {
});
content_box_size
.inline
.resolve(initial_behavior, stretch_size, &content_size)
.resolve_for_preferred(initial_behavior, Some(stretch_size), &content_size)
.clamp_between_extremums(min_size.inline, max_size.inline)
};
let item_as_containing_block = ContainingBlock {
@ -2891,31 +2888,31 @@ impl FlexItemBox {
});
content_block_size
};
let content_block_size = LazyCell::new(|| ContentSizes::from(content_block_size()));
match intrinsic_sizing_mode {
IntrinsicSizingMode::Contribution => {
let stretch_size = flex_context
.containing_block
.size
.block
.to_definite()
.map(|block_size| {
block_size -
padding_border_margin.padding_border_sums.block -
padding_border_margin.margin.block_start.auto_is(Au::zero) -
padding_border_margin.margin.block_end.auto_is(Au::zero)
})
.unwrap_or_else(|| content_block_size.max_content);
let stretch_size =
flex_context.containing_block.size.block.to_definite().map(
|block_size| {
block_size -
padding_border_margin.padding_border_sums.block -
padding_border_margin.margin.block_start.auto_is(Au::zero) -
padding_border_margin.margin.block_end.auto_is(Au::zero)
},
);
let inner_block_size = content_box_size
.block
.resolve(Size::FitContent, stretch_size, &content_block_size)
.resolve_for_preferred(
Size::FitContent,
stretch_size,
&LazyCell::new(|| ContentSizes::from(content_block_size())),
)
.clamp_between_extremums(min_size.block, max_size.block);
inner_block_size +
padding_border_margin.padding_border_sums.block +
padding_border_margin.margin.block_start.auto_is(Au::zero) +
padding_border_margin.margin.block_end.auto_is(Au::zero)
},
IntrinsicSizingMode::Size => content_block_size.max_content,
IntrinsicSizingMode::Size => content_block_size(),
}
},
}