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

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

18
components/layout_2020/positioned.rs
View file

@ -500,7 +500,7 @@ impl HoistedAbsolutelyPositionedBox {
let shared_fragment = self.fragment.borrow();
let inline_axis_solver = AbsoluteAxisSolver {
containing_size: cbis,
padding_border_sum: pbm.padding_border_sums.inline,
padding_border_sum: pbm.padding_border_sums.inline.into(),
computed_margin_start: pbm.margin.inline_start,
computed_margin_end: pbm.margin.inline_end,
avoid_negative_margin_start: true,
@ -509,7 +509,7 @@ impl HoistedAbsolutelyPositionedBox {
let block_axis_solver = AbsoluteAxisSolver {
containing_size: cbbs,
padding_border_sum: pbm.padding_border_sums.block,
padding_border_sum: pbm.padding_border_sums.block.into(),
computed_margin_start: pbm.margin.block_start,
computed_margin_end: pbm.margin.block_end,
avoid_negative_margin_start: false,
@ -558,7 +558,7 @@ impl HoistedAbsolutelyPositionedBox {
};
let margin_sum = inline_axis.margin_start + inline_axis.margin_end;
let available_size =
cbis - anchor - pbm.padding_border_sums.inline - margin_sum;
cbis - anchor - pbm.padding_border_sums.inline.into() - margin_sum;
non_replaced
.inline_content_sizes(layout_context)
.shrink_to_fit(available_size.into())
@ -672,15 +672,15 @@ impl HoistedAbsolutelyPositionedBox {
let pb = &pbm.padding + &pbm.border;
let inline_start = match inline_axis.anchor {
Anchor::Start(start) => start + pb.inline_start + margin.inline_start,
Anchor::Start(start) => start + pb.inline_start.into() + margin.inline_start,
Anchor::End(end) => {
cbis - end - pb.inline_end - margin.inline_end - content_size.inline
cbis - end - pb.inline_end.into() - margin.inline_end - content_size.inline
},
};
let block_start = match block_axis.anchor {
Anchor::Start(start) => start + pb.block_start + margin.block_start,
Anchor::Start(start) => start + pb.block_start.into() + margin.block_start,
Anchor::End(end) => {
cbbs - end - pb.block_end - margin.block_end - content_size.block
cbbs - end - pb.block_end.into() - margin.block_end - content_size.block
},
};
@ -700,8 +700,8 @@ impl HoistedAbsolutelyPositionedBox {
absolutely_positioned_box.context.style().clone(),
fragments,
content_rect,
pbm.padding,
pbm.border,
pbm.padding.into(),
pbm.border.into(),
margin,
None, /* clearance */
// We do not set the baseline offset, because absolutely positioned