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

Cleanup after #33396 (#33429)

Browse source 
Mostly formatting improvements, but also recovering a pair of parenthesis
that was accidentally removed, changing the logic.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2024-09-12 21:23:17 +02:00 • committed by GitHub
parent dc018b5f9f
commit 219a2f2038
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 58 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -945,7 +945,7 @@ impl FlexContainer {
let max_box_size = self.config.flex_axis.vec2_to_flex_relative(max_box_size);
let min_box_size = self.config.flex_axis.vec2_to_flex_relative(min_box_size);
(min_box_size.cross, max_box_size.cross.map(Into::into))
(min_box_size.cross, max_box_size.cross)
}
}

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

@ -1148,10 +1148,9 @@ impl NonReplacedFormattingContext {
loop {
// First try to place the block using the minimum size as the object size.
placement_rect = placement.place();
let proposed_inline_size = placement_rect.size.inline -
pbm.padding_border_sums
.inline
.clamp_between_extremums(min_box_size.inline, max_box_size.inline);
let proposed_inline_size = (placement_rect.size.inline -
pbm.padding_border_sums.inline)
.clamp_between_extremums(min_box_size.inline, max_box_size.inline);
// Now lay out the block using the inline size we calculated from the placement.
// Later we'll check to see if the resulting block size is compatible with the

9
components/layout_2020/geom.rs
View file

@ -152,8 +152,7 @@ impl LogicalVec2<LengthPercentageOrAuto<'_>> {
self.block
.non_auto()
.and_then(|value| value.maybe_to_used_value(containing_block_block_size))
.map(|value| AuOrAuto::LengthPercentage(value))
.unwrap_or(AuOrAuto::Auto)
.map_or(AuOrAuto::Auto, AuOrAuto::LengthPercentage)
},
}
}
@ -182,14 +181,12 @@ impl LogicalVec2<LengthPercentageOrAuto<'_>> {
.inline
.non_auto()
.and_then(|value| value.maybe_to_used_value(basis.inline))
.map(|value| AuOrAuto::LengthPercentage(value))
.unwrap_or(AuOrAuto::Auto),
.map_or(AuOrAuto::Auto, AuOrAuto::LengthPercentage),
block: self
.block
.non_auto()
.and_then(|value| value.maybe_to_used_value(basis.block))
.map(|value| AuOrAuto::LengthPercentage(value))
.unwrap_or(AuOrAuto::Auto),
.map_or(AuOrAuto::Auto, AuOrAuto::LengthPercentage),
}
}
}

8
components/layout_2020/style_ext.rs
View file

@ -505,8 +505,8 @@ impl ComputedValuesExt for ComputedValues {
.percentages_relative_to(Au::zero());
PaddingBorderMargin {
padding_border_sums: LogicalVec2 {
inline: (padding.inline_sum() + border.inline_sum()),
block: (padding.block_sum() + border.block_sum()),
inline: padding.inline_sum() + border.inline_sum(),
block: padding.block_sum() + border.block_sum(),
},
padding,
border,
@ -528,8 +528,8 @@ impl ComputedValuesExt for ComputedValues {
.percentages_relative_to(containing_block_inline_size);
PaddingBorderMargin {
padding_border_sums: LogicalVec2 {
inline: (padding.inline_sum() + border.inline_sum()),
block: (padding.block_sum() + border.block_sum()),
inline: padding.inline_sum() + border.inline_sum(),
block: padding.block_sum() + border.block_sum(),
},
padding,
border,

8
components/layout_2020/table/layout.rs
View file

@ -199,8 +199,8 @@ impl<'a> TableLayout<'a> {
.unwrap_or_else(|| cell.style.border_width(writing_mode));
let padding_border_sums = LogicalVec2 {
inline: (padding.inline_sum() + border.inline_sum()),
block: (padding.block_sum() + border.block_sum()),
inline: padding.inline_sum() + border.inline_sum(),
block: padding.block_sum() + border.block_sum(),
};
let (size, min_size, max_size) =
@ -710,8 +710,8 @@ impl<'a> TableLayout<'a> {
.auto_is(Au::zero);
let padding_border_sums = LogicalVec2 {
inline: (padding.inline_sum() + border.inline_sum() + margin.inline_sum()),
block: (padding.block_sum() + border.block_sum() + margin.block_sum()),
inline: padding.inline_sum() + border.inline_sum() + margin.inline_sum(),
block: padding.block_sum() + border.block_sum() + margin.block_sum(),
};
let (size, min_size, max_size) =