diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index 1eac2e78fc1..7c39d61db22 100644 --- a/components/layout/layout_task.rs +++ b/components/layout/layout_task.rs @@ -1026,11 +1026,11 @@ impl LayoutTask { // Perform CSS selector matching and flow construction. match self.parallel_traversal { None => { - sequential::traverse_dom_preorder::( + sequential::traverse_dom::( node, &shared_layout_context); } Some(ref mut traversal) => { - parallel::traverse_dom_preorder::( + parallel::traverse_dom::( node, &shared_layout_context, traversal); } } diff --git a/components/layout/parallel.rs b/components/layout/parallel.rs index f5f2eb30856..4ea427b11ee 100644 --- a/components/layout/parallel.rs +++ b/components/layout/parallel.rs @@ -22,7 +22,7 @@ use traversal::{BuildDisplayList, ComputeAbsolutePositions, PostorderNodeMutTrav use util::opts; use util::workqueue::{WorkQueue, WorkUnit, WorkerProxy}; -pub use style::parallel::traverse_dom_preorder; +pub use style::parallel::traverse_dom; #[allow(dead_code)] fn static_assertion(node: UnsafeNode) { diff --git a/components/layout/sequential.rs b/components/layout/sequential.rs index 5fc123c30c7..ad332f30fdd 100644 --- a/components/layout/sequential.rs +++ b/components/layout/sequential.rs @@ -18,7 +18,7 @@ use traversal::{AssignBSizesAndStoreOverflow, AssignISizes}; use traversal::{BubbleISizes, BuildDisplayList, ComputeAbsolutePositions, PostorderNodeMutTraversal}; 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) { fn doit(flow: &mut Flow, level: u32, traversal: &mut ResolveGeneratedContent) { diff --git a/components/style/parallel.rs b/components/style/parallel.rs index de0ae680e3a..cb8e8260a21 100644 --- a/components/style/parallel.rs +++ b/components/style/parallel.rs @@ -39,11 +39,10 @@ pub fn run_queue_with_custom_work_data_type( queue.run(shared); } -pub fn traverse_dom_preorder<'ln, N, C>( - root: N, - queue_data: &C::SharedContext, - queue: &mut WorkQueue) - where N: TNode<'ln>, C: DomTraversalContext<'ln, N> { +pub fn traverse_dom<'ln, N, C>(root: N, + queue_data: &C::SharedContext, + queue: &mut WorkQueue) + where N: TNode<'ln>, C: DomTraversalContext<'ln, N> { run_queue_with_custom_work_data_type(queue, |queue| { queue.push(WorkUnit { fun: top_down_dom::, diff --git a/components/style/sequential.rs b/components/style/sequential.rs index b98d6e45029..9dfbb0126c1 100644 --- a/components/style/sequential.rs +++ b/components/style/sequential.rs @@ -7,10 +7,10 @@ use dom::TNode; use traversal::DomTraversalContext; -pub fn traverse_dom_preorder<'ln, N, C>(root: N, - shared: &C::SharedContext) - where N: TNode<'ln>, - C: DomTraversalContext<'ln, N> { +pub fn traverse_dom<'ln, N, C>(root: N, + shared: &C::SharedContext) + where N: TNode<'ln>, + C: DomTraversalContext<'ln, N> { fn doit<'a, 'ln, N, C>(context: &'a C, node: N) where N: TNode<'ln>, C: DomTraversalContext<'ln, N> { context.process_preorder(node);