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 margin in pbm use app unit (#31621)

Browse source 
* make margin in pbm use app unit

* Simplification

* Consistently resolve inline margins as Au, like block margins

---------

Co-authored-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
atbrakhi 2024-03-13 08:45:20 +05:30 • committed by GitHub
parent 0b4b544910
commit 0fda14263a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 119 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -113,9 +113,9 @@ impl<'a> PlacementAmongFloats<'a> {
(current_bands, next_band)
};
let min_inline_start = float_context.containing_block_info.inline_start +
pbm.margin.inline_start.auto_is(Length::zero).into();
pbm.margin.inline_start.auto_is(Au::zero);
let max_inline_end = (float_context.containing_block_info.inline_end -
pbm.margin.inline_end.auto_is(Length::zero).into())
pbm.margin.inline_end.auto_is(Au::zero))
.max(min_inline_start + object_size.inline);
PlacementAmongFloats {
float_context,
@ -259,7 +259,7 @@ impl<'a> PlacementAmongFloats<'a> {
pub(crate) fn set_inline_size(&mut self, inline_size: Au, pbm: &PaddingBorderMargin) {
self.object_size.inline = inline_size;
self.max_inline_end = (self.float_context.containing_block_info.inline_end -
pbm.margin.inline_end.auto_is(Length::zero).into())
pbm.margin.inline_end.auto_is(Au::zero))
.max(self.min_inline_start + inline_size);
}
@ -911,8 +911,8 @@ impl FloatBox {
// Margin is computed this way regardless of whether the element is replaced
// 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.clone().into();
let margin = pbm.margin.auto_is(Au::zero);
let pbm_sums = &(&pbm.padding + &pbm.border) + &margin.clone();
let (content_size, children);
match self.contents {
@ -991,7 +991,7 @@ impl FloatBox {
content_rect,
pbm.padding.into(),
pbm.border.into(),
margin,
margin.into(),
// Clearance is handled internally by the float placement logic, so there's no need
// to store it explicitly in the fragment.
None, // clearance

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

@ -724,7 +724,8 @@ impl<'a, 'b> InlineFormattingContextState<'a, 'b> {
.pbm
.margin
.inline_start
.auto_is(Length::zero)
.auto_is(Au::zero)
.into()
}
let line_item = inline_box_state
@ -758,7 +759,12 @@ impl<'a, 'b> InlineFormattingContextState<'a, 'b> {
if inline_box_state.is_last_fragment {
let pbm_end = Length::from(
inline_box_state.pbm.padding.inline_end + inline_box_state.pbm.border.inline_end,
) + inline_box_state.pbm.margin.inline_end.auto_is(Length::zero);
) + inline_box_state
.pbm
.margin
.inline_end
.auto_is(Au::zero)
.into();
self.current_line_segment.inline_size += pbm_end;
}
}
@ -1922,8 +1928,8 @@ impl IndependentFormattingContext {
) {
let style = self.style();
let pbm = style.padding_border_margin(ifc.containing_block);
let margin = pbm.margin.auto_is(Length::zero);
let pbm_sums = &(&pbm.padding + &pbm.border) + &margin.clone().into();
let margin = pbm.margin.auto_is(Au::zero);
let pbm_sums = &(&pbm.padding + &pbm.border) + &margin.clone();
let mut child_positioning_context = None;
// We need to know the inline size of the atomic before deciding whether to do the line break.
@ -1950,7 +1956,7 @@ impl IndependentFormattingContext {
content_rect.into(),
pbm.padding.into(),
pbm.border.into(),
margin,
margin.into(),
None, /* clearance */
CollapsedBlockMargins::zero(),
)
@ -2039,7 +2045,7 @@ impl IndependentFormattingContext {
content_rect.into(),
pbm.padding.into(),
pbm.border.into(),
margin,
margin.into(),
None,
CollapsedBlockMargins::zero(),
)

14
components/layout_2020/flow/line.rs
View file

@ -294,19 +294,19 @@ impl InlineBoxLineItem {
let style = self.style.clone();
let mut padding = self.pbm.padding.clone();
let mut border = self.pbm.border.clone();
let mut margin = self.pbm.margin.auto_is(Length::zero);
let mut margin = self.pbm.margin.auto_is(Au::zero);
if !self.is_first_fragment {
padding.inline_start = Au::zero();
border.inline_start = Au::zero();
margin.inline_start = Length::zero();
margin.inline_start = Au::zero();
}
if !self.is_last_fragment_of_ib_split {
padding.inline_end = Au::zero();
border.inline_end = Au::zero();
margin.inline_end = Length::zero();
margin.inline_end = Au::zero();
}
let pbm_sums = &(&padding + &border) + &margin.map(|t| (*t).into());
let pbm_sums = &(&padding + &border) + &margin;
state.inline_position += pbm_sums.inline_start.into();
let space_above_baseline = self.calculate_space_above_baseline();
@ -342,9 +342,9 @@ impl InlineBoxLineItem {
if !self.is_last_fragment_of_ib_split || !saw_end {
padding.inline_end = Au::zero();
border.inline_end = Au::zero();
margin.inline_end = Length::zero();
margin.inline_end = Au::zero();
}
let pbm_sums = &(&padding + &border) + &margin.clone().into();
let pbm_sums = &(&padding + &border) + &margin.clone();
// If the inline box didn't have any content at all, don't add a Fragment for it.
let box_has_padding_border_or_margin = pbm_sums.inline_sum() > Au::zero();
@ -385,7 +385,7 @@ impl InlineBoxLineItem {
content_rect,
padding.into(),
border.into(),
margin,
margin.into(),
None, /* clearance */
CollapsedBlockMargins::zero(),
);

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

@ -116,8 +116,8 @@ impl BlockLevelBox {
}
let pbm = style.padding_border_margin(containing_block);
let start_margin = pbm.margin.block_start.auto_is(Length::zero);
collected_margin.adjoin_assign(&CollapsedMargin::new(start_margin));
let start_margin = pbm.margin.block_start.auto_is(Au::zero);
collected_margin.adjoin_assign(&CollapsedMargin::new(start_margin.into()));
let child_boxes = match self {
BlockLevelBox::SameFormattingContextBlock { ref contents, .. } => match contents {
@ -140,11 +140,13 @@ impl BlockLevelBox {
.content_box_size(containing_block, &pbm)
.inline
.auto_is(|| {
let margin_inline_start = pbm.margin.inline_start.auto_is(Length::zero);
let margin_inline_end = pbm.margin.inline_end.auto_is(Length::zero);
Length::from(containing_block.inline_size - pbm.padding_border_sums.inline) -
let margin_inline_start = pbm.margin.inline_start.auto_is(Au::zero);
let margin_inline_end = pbm.margin.inline_end.auto_is(Au::zero);
(containing_block.inline_size -
pbm.padding_border_sums.inline -
margin_inline_start -
margin_inline_end
margin_inline_end)
.into()
})
.clamp_between_extremums(min_inline_size, max_inline_size);
@ -173,8 +175,8 @@ impl BlockLevelBox {
return false;
}
let end_margin = pbm.margin.block_end.auto_is(Length::zero);
collected_margin.adjoin_assign(&CollapsedMargin::new(end_margin));
let end_margin = pbm.margin.block_end.auto_is(Au::zero);
collected_margin.adjoin_assign(&CollapsedMargin::new(end_margin.into()));
true
}
@ -933,7 +935,7 @@ impl NonReplacedFormattingContext {
let effective_margin_inline_start;
let (margin_block_start, margin_block_end) =
solve_block_margins_for_in_flow_block_level(&pbm);
let collapsed_margin_block_start = CollapsedMargin::new(margin_block_start);
let collapsed_margin_block_start = CollapsedMargin::new(margin_block_start.into());
// From https://drafts.csswg.org/css2/#floats:
// "The border box of a table, a block-level replaced element, or an element in
@ -1111,10 +1113,10 @@ impl NonReplacedFormattingContext {
}
let margin = LogicalSides {
inline_start: margin_inline_start,
inline_end: margin_inline_end,
block_start: margin_block_start,
block_end: margin_block_end,
inline_start: margin_inline_start.into(),
inline_end: margin_inline_end.into(),
block_start: margin_block_start.into(),
block_end: margin_block_end.into(),
};
// Clearance prevents margin collapse between this block and previous ones,
@ -1139,7 +1141,7 @@ impl NonReplacedFormattingContext {
clearance.unwrap_or_else(Length::zero).into(),
inline: pbm.padding.inline_start +
pbm.border.inline_start +
effective_margin_inline_start.into(),
effective_margin_inline_start,
},
size: content_size.into(),
};
@ -1191,7 +1193,7 @@ fn layout_in_flow_replaced_block_level(
// sufficient space. They may even make the border box of said element narrower
// 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 collapsed_margin_block_start = CollapsedMargin::new(margin_block_start.into());
let size = &content_size + &pbm.padding_border_sums.clone();
(
clearance,
@ -1217,7 +1219,7 @@ fn layout_in_flow_replaced_block_level(
sequential_layout_state.collapse_margins();
sequential_layout_state
.advance_block_position(size.block + clearance.unwrap_or_else(Length::zero).into());
sequential_layout_state.adjoin_assign(&CollapsedMargin::new(margin_block_end));
sequential_layout_state.adjoin_assign(&CollapsedMargin::new(margin_block_end.into()));
} else {
clearance = None;
(
@ -1231,19 +1233,17 @@ fn layout_in_flow_replaced_block_level(
};
let margin = LogicalSides {
inline_start: margin_inline_start,
inline_end: margin_inline_end,
block_start: margin_block_start,
block_end: margin_block_end,
inline_start: margin_inline_start.into(),
inline_end: margin_inline_end.into(),
block_start: margin_block_start.into(),
block_end: margin_block_end.into(),
};
let start_corner = LogicalVec2 {
block: pbm.padding.block_start +
pbm.border.block_start +
clearance.unwrap_or_else(Length::zero).into(),
inline: pbm.padding.inline_start +
pbm.border.inline_start +
effective_margin_inline_start.into(),
inline: pbm.padding.inline_start + pbm.border.inline_start + effective_margin_inline_start,
};
let content_rect = LogicalRect {
@ -1306,11 +1306,13 @@ fn solve_containing_block_padding_and_border_for_in_flow_box<'a>(
let inline_size = box_size
.inline
.auto_is(|| {
let margin_inline_start = pbm.margin.inline_start.auto_is(Length::zero);
let margin_inline_end = pbm.margin.inline_end.auto_is(Length::zero);
Length::from(containing_block.inline_size - pbm.padding_border_sums.inline) -
let margin_inline_start = pbm.margin.inline_start.auto_is(Au::zero);
let margin_inline_end = pbm.margin.inline_end.auto_is(Au::zero);
(containing_block.inline_size -
pbm.padding_border_sums.inline -
margin_inline_start -
margin_inline_end
margin_inline_end)
.into()
})
.clamp_between_extremums(min_box_size.inline, max_box_size.inline);
@ -1353,22 +1355,22 @@ fn solve_margins(
let block_margins = solve_block_margins_for_in_flow_block_level(pbm);
ResolvedMargins {
margin: LogicalSides {
inline_start: inline_margins.0,
inline_end: inline_margins.1,
block_start: block_margins.0,
block_end: block_margins.1,
inline_start: inline_margins.0.into(),
inline_end: inline_margins.1.into(),
block_start: block_margins.0.into(),
block_end: block_margins.1.into(),
},
effective_margin_inline_start,
effective_margin_inline_start: effective_margin_inline_start.into(),
}
}
/// Resolves 'auto' margins of an in-flow block-level box in the block axis.
/// <https://drafts.csswg.org/css2/#normal-block>
/// <https://drafts.csswg.org/css2/#block-root-margin>
fn solve_block_margins_for_in_flow_block_level(pbm: &PaddingBorderMargin) -> (Length, Length) {
fn solve_block_margins_for_in_flow_block_level(pbm: &PaddingBorderMargin) -> (Au, Au) {
(
pbm.margin.block_start.auto_is(Length::zero),
pbm.margin.block_end.auto_is(Length::zero),
pbm.margin.block_start.auto_is(Au::zero),
pbm.margin.block_end.auto_is(Au::zero),
)
}
@ -1377,18 +1379,18 @@ fn solve_block_margins_for_in_flow_block_level(pbm: &PaddingBorderMargin) -> (Le
/// The provided free space should already take margins into account. In particular,
/// it should be zero if there is an auto margin.
/// <https://drafts.csswg.org/css-align/#justify-block>
fn justify_self_alignment(containing_block: &ContainingBlock, free_space: Length) -> Length {
fn justify_self_alignment(containing_block: &ContainingBlock, free_space: Au) -> Au {
let style = containing_block.style;
debug_assert!(free_space >= Length::zero());
debug_assert!(free_space >= Au::zero());
match style.clone_text_align() {
TextAlignKeyword::ServoCenter => free_space / 2.,
TextAlignKeyword::ServoCenter => free_space / 2,
TextAlignKeyword::ServoLeft if !style.writing_mode.line_left_is_inline_start() => {
free_space
},
TextAlignKeyword::ServoRight if style.writing_mode.line_left_is_inline_start() => {
free_space
},
_ => Length::zero(),
_ => Au::zero(),
}
}
@ -1408,25 +1410,25 @@ fn solve_inline_margins_for_in_flow_block_level(
containing_block: &ContainingBlock,
pbm: &PaddingBorderMargin,
inline_size: Length,
) -> ((Length, Length), Length) {
) -> ((Au, Au), Au) {
let free_space =
Length::from(containing_block.inline_size - pbm.padding_border_sums.inline) - inline_size;
let mut justification = Length::zero();
containing_block.inline_size - pbm.padding_border_sums.inline - inline_size.into();
let mut justification = Au::zero();
let inline_margins = match (pbm.margin.inline_start, pbm.margin.inline_end) {
(LengthOrAuto::Auto, LengthOrAuto::Auto) => {
let start = Length::zero().max(free_space / 2.);
(AuOrAuto::Auto, AuOrAuto::Auto) => {
let start = Au::zero().max(free_space / 2);
(start, free_space - start)
},
(LengthOrAuto::Auto, LengthOrAuto::LengthPercentage(end)) => {
(Length::zero().max(free_space - end), end)
(AuOrAuto::Auto, AuOrAuto::LengthPercentage(end)) => {
(Au::zero().max(free_space - end), end)
},
(LengthOrAuto::LengthPercentage(start), LengthOrAuto::Auto) => (start, free_space - start),
(LengthOrAuto::LengthPercentage(start), LengthOrAuto::LengthPercentage(end)) => {
(AuOrAuto::LengthPercentage(start), AuOrAuto::Auto) => (start, free_space - start),
(AuOrAuto::LengthPercentage(start), AuOrAuto::LengthPercentage(end)) => {
// In the cases above, the free space is zero after taking 'auto' margins into account.
// But here we may still have some free space to perform 'justify-self' alignment.
// This aligns the margin box within the containing block, or in other words,
// aligns the border box within the margin-shrunken containing block.
let free_space = Length::zero().max(free_space - start - end);
let free_space = Au::zero().max(free_space - start - end);
justification = justify_self_alignment(containing_block, free_space);
(start, end)
},
@ -1450,25 +1452,21 @@ fn solve_inline_margins_avoiding_floats(
pbm: &PaddingBorderMargin,
inline_size: Length,
placement_rect: LogicalRect<Length>,
) -> ((Length, Length), Length) {
let free_space = placement_rect.size.inline - inline_size;
debug_assert!(free_space >= Length::zero());
) -> ((Au, Au), Au) {
let free_space = Au::from(placement_rect.size.inline - inline_size);
debug_assert!(free_space >= Au::zero());
let cb_info = &sequential_layout_state.floats.containing_block_info;
let start_adjustment = placement_rect.start_corner.inline - cb_info.inline_start.into();
let end_adjustment = Length::from(cb_info.inline_end) - placement_rect.max_inline_position();
let mut justification = Length::zero();
let start_adjustment = Au::from(placement_rect.start_corner.inline) - cb_info.inline_start;
let end_adjustment = cb_info.inline_end - placement_rect.max_inline_position().into();
let mut justification = Au::zero();
let inline_margins = match (pbm.margin.inline_start, pbm.margin.inline_end) {
(LengthOrAuto::Auto, LengthOrAuto::Auto) => {
let half = free_space / 2.;
(AuOrAuto::Auto, AuOrAuto::Auto) => {
let half = free_space / 2;
(start_adjustment + half, end_adjustment + free_space - half)
},
(LengthOrAuto::Auto, LengthOrAuto::LengthPercentage(end)) => {
(start_adjustment + free_space, end)
},
(LengthOrAuto::LengthPercentage(start), LengthOrAuto::Auto) => {
(start, end_adjustment + free_space)
},
(LengthOrAuto::LengthPercentage(start), LengthOrAuto::LengthPercentage(end)) => {
(AuOrAuto::Auto, AuOrAuto::LengthPercentage(end)) => (start_adjustment + free_space, end),
(AuOrAuto::LengthPercentage(start), AuOrAuto::Auto) => (start, end_adjustment + free_space),
(AuOrAuto::LengthPercentage(start), AuOrAuto::LengthPercentage(end)) => {
// The spec says 'justify-self' aligns the margin box within the float-shrunken
// containing block. That's wrong (https://github.com/w3c/csswg-drafts/issues/9963),
// and Blink and WebKit are broken anyways. So we match Gecko instead: this aligns
@ -1494,7 +1492,7 @@ fn solve_clearance_and_inline_margins_avoiding_floats(
pbm: &PaddingBorderMargin,
size: LogicalVec2<Length>,
style: &Arc<ComputedValues>,
) -> (Option<Length>, (Length, Length), Length) {
) -> (Option<Length>, (Au, Au), Au) {
let (clearance, placement_rect) = sequential_layout_state
.calculate_clearance_and_inline_adjustment(
style.get_box().clear,