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

Bonus Fix - Rename traverse_dom_preorder to traverse_dom.

Browse source 
The incorrect naming here was bugging me - the dom traversal has both pre- and post-order
processing steps.
This commit is contained in:
Bobby Holley 2016-01-06 19:18:12 -08:00
parent 136c0938a2
commit 29987a6715
5 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/layout/layout_task.rs
View file

@ -1026,11 +1026,11 @@ impl LayoutTask {
// Perform CSS selector matching and flow construction. // Perform CSS selector matching and flow construction.
match self.parallel_traversal { match self.parallel_traversal {
None => { None => {
sequential::traverse_dom_preorder::<ServoLayoutNode, RecalcStyleAndConstructFlows>( sequential::traverse_dom::<ServoLayoutNode, RecalcStyleAndConstructFlows>(
node, &shared_layout_context); node, &shared_layout_context);
} }
Some(ref mut traversal) => { Some(ref mut traversal) => {
parallel::traverse_dom_preorder::<ServoLayoutNode, RecalcStyleAndConstructFlows>( parallel::traverse_dom::<ServoLayoutNode, RecalcStyleAndConstructFlows>(
node, &shared_layout_context, traversal); node, &shared_layout_context, traversal);
} }
} }

2
components/layout/parallel.rs
View file

@ -22,7 +22,7 @@ use traversal::{BuildDisplayList, ComputeAbsolutePositions, PostorderNodeMutTrav
use util::opts; use util::opts;
use util::workqueue::{WorkQueue, WorkUnit, WorkerProxy}; use util::workqueue::{WorkQueue, WorkUnit, WorkerProxy};
pub use style::parallel::traverse_dom_preorder; pub use style::parallel::traverse_dom;
#[allow(dead_code)] #[allow(dead_code)]
fn static_assertion(node: UnsafeNode) { fn static_assertion(node: UnsafeNode) {

2
components/layout/sequential.rs
View file

@ -18,7 +18,7 @@ use traversal::{AssignBSizesAndStoreOverflow, AssignISizes};
use traversal::{BubbleISizes, BuildDisplayList, ComputeAbsolutePositions, PostorderNodeMutTraversal}; use traversal::{BubbleISizes, BuildDisplayList, ComputeAbsolutePositions, PostorderNodeMutTraversal};
use util::opts; use util::opts;
pub use style::sequential::traverse_dom_preorder; pub use style::sequential::traverse_dom;
pub fn resolve_generated_content(root: &mut FlowRef, shared_layout_context: &SharedLayoutContext) { pub fn resolve_generated_content(root: &mut FlowRef, shared_layout_context: &SharedLayoutContext) {
fn doit(flow: &mut Flow, level: u32, traversal: &mut ResolveGeneratedContent) { fn doit(flow: &mut Flow, level: u32, traversal: &mut ResolveGeneratedContent) {

9
components/style/parallel.rs
View file

@ -39,11 +39,10 @@ pub fn run_queue_with_custom_work_data_type<To, F, SharedContext: Sync>(
queue.run(shared); queue.run(shared);
} }
pub fn traverse_dom_preorder<'ln, N, C>( pub fn traverse_dom<'ln, N, C>(root: N,
root: N, queue_data: &C::SharedContext,
queue_data: &C::SharedContext, queue: &mut WorkQueue<C::SharedContext, WorkQueueData>)
queue: &mut WorkQueue<C::SharedContext, WorkQueueData>) where N: TNode<'ln>, C: DomTraversalContext<'ln, N> {
where N: TNode<'ln>, C: DomTraversalContext<'ln, N> {
run_queue_with_custom_work_data_type(queue, |queue| { run_queue_with_custom_work_data_type(queue, |queue| {
queue.push(WorkUnit { queue.push(WorkUnit {
fun: top_down_dom::<N, C>, fun: top_down_dom::<N, C>,

8
components/style/sequential.rs
View file

@ -7,10 +7,10 @@
use dom::TNode; use dom::TNode;
use traversal::DomTraversalContext; use traversal::DomTraversalContext;
pub fn traverse_dom_preorder<'ln, N, C>(root: N, pub fn traverse_dom<'ln, N, C>(root: N,
shared: &C::SharedContext) shared: &C::SharedContext)
where N: TNode<'ln>, where N: TNode<'ln>,
C: DomTraversalContext<'ln, N> { C: DomTraversalContext<'ln, N> {
fn doit<'a, 'ln, N, C>(context: &'a C, node: N) fn doit<'a, 'ln, N, C>(context: &'a C, node: N)
where N: TNode<'ln>, C: DomTraversalContext<'ln, N> { where N: TNode<'ln>, C: DomTraversalContext<'ln, N> {
context.process_preorder(node); context.process_preorder(node);