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

layout: make padding and border use Au in pbm (#31289)

Browse source 
* use au for padding and border in pbm

* review fix
This commit is contained in:
atbrakhi 2024-02-12 23:49:50 +01:00 • committed by GitHub
parent f25fe3539a
commit 8ba251c95f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 168 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/layout_2020/flow/float.rs
View file

@ -900,7 +900,7 @@ impl FloatBox {
// or non-replaced.
let pbm = style.padding_border_margin(containing_block);
let margin = pbm.margin.auto_is(Length::zero);
let pbm_sums = &(&pbm.padding + &pbm.border) + &margin;
let pbm_sums = &(&pbm.padding + &pbm.border) + &margin.clone().into();
let (content_size, children);
match self.contents {
@ -918,7 +918,7 @@ impl FloatBox {
let tentative_inline_size = box_size.inline.auto_is(|| {
let available_size =
containing_block.inline_size - pbm_sums.inline_sum();
containing_block.inline_size - pbm_sums.inline_sum().into();
non_replaced
.inline_content_sizes(layout_context)
.shrink_to_fit(available_size.into())
@ -976,8 +976,8 @@ impl FloatBox {
style.clone(),
children,
content_rect,
pbm.padding,
pbm.border,
pbm.padding.into(),
pbm.border.into(),
margin,
// Clearance is handled internally by the float placement logic, so there's no need
// to store it explicitly in the fragment.