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

Auto merge of #6463 - Ms2ger:layout-reduce-unsafe, r=SimonSapin

Browse source 
Reduce the scope of the unsafe block in ParallelPostorderDomTraversal.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6463)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-06-26 06:45:48 -06:00
commit f812390d3a
1 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
components/layout/parallel.rs
View file

@ -12,7 +12,6 @@ use context::{LayoutContext, SharedLayoutContextWrapper, SharedLayoutContext};
use flow::{Flow, MutableFlowUtils, PreorderFlowTraversal, PostorderFlowTraversal}; use flow::{Flow, MutableFlowUtils, PreorderFlowTraversal, PostorderFlowTraversal};
use flow; use flow;
use flow_ref::FlowRef; use flow_ref::FlowRef;
use data::LayoutDataWrapper;
use traversal::{BubbleISizes, AssignISizes, AssignBSizesAndStoreOverflow}; use traversal::{BubbleISizes, AssignISizes, AssignBSizesAndStoreOverflow};
use traversal::{ComputeAbsolutePositions, BuildDisplayList}; use traversal::{ComputeAbsolutePositions, BuildDisplayList};
use traversal::{RecalcStyleForNode, ConstructFlows}; use traversal::{RecalcStyleForNode, ConstructFlows};
@ -187,24 +186,21 @@ trait ParallelPostorderDomTraversal : PostorderDomTraversal {
Some(parent) => parent, Some(parent) => parent,
}; };
unsafe { let parent_layout_data = unsafe {
let parent_layout_data = &*parent.borrow_layout_data_unchecked()
(*parent.borrow_layout_data_unchecked()).as_ref().expect("no layout data"); };
let parent_layout_data = parent_layout_data.as_ref().expect("no layout data");
unsafe_node = layout_node_to_unsafe_layout_node(&parent);
unsafe_node = layout_node_to_unsafe_layout_node(&parent); if parent_layout_data
.data
let parent_layout_data: &LayoutDataWrapper = .parallel
mem::transmute(parent_layout_data); .children_count
if parent_layout_data .fetch_sub(1, Ordering::Relaxed) == 1 {
.data // We were the last child of our parent. Construct flows for our parent.
.parallel } else {
.children_count // Get out of here and find another node to work on.
.fetch_sub(1, Ordering::Relaxed) == 1 { break
// We were the last child of our parent. Construct flows for our parent.
} else {
// Get out of here and find another node to work on.
break
}
} }
} }
} }