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

Replace OpaqueNodeMethods::from_{threadsafe_,}layout_node by opaque methods.

Browse source
This commit is contained in:
Ms2ger 2015-06-24 12:57:47 +02:00
parent 6247a96761
commit 2ea32829af
6 changed files with 20 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/layout/construct.rs
View file

@ -31,7 +31,6 @@ use incremental::{RECONSTRUCT_FLOW, RestyleDamage};
use inline::{InlineFlow, InlineFragmentNodeInfo};
use list_item::{ListItemFlow, ListStyleTypeContent};
use multicol::MulticolFlow;
use opaque_node::OpaqueNodeMethods;
use parallel;
use table::TableFlow;
use table_caption::TableCaptionFlow;
@ -209,7 +208,7 @@ impl InlineFragmentsAccumulator {
InlineFragmentsAccumulator {
fragments: IntermediateInlineFragments::new(),
enclosing_node: Some(InlineFragmentNodeInfo {
address: OpaqueNodeMethods::from_thread_safe_layout_node(node),
address: node.opaque(),
style: node.style().clone(),
}),
}
@ -690,9 +689,8 @@ impl<'a> FlowConstructor<'a> {
}
};
let opaque_node = OpaqueNodeMethods::from_thread_safe_layout_node(node);
fragments.fragments
.push_back(Fragment::from_opaque_node_and_style(opaque_node,
.push_back(Fragment::from_opaque_node_and_style(node.opaque(),
style.clone(),
node.restyle_damage(),
specific))
@ -852,9 +850,8 @@ impl<'a> FlowConstructor<'a> {
//
// FIXME(#2001, pcwalton): Don't do this if there's padding or borders.
if node.is_ignorable_whitespace() {
let opaque_node = OpaqueNodeMethods::from_thread_safe_layout_node(node);
return ConstructionResult::ConstructionItem(ConstructionItem::Whitespace(
opaque_node,
node.opaque(),
node.style().clone(),
node.restyle_damage()))
}