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

Introduce BlockLevelJob

Browse source
This commit is contained in:
Anthony Ramine 2019-12-12 11:03:00 +01:00
parent fb1891f436
commit b2f6cc7144
1 changed files with 64 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

119
components/layout_2020/flow/construct.rs
View file

@ -38,23 +38,23 @@ impl BlockFormattingContext {
} }
} }
enum IntermediateBlockLevelBox<Node> { struct BlockLevelJob<'dom, Node> {
SameFormattingContextBlock { box_slot: BoxSlot<'dom>,
style: Arc<ComputedValues>, style: Arc<ComputedValues>,
contents: IntermediateBlockContainer<Node>, kind: BlockLevelCreator<Node>,
}, }
enum BlockLevelCreator<Node> {
SameFormattingContextBlock(IntermediateBlockContainer<Node>),
Independent { Independent {
style: Arc<ComputedValues>,
display_inside: DisplayInside, display_inside: DisplayInside,
contents: Contents<Node>, contents: Contents<Node>,
}, },
OutOfFlowAbsolutelyPositionedBox { OutOfFlowAbsolutelyPositionedBox {
style: Arc<ComputedValues>,
display_inside: DisplayInside, display_inside: DisplayInside,
contents: Contents<Node>, contents: Contents<Node>,
}, },
OutOfFlowFloatBox { OutOfFlowFloatBox {
style: Arc<ComputedValues>,
display_inside: DisplayInside, display_inside: DisplayInside,
contents: Contents<Node>, contents: Contents<Node>,
}, },
@ -69,7 +69,7 @@ enum IntermediateBlockLevelBox<Node> {
/// Deferring allows using rayon’s `into_par_iter`. /// Deferring allows using rayon’s `into_par_iter`.
enum IntermediateBlockContainer<Node> { enum IntermediateBlockContainer<Node> {
InlineFormattingContext(InlineFormattingContext), InlineFormattingContext(InlineFormattingContext),
Deferred { contents: NonReplacedContents<Node> }, Deferred(NonReplacedContents<Node>),
} }
/// A builder for a block container. /// A builder for a block container.
@ -81,9 +81,9 @@ struct BlockContainerBuilder<'dom, 'style, Node> {
block_container_style: &'style Arc<ComputedValues>, block_container_style: &'style Arc<ComputedValues>,
/// The list of block-level boxes of the final block container. /// The list of block-level boxes to be built for the final block container.
/// ///
/// Contains all the complete block level boxes we found traversing the tree /// Contains all the block-level jobs we found traversing the tree
/// so far, if this is empty at the end of the traversal and the ongoing /// so far, if this is empty at the end of the traversal and the ongoing
/// inline formatting context is not empty, the block container establishes /// inline formatting context is not empty, the block container establishes
/// an inline formatting context (see end of `build`). /// an inline formatting context (see end of `build`).
@ -94,7 +94,7 @@ struct BlockContainerBuilder<'dom, 'style, Node> {
/// doesn't have a next sibling, we either reached the end of the container /// doesn't have a next sibling, we either reached the end of the container
/// root or there are ongoing inline-level boxes /// root or there are ongoing inline-level boxes
/// (see `handle_block_level_element`). /// (see `handle_block_level_element`).
block_level_boxes: Vec<(IntermediateBlockLevelBox<Node>, BoxSlot<'dom>)>, block_level_boxes: Vec<BlockLevelJob<'dom, Node>>,
/// The ongoing inline formatting context of the builder. /// The ongoing inline formatting context of the builder.
/// ///
@ -176,17 +176,14 @@ impl BlockContainer {
contains_floats: builder.contains_floats, contains_floats: builder.contains_floats,
outer_content_sizes_of_children: ContentSizes::zero(), outer_content_sizes_of_children: ContentSizes::zero(),
}; };
let mapfold = let mapfold = |acc: &mut Accumulator, creator: BlockLevelJob<'dom, _>| {
|acc: &mut Accumulator, let (block_level_box, box_contains_floats) = creator.finish(
(intermediate, box_slot): (IntermediateBlockLevelBox<_>, BoxSlot<'_>)| { context,
let (block_level_box, box_contains_floats) = intermediate.finish( content_sizes.if_requests_inline(|| &mut acc.outer_content_sizes_of_children),
context, );
content_sizes.if_requests_inline(|| &mut acc.outer_content_sizes_of_children), acc.contains_floats |= box_contains_floats;
); block_level_box
acc.contains_floats |= box_contains_floats; };
box_slot.set(LayoutBox::BlockLevel(block_level_box.clone()));
block_level_box
};
let block_level_boxes = if context.use_rayon { let block_level_boxes = if context.use_rayon {
builder builder
.block_level_boxes .block_level_boxes
@ -459,28 +456,29 @@ where
// context needs to be ended. // context needs to be ended.
self.end_ongoing_inline_formatting_context(); self.end_ongoing_inline_formatting_context();
let intermediate_box = match contents.try_into() { let kind = match contents.try_into() {
Ok(contents) => match display_inside { Ok(contents) => match display_inside {
DisplayInside::Flow => IntermediateBlockLevelBox::SameFormattingContextBlock { DisplayInside::Flow => BlockLevelCreator::SameFormattingContextBlock(
style, IntermediateBlockContainer::Deferred(contents),
contents: IntermediateBlockContainer::Deferred { contents }, ),
}, _ => BlockLevelCreator::Independent {
_ => IntermediateBlockLevelBox::Independent {
style,
display_inside, display_inside,
contents: contents.into(), contents: contents.into(),
}, },
}, },
Err(contents) => { Err(contents) => {
let contents = Contents::Replaced(contents); let contents = Contents::Replaced(contents);
IntermediateBlockLevelBox::Independent { BlockLevelCreator::Independent {
style,
display_inside, display_inside,
contents, contents,
} }
}, },
}; };
self.block_level_boxes.push((intermediate_box, box_slot)) self.block_level_boxes.push(BlockLevelJob {
box_slot,
style,
kind,
});
} }
fn handle_absolutely_positioned_element( fn handle_absolutely_positioned_element(
@ -491,12 +489,15 @@ where
box_slot: BoxSlot<'dom>, box_slot: BoxSlot<'dom>,
) { ) {
if !self.has_ongoing_inline_formatting_context() { if !self.has_ongoing_inline_formatting_context() {
let box_ = IntermediateBlockLevelBox::OutOfFlowAbsolutelyPositionedBox { let kind = BlockLevelCreator::OutOfFlowAbsolutelyPositionedBox {
style,
contents, contents,
display_inside, display_inside,
}; };
self.block_level_boxes.push((box_, box_slot)); self.block_level_boxes.push(BlockLevelJob {
box_slot,
style,
kind,
});
} else { } else {
let box_ = Arc::new(InlineLevelBox::OutOfFlowAbsolutelyPositionedBox( let box_ = Arc::new(InlineLevelBox::OutOfFlowAbsolutelyPositionedBox(
AbsolutelyPositionedBox::construct(self.context, style, display_inside, contents), AbsolutelyPositionedBox::construct(self.context, style, display_inside, contents),
@ -516,12 +517,15 @@ where
self.contains_floats = ContainsFloats::Yes; self.contains_floats = ContainsFloats::Yes;
if !self.has_ongoing_inline_formatting_context() { if !self.has_ongoing_inline_formatting_context() {
let box_ = IntermediateBlockLevelBox::OutOfFlowFloatBox { let kind = BlockLevelCreator::OutOfFlowFloatBox {
style,
contents, contents,
display_inside, display_inside,
}; };
self.block_level_boxes.push((box_, box_slot)); self.block_level_boxes.push(BlockLevelJob {
box_slot,
style,
kind,
});
} else { } else {
let box_ = Arc::new(InlineLevelBox::OutOfFlowFloatBox(FloatBox::construct( let box_ = Arc::new(InlineLevelBox::OutOfFlowFloatBox(FloatBox::construct(
self.context, self.context,
@ -557,13 +561,17 @@ where
) )
}); });
let box_ = IntermediateBlockLevelBox::SameFormattingContextBlock { let kind = BlockLevelCreator::SameFormattingContextBlock(
style: anonymous_style.clone(), IntermediateBlockContainer::InlineFormattingContext(std::mem::take(
contents: IntermediateBlockContainer::InlineFormattingContext(std::mem::take(
&mut self.ongoing_inline_formatting_context, &mut self.ongoing_inline_formatting_context,
)), )),
}; );
self.block_level_boxes.push((box_, BoxSlot::dummy())) self.block_level_boxes.push(BlockLevelJob {
// FIXME(nox): We should be storing this somewhere.
box_slot: BoxSlot::dummy(),
style: anonymous_style.clone(),
kind,
});
} }
fn current_inline_level_boxes(&mut self) -> &mut Vec<Arc<InlineLevelBox>> { fn current_inline_level_boxes(&mut self) -> &mut Vec<Arc<InlineLevelBox>> {
@ -582,7 +590,7 @@ where
} }
} }
impl<'dom, Node> IntermediateBlockLevelBox<Node> impl<'dom, Node> BlockLevelJob<'dom, Node>
where where
Node: NodeExt<'dom>, Node: NodeExt<'dom>,
{ {
@ -591,8 +599,9 @@ where
context: &LayoutContext, context: &LayoutContext,
max_assign_in_flow_outer_content_sizes_to: Option<&mut ContentSizes>, max_assign_in_flow_outer_content_sizes_to: Option<&mut ContentSizes>,
) -> (Arc<BlockLevelBox>, ContainsFloats) { ) -> (Arc<BlockLevelBox>, ContainsFloats) {
match self { let style = self.style;
IntermediateBlockLevelBox::SameFormattingContextBlock { style, contents } => { let (block_level_box, contains_floats) = match self.kind {
BlockLevelCreator::SameFormattingContextBlock(contents) => {
let (contents, contains_floats, box_content_sizes) = contents.finish( let (contents, contains_floats, box_content_sizes) = contents.finish(
context, context,
&style, &style,
@ -608,8 +617,7 @@ where
Arc::new(BlockLevelBox::SameFormattingContextBlock { contents, style }); Arc::new(BlockLevelBox::SameFormattingContextBlock { contents, style });
(block_level_box, contains_floats) (block_level_box, contains_floats)
}, },
IntermediateBlockLevelBox::Independent { BlockLevelCreator::Independent {
style,
display_inside, display_inside,
contents, contents,
} => { } => {
@ -632,8 +640,7 @@ where
ContainsFloats::No, ContainsFloats::No,
) )
}, },
IntermediateBlockLevelBox::OutOfFlowAbsolutelyPositionedBox { BlockLevelCreator::OutOfFlowAbsolutelyPositionedBox {
style,
display_inside, display_inside,
contents, contents,
} => { } => {
@ -642,8 +649,7 @@ where
)); ));
(block_level_box, ContainsFloats::No) (block_level_box, ContainsFloats::No)
}, },
IntermediateBlockLevelBox::OutOfFlowFloatBox { BlockLevelCreator::OutOfFlowFloatBox {
style,
display_inside, display_inside,
contents, contents,
} => { } => {
@ -652,7 +658,10 @@ where
)); ));
(block_level_box, ContainsFloats::Yes) (block_level_box, ContainsFloats::Yes)
}, },
} };
self.box_slot
.set(LayoutBox::BlockLevel(block_level_box.clone()));
(block_level_box, contains_floats)
} }
} }
@ -667,7 +676,7 @@ where
content_sizes: ContentSizesRequest, content_sizes: ContentSizesRequest,
) -> (BlockContainer, ContainsFloats, BoxContentSizes) { ) -> (BlockContainer, ContainsFloats, BoxContentSizes) {
match self { match self {
IntermediateBlockContainer::Deferred { contents } => { IntermediateBlockContainer::Deferred(contents) => {
BlockContainer::construct(context, style, contents, content_sizes) BlockContainer::construct(context, style, contents, content_sizes)
}, },
IntermediateBlockContainer::InlineFormattingContext(ifc) => { IntermediateBlockContainer::InlineFormattingContext(ifc) => {