Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Owned ServoArc<ComputedValues> in TraversalHandler

Browse source
This commit is contained in:
Simon Sapin 2020-06-03 13:55:11 +02:00
parent 29005e1626
commit fff5cd5142
3 changed files with 19 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -273,7 +273,7 @@ where
fn handle_element(
&mut self,
node: Node,
style: &Arc<ComputedValues>,
style: Arc<ComputedValues>,
display: DisplayGeneratingBox,
contents: Contents,
box_slot: BoxSlot<'dom>,
@ -289,22 +289,12 @@ where
// https://drafts.csswg.org/css2/visuren.html#dis-pos-flo
if box_style.position.is_absolutely_positioned() {
self.handle_absolutely_positioned_element(
node,
style.clone(),
inside,
contents,
box_slot,
node, style, inside, contents, box_slot,
)
} else if box_style.float.is_floating() {
self.handle_float_element(node, style.clone(), inside, contents, box_slot)
self.handle_float_element(node, style, inside, contents, box_slot)
} else {
self.handle_block_level_element(
node,
style.clone(),
inside,
contents,
box_slot,
)
self.handle_block_level_element(node, style, inside, contents, box_slot)
}
},
},
@ -315,7 +305,7 @@ where
&mut self,
node: Node,
input: Cow<'dom, str>,
parent_style: &Arc<ComputedValues>,
parent_style: Arc<ComputedValues>,
) {
let (leading_whitespace, mut input) = self.handle_leading_whitespace(&input);
if leading_whitespace || !input.is_empty() {
@ -365,7 +355,6 @@ where
}
if let Some(text) = new_text_run_contents {
let parent_style = parent_style.clone();
inlines.push(ArcRefCell::new(InlineLevelBox::TextRun(TextRun {
tag: node.as_opaque(),
parent_style,
@ -442,7 +431,7 @@ where
fn handle_inline_level_element(
&mut self,
node: Node,
style: &Arc<ComputedValues>,
style: Arc<ComputedValues>,
display_inside: DisplayInside,
contents: Contents,
) -> ArcRefCell<InlineLevelBox> {
@ -473,14 +462,15 @@ where
inline_box.last_fragment = true;
ArcRefCell::new(InlineLevelBox::InlineBox(inline_box))
} else {
let content_sizes = ContentSizesRequest::inline_if(!style.inline_size_is_length());
ArcRefCell::new(InlineLevelBox::Atomic(
IndependentFormattingContext::construct(
self.context,
node,
style.clone(),
style,
display_inside,
contents,
ContentSizesRequest::inline_if(!style.inline_size_is_length()),
content_sizes,
// Text decorations are not propagated to atomic inline-level descendants.
TextDecorationLine::NONE,
),