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

Enable min-content, max-content, fit-content and stretch (#33492)

Browse source 
For the sizing properties.

We don't actually support them yet, just treating them as
the initial value.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Oriol Brufau 2024-09-20 16:48:27 +02:00 • committed by GitHub
parent 4bde9af515
commit 9597390d2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
66 changed files with 120 additions and 2798 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2359,9 +2359,10 @@ impl FlexItemBox {
},
}
},
FlexBasis::Size(Size::Auto) => {
FlexBasis::Size(_) => {
// “When specified on a flex item, the `auto` keyword retrieves
// the value of the main size property as the used `flex-basis`.”
// TODO(#32853): Handle other intrinsic keywords.
match content_box_size.main {
AuOrAuto::LengthPercentage(length) => FlexBasis::Size(length),
// “If that value is itself `auto`, then the used value is `content`.”

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

@ -168,8 +168,8 @@ impl BlockLevelBox {
return false;
}
if !block_size_is_zero_or_auto(style.content_block_size(), containing_block) ||
!block_size_is_zero_or_auto(style.min_block_size(), containing_block) ||
if !block_size_is_zero_or_intrinsic(style.content_block_size(), containing_block) ||
!block_size_is_zero_or_intrinsic(style.min_block_size(), containing_block) ||
pbm.padding_border_sums.block != Au::zero()
{
return false;
@ -877,8 +877,8 @@ fn layout_in_flow_non_replaced_block_level_same_formatting_context(
let collapsed_through = collapsible_margins_in_children.collapsed_through &&
pbm.padding_border_sums.block == Au::zero() &&
block_size_is_zero_or_auto(computed_block_size, containing_block) &&
block_size_is_zero_or_auto(style.min_block_size(), containing_block);
block_size_is_zero_or_intrinsic(computed_block_size, containing_block) &&
block_size_is_zero_or_intrinsic(style.min_block_size(), containing_block);
block_margins_collapsed_with_children.collapsed_through = collapsed_through;
let end_margin_can_collapse_with_children = collapsed_through ||
@ -1872,9 +1872,9 @@ impl<'container> PlacementState<'container> {
}
}
fn block_size_is_zero_or_auto(size: &Size, containing_block: &ContainingBlock) -> bool {
fn block_size_is_zero_or_intrinsic(size: &Size, containing_block: &ContainingBlock) -> bool {
match size {
Size::Auto => true,
Size::Auto | Size::MinContent | Size::MaxContent | Size::FitContent | Size::Stretch => true,
Size::LengthPercentage(ref lp) => {
// TODO: Should this resolve definite percentages? Blink does it, Gecko and WebKit don't.
lp.is_definitely_zero() ||

10
components/layout_2020/style_ext.rs
View file

@ -341,7 +341,11 @@ impl ComputedValuesExt for ComputedValues {
fn unwrap(max_size: &MaxSize<NonNegativeLengthPercentage>) -> Option<&LengthPercentage> {
match max_size {
MaxSize::LengthPercentage(length) => Some(&length.0),
MaxSize::None => None,
MaxSize::None |
MaxSize::MinContent |
MaxSize::MaxContent |
MaxSize::FitContent |
MaxSize::Stretch => None,
}
}
let position = self.get_position();
@ -997,7 +1001,9 @@ impl From<stylo::Display> for Display {
fn size_to_length(size: &Size) -> LengthPercentageOrAuto {
match size {
Size::LengthPercentage(length) => LengthPercentageOrAuto::LengthPercentage(&length.0),
Size::Auto => LengthPercentageOrAuto::Auto,
Size::Auto | Size::MinContent | Size::MaxContent | Size::FitContent | Size::Stretch => {
LengthPercentageOrAuto::Auto
},
}
}