Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use ContentSizes::shrink_to_fit when possible (#33527)

Browse source 
And ensure that the minimum wins for malformed ContentSizes.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2024-09-25 01:53:04 -07:00 • committed by GitHub
parent ade902207f
commit 43d92ecbcb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1737,9 +1737,8 @@ impl FlexItem<'_> {
self.content_max_size.cross,
)
});
(containing_block.inline_size - self.pbm_auto_is_zero.cross)
.min(content_contributions.max_content)
.max(content_contributions.min_content)
content_contributions
.shrink_to_fit(containing_block.inline_size - self.pbm_auto_is_zero.cross)
}),
// The main size of a flex item is considered to be definite if its flex basis is definite
// or the flex container has a definite main size.
@ -2513,10 +2512,8 @@ impl FlexItemBox {
flex_context.layout_context,
&containing_block_for_children,
);
containing_block_inline_size_minus_pbm
.min(inline_content_sizes.max_content)
.max(inline_content_sizes.min_content)
inline_content_sizes
.shrink_to_fit(containing_block_inline_size_minus_pbm)
}
})
.clamp_between_extremums(min_size.inline, max_size.inline);

8
components/layout_2020/sizing.rs
View file

@ -92,9 +92,15 @@ impl AddAssign for ContentSizes {
}
impl ContentSizes {
/// Clamps the provided amount to be between the min-content and the max-content.
/// This is called "shrink-to-fit" in CSS2, and "fit-content" in CSS Sizing.
/// <https://drafts.csswg.org/css2/visudet.html#shrink-to-fit-float>
/// <https://drafts.csswg.org/css-sizing/#funcdef-width-fit-content>
pub fn shrink_to_fit(&self, available_size: Au) -> Au {
available_size.max(self.min_content).min(self.max_content)
// This formula is slightly different than what the spec says,
// to ensure that the minimum wins for a malformed ContentSize
// whose min_content is larger than its max_content.
available_size.min(self.max_content).max(self.min_content)
}
}