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

layout: Use the concurrent hash map for the leaf sets.

Browse source 
64% improvement in style recalc.
This commit is contained in:
Patrick Walton 2014-01-30 14:48:05 -08:00
parent 0dd37d9cd3
commit a8e35fbeac
7 changed files with 47 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/components/main/layout/construct.rs
View file

@ -58,7 +58,7 @@ pub enum ConstructionResult {
}
impl ConstructionResult {
fn destroy(&mut self, leaf_set: &mut FlowLeafSet) {
fn destroy(&mut self, leaf_set: &FlowLeafSet) {
match *self {
NoConstructionResult => {}
FlowConstructionResult(ref mut flow) => flow.destroy(leaf_set),
@ -76,7 +76,7 @@ enum ConstructionItem {
}
impl ConstructionItem {
fn destroy(&mut self, leaf_set: &mut FlowLeafSet) {
fn destroy(&mut self, leaf_set: &FlowLeafSet) {
match *self {
InlineBoxesConstructionItem(ref mut result) => {
for splits in result.splits.mut_iter() {
@ -133,7 +133,7 @@ struct InlineBlockSplit {
}
impl InlineBlockSplit {
fn destroy(&mut self, leaf_set: &mut FlowLeafSet) {
fn destroy(&mut self, leaf_set: &FlowLeafSet) {
self.flow.destroy(leaf_set)
}
}
@ -274,7 +274,7 @@ impl<'fc> FlowConstructor<'fc> {
let inline_base = BaseFlow::new(self.next_flow_id(), node);
let mut inline_flow = ~InlineFlow::from_boxes(inline_base, boxes) as ~Flow;
self.layout_context.flow_leaf_set.access(|leaf_set| inline_flow.mark_as_leaf(leaf_set));
inline_flow.mark_as_leaf(self.layout_context.flow_leaf_set.get());
TextRunScanner::new().scan_for_runs(self.font_context, inline_flow);
flow.add_new_child(inline_flow)
@ -380,7 +380,7 @@ impl<'fc> FlowConstructor<'fc> {
// The flow is done. If it ended up with no kids, add the flow to the leaf set.
if flow.child_count() == 0 {
self.layout_context.flow_leaf_set.access(|leaf_set| flow.mark_as_leaf(leaf_set))
flow.mark_as_leaf(self.layout_context.flow_leaf_set.get())
} else {
flow.mark_as_nonleaf()
}
@ -619,12 +619,10 @@ impl<'a> PostorderNodeMutTraversal for FlowConstructor<'a> {
// `display: none` contributes no flow construction result. Nuke the flow construction
// results of children.
(display::none, _, _) => {
self.layout_context.flow_leaf_set.access(|leaf_set| {
for child in node.children() {
let mut old_result = child.swap_out_construction_result();
old_result.destroy(leaf_set)
}
})
for child in node.children() {
let mut old_result = child.swap_out_construction_result();
old_result.destroy(self.layout_context.flow_leaf_set.get())
}
}
// Inline items contribute inline box construction results.