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

Consistent resolution of cyclic percentages in min sizing properties (#33988)

Browse source 
The spec says that cyclic percentages in min sizing properties should
be resolved against zero when computing intrinsic contributions.
We were already doing that in the inline axis, but we were treating
the entire expression as `auto` in the block axis.

With this patch we will follow the spec in both axes. But note that
browsers don't follo the spec in either axis, so we may have to revisit
(see https://github.com/w3c/csswg-drafts/issues/10969).

calc-min-height-block-1.html now fails because it tests what browsers
do instead of what the spec says.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2024-10-24 14:03:32 +02:00 • committed by GitHub
parent 202cb53d5b
commit 9ad59d1459
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 125 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

57
components/layout_2020/style_ext.rs
View file

@ -413,16 +413,12 @@ impl ComputedValuesExt for ComputedValues {
) -> LogicalVec2<Size<Au>> {
match self.get_position().box_sizing {
BoxSizing::ContentBox => box_size,
BoxSizing::BorderBox => LogicalVec2 {
// These may be negative, but will later be clamped by `min-width`/`min-height`
// which is clamped to zero.
inline: box_size
.inline
.map(|value| value - pbm.padding_border_sums.inline),
block: box_size
.block
.map(|value| value - pbm.padding_border_sums.block),
},
// These may be negative, but will later be clamped by `min-width`/`min-height`
// which is clamped to zero.
BoxSizing::BorderBox => box_size.map_inline_and_block_sizes(
|value| value - pbm.padding_border_sums.inline,
|value| value - pbm.padding_border_sums.block,
),
}
}
@ -431,10 +427,13 @@ impl ComputedValuesExt for ComputedValues {
containing_block: &ContainingBlock,
pbm: &PaddingBorderMargin,
) -> LogicalVec2<Size<Au>> {
let box_size = self
let min_size = self
.min_box_size(containing_block.style.writing_mode)
.percentages_relative_to(containing_block);
self.content_min_box_size_for_min_size(box_size, pbm)
.map_inline_and_block_sizes(
|lp| lp.to_used_value(containing_block.inline_size),
|lp| lp.to_used_value(containing_block.block_size.auto_is(Au::zero)),
);
self.content_min_box_size_for_min_size(min_size, pbm)
}
fn content_min_box_size_deprecated(
@ -453,15 +452,11 @@ impl ComputedValuesExt for ComputedValues {
) -> LogicalVec2<Size<Au>> {
match self.get_position().box_sizing {
BoxSizing::ContentBox => min_box_size,
BoxSizing::BorderBox => LogicalVec2 {
// Clamp to zero to make sure the used size components are non-negative
inline: min_box_size
.inline
.map(|value| (value - pbm.padding_border_sums.inline).max(Au::zero())),
block: min_box_size
.block
.map(|value| (value - pbm.padding_border_sums.block).max(Au::zero())),
},
// Clamp to zero to make sure the used size components are non-negative
BoxSizing::BorderBox => min_box_size.map_inline_and_block_sizes(
|value| Au::zero().max(value - pbm.padding_border_sums.inline),
|value| Au::zero().max(value - pbm.padding_border_sums.block),
),
}
}
@ -493,18 +488,12 @@ impl ComputedValuesExt for ComputedValues {
) -> LogicalVec2<Size<Au>> {
match self.get_position().box_sizing {
BoxSizing::ContentBox => max_box_size,
BoxSizing::BorderBox => {
// This may be negative, but will later be clamped by `min-width`
// which itself is clamped to zero.
LogicalVec2 {
inline: max_box_size
.inline
.map(|value| value - pbm.padding_border_sums.inline),
block: max_box_size
.block
.map(|value| value - pbm.padding_border_sums.block),
}
},
// This may be negative, but will later be clamped by `min-width`
// which itself is clamped to zero.
BoxSizing::BorderBox => max_box_size.map_inline_and_block_sizes(
|value| value - pbm.padding_border_sums.inline,
|value| value - pbm.padding_border_sums.block,
),
}
}