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

Layout: Clean up Au conversion helper functions in the flexbox (#31137)

Browse source 
* cleanup helper functions in flexbox

* fmt
This commit is contained in:
atbrakhi 2024-01-22 10:28:19 +01:00 • committed by GitHub
parent 8dcf3dd0b0
commit 8e6bdb69b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -515,8 +515,8 @@ impl<'a> FlexItem<'a> {
let content_max_size = flex_context.vec2_to_flex_relative(max_size); let content_max_size = flex_context.vec2_to_flex_relative(max_size);
let content_min_size = flex_context.vec2_to_flex_relative(min_size); let content_min_size = flex_context.vec2_to_flex_relative(min_size);
let margin_auto_is_zero = flex_context.sides_to_flex_relative(margin_auto_is_zero); let margin_auto_is_zero = flex_context.sides_to_flex_relative(margin_auto_is_zero);
let padding = flex_context.sides_to_flex_relative(pbm.padding.clone()); let padding = flex_context.sides_to_flex_relative(pbm.padding);
let border = flex_context.sides_to_flex_relative(pbm.border.clone()); let border = flex_context.sides_to_flex_relative(pbm.border);
let padding_border = padding.sum_by_axis() + border.sum_by_axis(); let padding_border = padding.sum_by_axis() + border.sum_by_axis();
let pbm_auto_is_zero = padding_border + margin_auto_is_zero.sum_by_axis(); let pbm_auto_is_zero = padding_border + margin_auto_is_zero.sum_by_axis();
@ -541,8 +541,8 @@ impl<'a> FlexItem<'a> {
content_box_size, content_box_size,
content_min_size, content_min_size,
content_max_size, content_max_size,
padding: flex_relative_slides(flex_context.sides_to_flex_relative(pbm.padding)), padding: padding.map(|t| (*t).into()),
border: flex_relative_slides(flex_context.sides_to_flex_relative(pbm.border)), border: border.map(|t| (*t).into()),
margin, margin,
pbm_auto_is_zero, pbm_auto_is_zero,
flex_base_size, flex_base_size,
@ -853,8 +853,8 @@ impl FlexLine<'_> {
item.box_.style().clone(), item.box_.style().clone(),
item_result.fragments, item_result.fragments,
content_rect, content_rect,
logical_slides(flex_context, item.padding), flex_context.sides_to_flow_relative(item.padding.map(|t| (*t).into())),
logical_slides(flex_context, item.border), flex_context.sides_to_flow_relative(item.border.map(|t| (*t).into())),
margin, margin,
None, /* clearance */ None, /* clearance */
// TODO: We should likely propagate baselines from `display: flex`. // TODO: We should likely propagate baselines from `display: flex`.
@ -1323,28 +1323,3 @@ impl FlexItem<'_> {
self.padding.cross_start.into() self.padding.cross_start.into()
} }
} }
// TODO(#29819): Check if this function can be removed after we convert everything to Au.
fn logical_slides(
flex_context: &mut FlexContext<'_>,
item: FlexRelativeSides<Au>,
) -> LogicalSides<Length> {
let value = flex_context.sides_to_flow_relative(item);
LogicalSides::<Length> {
inline_start: value.inline_start.into(),
inline_end: value.inline_end.into(),
block_start: value.block_start.into(),
block_end: value.block_end.into(),
}
}
// TODO(#29819): Check if this function can be removed after we convert everything to Au.
fn flex_relative_slides(value: FlexRelativeSides<Length>) -> FlexRelativeSides<Au> {
FlexRelativeSides::<Au> {
cross_start: value.cross_start.into(),
cross_end: value.cross_end.into(),
main_start: value.main_start.into(),
main_end: value.main_end.into(),
}
}

3
components/layout_2020/flow/inline.rs
View file

@ -2405,6 +2405,7 @@ impl<'a> ContentSizesComputation<'a> {
had_non_whitespace_content_yet: false, had_non_whitespace_content_yet: false,
linebreaker: None, linebreaker: None,
ending_inline_pbm_stack: Vec::new(), ending_inline_pbm_stack: Vec::new(),
}.traverse(inline_formatting_context) }
.traverse(inline_formatting_context)
} }
} }