mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
use app unit in replaced elements (#31178)
* use app unit in replaced elements * more app unit usage * Avoid unnecessary into() * Run ./mach fmt * use scaleby * update --------- Co-authored-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
parent
271176094d
commit
091653417a
6 changed files with 82 additions and 70 deletions
|
@ -1151,14 +1151,14 @@ fn layout_in_flow_replaced_block_level<'a>(
|
|||
// than defined by section 10.3.3. CSS 2 does not define when a UA may put said
|
||||
// element next to the float or by how much said element may become narrower."
|
||||
let collapsed_margin_block_start = CollapsedMargin::new(margin_block_start);
|
||||
let size = &content_size + &pbm.padding_border_sums;
|
||||
let size = &content_size + &pbm.padding_border_sums.clone().into();
|
||||
(clearance, (margin_inline_start, margin_inline_end)) =
|
||||
solve_clearance_and_inline_margins_avoiding_floats(
|
||||
sequential_layout_state,
|
||||
containing_block,
|
||||
&collapsed_margin_block_start,
|
||||
&pbm,
|
||||
size.clone(),
|
||||
size.clone().into(),
|
||||
style,
|
||||
);
|
||||
|
||||
|
@ -1172,14 +1172,14 @@ fn layout_in_flow_replaced_block_level<'a>(
|
|||
// Margins can never collapse into replaced elements.
|
||||
sequential_layout_state.collapse_margins();
|
||||
sequential_layout_state
|
||||
.advance_block_position((size.block + clearance.unwrap_or_else(Length::zero)).into());
|
||||
.advance_block_position(size.block + clearance.unwrap_or_else(Length::zero).into());
|
||||
sequential_layout_state.adjoin_assign(&CollapsedMargin::new(margin_block_end));
|
||||
} else {
|
||||
clearance = None;
|
||||
(margin_inline_start, margin_inline_end) = solve_inline_margins_for_in_flow_block_level(
|
||||
containing_block,
|
||||
&pbm,
|
||||
content_size.inline,
|
||||
content_size.inline.into(),
|
||||
);
|
||||
};
|
||||
|
||||
|
@ -1199,7 +1199,7 @@ fn layout_in_flow_replaced_block_level<'a>(
|
|||
|
||||
let content_rect = LogicalRect {
|
||||
start_corner,
|
||||
size: content_size,
|
||||
size: content_size.into(),
|
||||
};
|
||||
let block_margins_collapsed_with_children = CollapsedBlockMargins::from_margin(&margin);
|
||||
BoxFragment::new(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue