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

De-indent code in find_block_margin_collapsing_with_parent (#29997)

Browse source
This commit is contained in:
Oriol Brufau 2023-07-13 18:27:21 +02:00 • committed by GitHub
parent 4bf2bca167
commit befc0f5a5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,8 +83,11 @@ impl BlockLevelBox {
let start_margin = pbm.margin.block_start.auto_is(Length::zero); let start_margin = pbm.margin.block_start.auto_is(Length::zero);
collected_margin.adjoin_assign(&CollapsedMargin::new(start_margin)); collected_margin.adjoin_assign(&CollapsedMargin::new(start_margin));
let contents = match self { let child_boxes = match self {
BlockLevelBox::SameFormattingContextBlock { ref contents, .. } => contents, BlockLevelBox::SameFormattingContextBlock { ref contents, .. } => match contents {
BlockContainer::BlockLevelBoxes(boxes) => boxes,
BlockContainer::InlineFormattingContext(_) => return false,
},
_ => return false, _ => return false,
}; };
@ -92,44 +95,39 @@ impl BlockLevelBox {
return false; return false;
} }
match contents { let min_inline_size = style
BlockContainer::BlockLevelBoxes(boxes) => { .content_min_box_size(containing_block, &pbm)
let min_inline_size = style .auto_is(Length::zero)
.content_min_box_size(containing_block, &pbm) .inline;
.auto_is(Length::zero) let max_inline_size = style.content_max_box_size(containing_block, &pbm).inline;
.inline; let inline_size = style
let max_inline_size = style.content_max_box_size(containing_block, &pbm).inline; .content_box_size(containing_block, &pbm)
let inline_size = style .inline
.content_box_size(containing_block, &pbm) .auto_is(|| {
.inline let margin_inline_start = pbm.margin.inline_start.auto_is(Length::zero);
.auto_is(|| { let margin_inline_end = pbm.margin.inline_end.auto_is(Length::zero);
let margin_inline_start = pbm.margin.inline_start.auto_is(Length::zero); containing_block.inline_size -
let margin_inline_end = pbm.margin.inline_end.auto_is(Length::zero); pbm.padding_border_sums.inline -
containing_block.inline_size - margin_inline_start -
pbm.padding_border_sums.inline - margin_inline_end
margin_inline_start - })
margin_inline_end .clamp_between_extremums(min_inline_size, max_inline_size);
})
.clamp_between_extremums(min_inline_size, max_inline_size);
// The block size is irrelevant here. // The block size is irrelevant here.
let block_size = LengthOrAuto::Auto; let block_size = LengthOrAuto::Auto;
let containing_block_for_children = ContainingBlock { let containing_block_for_children = ContainingBlock {
inline_size, inline_size,
block_size, block_size,
style, style,
}; };
if !Self::find_block_margin_collapsing_with_parent_from_slice( if !Self::find_block_margin_collapsing_with_parent_from_slice(
&boxes, &child_boxes,
collected_margin, collected_margin,
&containing_block_for_children, &containing_block_for_children,
) { ) {
return false; return false;
}
},
BlockContainer::InlineFormattingContext(_) => return false,
} }
let block_size_zero = let block_size_zero =