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: Change the IndefiniteContainingBlock sizes to Option<Au> (#35653)

Browse source 
Thus avoiding the need to convert to/from `AuOrAuto`.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-02-25 15:24:29 +01:00 • committed by GitHub
parent 31b2f81bc6
commit ebb19bcd60
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 19 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2389,7 +2389,7 @@ impl FlexItemBox {
layout_context,
config
.flex_axis
.vec2_to_flex_relative(containing_block.size.map(|v| v.non_auto())),
.vec2_to_flex_relative(containing_block.size),
cross_axis_is_item_block_axis,
content_box_size,
content_min_size_no_auto,
@ -2498,7 +2498,7 @@ impl FlexItemBox {
fn automatic_min_size(
&self,
layout_context: &LayoutContext,
containing_block_size: FlexRelativeVec2<AuOrAuto>,
containing_block_size: FlexRelativeVec2<Option<Au>>,
cross_axis_is_item_block_axis: bool,
content_box_size: FlexRelativeVec2<Size<Au>>,
min_size: FlexRelativeVec2<GenericLengthPercentageOrAuto<Au>>,
@ -2520,7 +2520,6 @@ impl FlexItemBox {
let specified_size_suggestion = content_box_size.main.maybe_resolve_extrinsic(
containing_block_size
.main
.non_auto()
.map(|v| v - pbm_auto_is_zero.main),
);
@ -2535,7 +2534,6 @@ impl FlexItemBox {
if content_box_size.cross.is_initial() && auto_cross_size_stretches_to_container_size {
containing_block_size
.cross
.non_auto()
.map(|v| v - pbm_auto_is_zero.cross)
} else {
// TODO(#32853): handle size keywords.