Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Make a new ContainingBlockSize type (#34565)

Browse source 
This might make caching these values a bit easier in the future.
Correcting the visibility of `ContainingBlock` also exposed some new
rustc and clippy warnings that are fixed here.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Co-authored-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Martin Robinson 2024-12-11 15:40:04 +01:00 • committed by GitHub
parent 064569ff3c
commit f1b8d49e77
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 192 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1190,6 +1190,6 @@ impl SequentialLayoutState {
.size
.to_logical(container_writing_mode),
}
.to_physical(Some(containing_block));
.as_physical(Some(containing_block));
}
}

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

@ -28,7 +28,7 @@ use crate::geom::{AuOrAuto, LogicalRect, LogicalVec2, PhysicalRect, ToLogical};
use crate::positioned::{
relative_adjustement, AbsolutelyPositionedBox, PositioningContext, PositioningContextLength,
};
use crate::ContainingBlock;
use crate::{ContainingBlock, ContainingBlockSize};
pub(super) struct LineMetrics {
/// The block offset of the line start in the containing
@ -293,7 +293,7 @@ impl<'layout_data, 'layout> LineItemLayout<'layout_data, 'layout> {
// we know the width of the containing inline block. This step converts the logical rectangle
// into a physical one based on the inline formatting context width.
if let Some(content_rect) = fragment.content_rect_mut() {
*content_rect = logical_rect.to_physical(Some(self.layout.containing_block))
*content_rect = logical_rect.as_physical(Some(self.layout.containing_block))
}
fragment
@ -430,8 +430,10 @@ impl<'layout_data, 'layout> LineItemLayout<'layout_data, 'layout> {
let ifc_writing_mode = self.layout.containing_block.style.writing_mode;
let inline_box_containing_block = ContainingBlock {
inline_size: content_rect.size.inline,
block_size: AuOrAuto::Auto,
size: ContainingBlockSize {
inline: content_rect.size.inline,
block: AuOrAuto::Auto,
},
style: self.layout.containing_block.style,
};
let fragments = inner_state
@ -447,7 +449,7 @@ impl<'layout_data, 'layout> LineItemLayout<'layout_data, 'layout> {
// We do not know the actual physical position of a logically laid out inline element, until
// we know the width of the containing inline block. This step converts the logical rectangle
// into a physical one now that we've computed inline size of the containing inline block above.
*content_rect = logical_rect.to_physical(Some(&inline_box_containing_block))
*content_rect = logical_rect.as_physical(Some(&inline_box_containing_block))
}
}
fragment
@ -456,7 +458,7 @@ impl<'layout_data, 'layout> LineItemLayout<'layout_data, 'layout> {
// Previously all the fragment's children were positioned relative to the linebox,
// but they need to be made relative to this fragment.
let physical_content_rect = content_rect.to_physical(Some(self.layout.containing_block));
let physical_content_rect = content_rect.as_physical(Some(self.layout.containing_block));
let mut fragment = BoxFragment::new(
inline_box.base_fragment_info,
style.clone(),
@ -619,7 +621,7 @@ impl<'layout_data, 'layout> LineItemLayout<'layout_data, 'layout> {
if let Some(mut positioning_context) = atomic.positioning_context {
let physical_rect_as_if_in_root =
content_rect.to_physical(Some(self.layout.containing_block));
content_rect.as_physical(Some(self.layout.containing_block));
positioning_context.adjust_static_position_of_hoisted_fragments_with_offset(
&physical_rect_as_if_in_root.origin.to_vector(),
PositioningContextLength::zero(),
@ -672,7 +674,7 @@ impl<'layout_data, 'layout> LineItemLayout<'layout_data, 'layout> {
start_corner: initial_start_corner,
size: LogicalVec2::zero(),
}
.to_physical(Some(self.layout.containing_block));
.as_physical(Some(self.layout.containing_block));
let hoisted_box = AbsolutelyPositionedBox::to_hoisted(
absolute.absolutely_positioned_box.clone(),

14
components/layout_2020/flow/inline/mod.rs
View file

@ -905,11 +905,11 @@ impl<'layout_dta> InlineFormattingContextLayout<'layout_dta> {
let physical_line_rect = LogicalRect {
start_corner,
size: LogicalVec2 {
inline: self.containing_block.inline_size,
inline: self.containing_block.size.inline,
block: effective_block_advance.resolve(),
},
}
.to_physical(Some(self.containing_block));
.as_physical(Some(self.containing_block));
self.fragments
.push(Fragment::Positioning(PositioningFragment::new_anonymous(
physical_line_rect,
@ -975,7 +975,7 @@ impl<'layout_dta> InlineFormattingContextLayout<'layout_dta> {
placement_among_floats.start_corner.inline,
placement_among_floats.size.inline,
),
None => (Au::zero(), self.containing_block.inline_size),
None => (Au::zero(), self.containing_block.size.inline),
};
// Properly handling text-indent requires that we do not align the text
@ -1061,7 +1061,7 @@ impl<'layout_dta> InlineFormattingContextLayout<'layout_dta> {
let available_inline_size = match self.current_line.placement_among_floats.get() {
Some(placement_among_floats) => placement_among_floats.size.inline,
None => self.containing_block.inline_size,
None => self.containing_block.size.inline,
} - line_inline_size_without_trailing_whitespace;
// If this float doesn't fit on the current line or a previous float didn't fit on
@ -1146,7 +1146,7 @@ impl<'layout_dta> InlineFormattingContextLayout<'layout_dta> {
.size
} else {
LogicalVec2 {
inline: self.containing_block.inline_size,
inline: self.containing_block.size.inline,
block: MAX_AU,
}
};
@ -1179,7 +1179,7 @@ impl<'layout_dta> InlineFormattingContextLayout<'layout_dta> {
// If the potential line is larger than the containing block we do not even need to consider
// floats. We definitely have to do a linebreak.
if potential_line_size.inline > self.containing_block.inline_size {
if potential_line_size.inline > self.containing_block.size.inline {
return true;
}
@ -1605,7 +1605,7 @@ impl InlineFormattingContext {
.get_inherited_text()
.text_indent
.length
.to_used_value(containing_block.inline_size)
.to_used_value(containing_block.size.inline)
} else {
Au::zero()
};

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

@ -44,7 +44,10 @@ use crate::sizing::{self, ContentSizes, InlineContentSizesResult};
use crate::style_ext::{
Clamp, ComputedValuesExt, ContentBoxSizesAndPBMDeprecated, PaddingBorderMargin,
};
use crate::{ConstraintSpace, ContainingBlock, IndefiniteContainingBlock, SizeConstraint};
use crate::{
ConstraintSpace, ContainingBlock, ContainingBlockSize, IndefiniteContainingBlock,
SizeConstraint,
};
mod construct;
pub mod float;
@ -149,7 +152,7 @@ impl BlockLevelBox {
.auto_is(|| {
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 -
containing_block.size.inline -
pbm.padding_border_sums.inline -
margin_inline_start -
margin_inline_end
@ -160,8 +163,10 @@ impl BlockLevelBox {
.map(|size| size.clamp_between_extremums(min_size.block, max_size.block));
let containing_block_for_children = ContainingBlock {
inline_size,
block_size,
size: ContainingBlockSize {
inline: inline_size,
block: block_size,
},
style,
};
@ -242,8 +247,10 @@ impl OutsideMarker {
.block_container
.inline_content_sizes(layout_context, &constraint_space);
let containing_block_for_children = ContainingBlock {
inline_size: content_sizes.sizes.max_content,
block_size: AuOrAuto::auto(),
size: ContainingBlockSize {
inline: content_sizes.sizes.max_content,
block: AuOrAuto::auto(),
},
style: &self.marker_style,
};
@ -306,7 +313,7 @@ impl OutsideMarker {
base_fragment_info,
self.marker_style.clone(),
flow_layout.fragments,
content_rect.to_physical(Some(containing_block)),
content_rect.as_physical(Some(containing_block)),
PhysicalSides::zero(),
PhysicalSides::zero(),
PhysicalSides::zero(),
@ -324,7 +331,7 @@ impl BlockFormattingContext {
containing_block: &ContainingBlock,
) -> IndependentLayout {
let mut sequential_layout_state = if self.contains_floats || !layout_context.use_rayon {
Some(SequentialLayoutState::new(containing_block.inline_size))
Some(SequentialLayoutState::new(containing_block.size.inline))
} else {
None
};
@ -792,7 +799,7 @@ fn layout_in_flow_non_replaced_block_level_same_formatting_context(
} = solve_margins(
containing_block,
&pbm,
containing_block_for_children.inline_size,
containing_block_for_children.size.inline,
);
let computed_block_size = style.content_block_size();
@ -867,7 +874,7 @@ fn layout_in_flow_non_replaced_block_level_same_formatting_context(
block_start: sequential_layout_state.bfc_relative_block_position,
block_start_margins_not_collapsed: sequential_layout_state.current_margin,
inline_start,
inline_end: inline_start + containing_block_for_children.inline_size,
inline_end: inline_start + containing_block_for_children.size.inline,
};
parent_containing_block_position_info = Some(
sequential_layout_state.replace_containing_block_position_info(new_cb_offsets),
@ -960,7 +967,7 @@ fn layout_in_flow_non_replaced_block_level_same_formatting_context(
},
size: LogicalVec2 {
block: block_size,
inline: containing_block_for_children.inline_size,
inline: containing_block_for_children.size.inline,
},
};
@ -974,7 +981,7 @@ fn layout_in_flow_non_replaced_block_level_same_formatting_context(
base_fragment_info,
style.clone(),
flow_layout.fragments,
content_rect.to_physical(Some(containing_block)),
content_rect.as_physical(Some(containing_block)),
pbm.padding.to_physical(containing_block_writing_mode),
pbm.border.to_physical(containing_block_writing_mode),
margin.to_physical(containing_block_writing_mode),
@ -1034,7 +1041,7 @@ impl IndependentNonReplacedContents {
.block
.auto_is(|| layout.content_block_size)
.clamp_between_extremums(min_box_size.block, max_box_size.block),
containing_block_for_children.inline_size,
containing_block_for_children.size.inline,
),
};
@ -1069,7 +1076,7 @@ impl IndependentNonReplacedContents {
base_fragment_info,
base.style.clone(),
layout.fragments,
content_rect.to_physical(Some(containing_block)),
content_rect.as_physical(Some(containing_block)),
pbm.padding.to_physical(containing_block_writing_mode),
pbm.border.to_physical(containing_block_writing_mode),
margin.to_physical(containing_block_writing_mode),
@ -1136,8 +1143,10 @@ impl IndependentNonReplacedContents {
layout_context,
positioning_context,
&ContainingBlock {
inline_size,
block_size,
size: ContainingBlockSize {
inline: inline_size,
block: block_size,
},
style,
},
containing_block,
@ -1215,8 +1224,10 @@ impl IndependentNonReplacedContents {
layout_context,
positioning_context,
&ContainingBlock {
inline_size: proposed_inline_size,
block_size,
size: ContainingBlockSize {
inline: proposed_inline_size,
block: block_size,
},
style,
},
containing_block,
@ -1337,7 +1348,7 @@ impl IndependentNonReplacedContents {
base_fragment_info,
style.clone(),
layout.fragments,
content_rect.to_physical(Some(containing_block)),
content_rect.as_physical(Some(containing_block)),
pbm.padding.to_physical(containing_block_writing_mode),
pbm.border.to_physical(containing_block_writing_mode),
margin.to_physical(containing_block_writing_mode),
@ -1448,7 +1459,7 @@ impl ReplacedContents {
start_corner,
size: content_size,
}
.to_physical(Some(containing_block));
.as_physical(Some(containing_block));
let mut base_fragment_info = base.base_fragment_info;
if content_box_sizes_and_pbm.depends_on_block_constraints {
@ -1507,8 +1518,10 @@ fn solve_containing_block_padding_and_border_for_in_flow_box<'a>(
// > Anonymous block boxes are ignored when resolving percentage values that would
// > refer to it: the closest non-anonymous ancestor box is used instead.
let containing_block_for_children = ContainingBlock {
inline_size: containing_block.inline_size,
block_size: containing_block.block_size,
size: ContainingBlockSize {
inline: containing_block.size.inline,
block: containing_block.size.block,
},
style,
};
// <https://drafts.csswg.org/css2/#anonymous-block-level>
@ -1544,7 +1557,7 @@ fn solve_containing_block_padding_and_border_for_in_flow_box<'a>(
.auto_is(|| {
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 -
containing_block.size.inline -
pbm.padding_border_sums.inline -
margin_inline_start -
margin_inline_end
@ -1560,8 +1573,10 @@ fn solve_containing_block_padding_and_border_for_in_flow_box<'a>(
}
let containing_block_for_children = ContainingBlock {
inline_size,
block_size,
size: ContainingBlockSize {
inline: inline_size,
block: block_size,
},
style,
};
// https://drafts.csswg.org/css-writing-modes/#orthogonal-flows
@ -1649,7 +1664,7 @@ fn solve_inline_margins_for_in_flow_block_level(
pbm: &PaddingBorderMargin,
inline_size: Au,
) -> ((Au, Au), Au) {
let free_space = containing_block.inline_size - pbm.padding_border_sums.inline - inline_size;
let free_space = containing_block.size.inline - pbm.padding_border_sums.inline - inline_size;
let mut justification = Au::zero();
let inline_margins = match (pbm.margin.inline_start, pbm.margin.inline_end) {
(AuOrAuto::Auto, AuOrAuto::Auto) => {
@ -1936,7 +1951,7 @@ impl<'container> PlacementState<'container> {
},
size: LogicalVec2::zero(),
}
.to_physical(Some(self.containing_block));
.as_physical(Some(self.containing_block));
},
Fragment::Float(box_fragment) => {
let sequential_layout_state = sequential_layout_state
@ -1995,7 +2010,7 @@ fn block_size_is_zero_or_intrinsic(size: &StyleSize, containing_block: &Containi
StyleSize::LengthPercentage(ref lp) => {
// TODO: Should this resolve definite percentages? Blink does it, Gecko and WebKit don't.
lp.is_definitely_zero() ||
(lp.0.has_percentage() && containing_block.block_size.is_auto())
(lp.0.has_percentage() && containing_block.size.block.is_auto())
},
StyleSize::AnchorSizeFunction(_) => unreachable!("anchor-size() should be disabled"),
}
@ -2055,9 +2070,10 @@ impl IndependentFormattingContext {
IndependentFormattingContextContents::NonReplaced(non_replaced) => {
let writing_mode = self.style().writing_mode;
let available_inline_size =
(containing_block.inline_size - pbm_sums.inline_sum()).max(Au::zero());
(containing_block.size.inline - pbm_sums.inline_sum()).max(Au::zero());
let available_block_size = containing_block
.block_size
.size
.block
.non_auto()
.map(|block_size| (block_size - pbm_sums.block_sum()).max(Au::zero()));
let preferred_block_size = content_box_sizes_and_pbm
@ -2110,8 +2126,10 @@ impl IndependentFormattingContext {
tentative_inline_size.clamp_between_extremums(min_inline_size, max_inline_size);
let containing_block_for_children = ContainingBlock {
inline_size,
block_size: tentative_block_size.to_auto_or(),
size: ContainingBlockSize {
inline: inline_size,
block: tentative_block_size.to_auto_or(),
},
style: self.style(),
};
assert_eq!(