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

Rename CollectedAbsolutelyPositionedBox to HoistedAbsolutelyPositionedBox

Browse source
This commit is contained in:
Simon Sapin 2019-12-13 12:44:05 +01:00
parent 04b701b9e0
commit b218957461
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
components/layout_2020/positioned.rs
View file

@ -24,12 +24,12 @@ pub(crate) struct AbsolutelyPositionedBox {
} }
pub(crate) struct PositioningContext<'box_tree> { pub(crate) struct PositioningContext<'box_tree> {
for_nearest_positioned_ancestor: Option<Vec<CollectedAbsolutelyPositionedBox<'box_tree>>>, for_nearest_positioned_ancestor: Option<Vec<HoistedAbsolutelyPositionedBox<'box_tree>>>,
for_initial_containing_block: Vec<CollectedAbsolutelyPositionedBox<'box_tree>>, for_initial_containing_block: Vec<HoistedAbsolutelyPositionedBox<'box_tree>>,
} }
#[derive(Debug)] #[derive(Debug)]
pub(crate) struct CollectedAbsolutelyPositionedBox<'box_tree> { pub(crate) struct HoistedAbsolutelyPositionedBox<'box_tree> {
absolutely_positioned_box: &'box_tree AbsolutelyPositionedBox, absolutely_positioned_box: &'box_tree AbsolutelyPositionedBox,
/// The rank of the child from which this absolutely positioned fragment /// The rank of the child from which this absolutely positioned fragment
@ -88,7 +88,7 @@ impl AbsolutelyPositionedBox {
&self, &self,
initial_start_corner: Vec2<Length>, initial_start_corner: Vec2<Length>,
tree_rank: usize, tree_rank: usize,
) -> CollectedAbsolutelyPositionedBox { ) -> HoistedAbsolutelyPositionedBox {
fn absolute_box_offsets( fn absolute_box_offsets(
initial_static_start: Length, initial_static_start: Length,
start: LengthPercentageOrAuto, start: LengthPercentageOrAuto,
@ -105,7 +105,7 @@ impl AbsolutelyPositionedBox {
} }
let box_offsets = self.contents.style.box_offsets(); let box_offsets = self.contents.style.box_offsets();
CollectedAbsolutelyPositionedBox { HoistedAbsolutelyPositionedBox {
absolutely_positioned_box: self, absolutely_positioned_box: self,
tree_rank, tree_rank,
box_offsets: Vec2 { box_offsets: Vec2 {
@ -162,7 +162,7 @@ impl<'box_tree> PositioningContext<'box_tree> {
fn for_positioned( fn for_positioned(
layout_context: &LayoutContext, layout_context: &LayoutContext,
for_initial_containing_block: &mut Vec<CollectedAbsolutelyPositionedBox<'box_tree>>, for_initial_containing_block: &mut Vec<HoistedAbsolutelyPositionedBox<'box_tree>>,
f: impl FnOnce(&mut Self) -> BoxFragment, f: impl FnOnce(&mut Self) -> BoxFragment,
) -> BoxFragment { ) -> BoxFragment {
let mut new = Self { let mut new = Self {
@ -175,7 +175,7 @@ impl<'box_tree> PositioningContext<'box_tree> {
positioned_box_fragment positioned_box_fragment
} }
pub(crate) fn push(&mut self, box_: CollectedAbsolutelyPositionedBox<'box_tree>) { pub(crate) fn push(&mut self, box_: HoistedAbsolutelyPositionedBox<'box_tree>) {
if let Some(nearest) = &mut self.for_nearest_positioned_ancestor { if let Some(nearest) = &mut self.for_nearest_positioned_ancestor {
match box_ match box_
.absolutely_positioned_box .absolutely_positioned_box
@ -245,7 +245,7 @@ impl<'box_tree> PositioningContext<'box_tree> {
// Loop because it’s possible that we discover (the static position of) // Loop because it’s possible that we discover (the static position of)
// more absolutely-positioned boxes while doing layout for others. // more absolutely-positioned boxes while doing layout for others.
while !self.for_initial_containing_block.is_empty() { while !self.for_initial_containing_block.is_empty() {
CollectedAbsolutelyPositionedBox::layout_many( HoistedAbsolutelyPositionedBox::layout_many(
layout_context, layout_context,
&std::mem::take(&mut self.for_initial_containing_block), &std::mem::take(&mut self.for_initial_containing_block),
fragments, fragments,
@ -273,7 +273,7 @@ impl<'box_tree> PositioningContext<'box_tree> {
style: &positioned_box_fragment.style, style: &positioned_box_fragment.style,
}; };
let mut children = Vec::new(); let mut children = Vec::new();
CollectedAbsolutelyPositionedBox::layout_many( HoistedAbsolutelyPositionedBox::layout_many(
layout_context, layout_context,
&for_here, &for_here,
&mut children, &mut children,
@ -291,12 +291,12 @@ impl<'box_tree> PositioningContext<'box_tree> {
} }
} }
impl<'box_tree> CollectedAbsolutelyPositionedBox<'box_tree> { impl<'box_tree> HoistedAbsolutelyPositionedBox<'box_tree> {
pub(crate) fn layout_many( pub(crate) fn layout_many(
layout_context: &LayoutContext, layout_context: &LayoutContext,
boxes: &[Self], boxes: &[Self],
fragments: &mut Vec<Fragment>, fragments: &mut Vec<Fragment>,
for_initial_containing_block: &mut Vec<CollectedAbsolutelyPositionedBox<'box_tree>>, for_initial_containing_block: &mut Vec<HoistedAbsolutelyPositionedBox<'box_tree>>,
containing_block: &DefiniteContainingBlock, containing_block: &DefiniteContainingBlock,
) { ) {
if layout_context.use_rayon { if layout_context.use_rayon {
@ -326,7 +326,7 @@ impl<'box_tree> CollectedAbsolutelyPositionedBox<'box_tree> {
pub(crate) fn layout( pub(crate) fn layout(
&self, &self,
layout_context: &LayoutContext, layout_context: &LayoutContext,
for_initial_containing_block: &mut Vec<CollectedAbsolutelyPositionedBox<'box_tree>>, for_initial_containing_block: &mut Vec<HoistedAbsolutelyPositionedBox<'box_tree>>,
containing_block: &DefiniteContainingBlock, containing_block: &DefiniteContainingBlock,
) -> BoxFragment { ) -> BoxFragment {
let style = &self.absolutely_positioned_box.contents.style; let style = &self.absolutely_positioned_box.contents.style;
@ -580,7 +580,7 @@ fn solve_axis(
} }
fn adjust_static_positions( fn adjust_static_positions(
absolutely_positioned_fragments: &mut [CollectedAbsolutelyPositionedBox], absolutely_positioned_fragments: &mut [HoistedAbsolutelyPositionedBox],
child_fragments: &[Fragment], child_fragments: &[Fragment],
tree_rank_in_parent: usize, tree_rank_in_parent: usize,
) { ) {