diff --git a/components/layout/block.rs b/components/layout/block.rs index c677c9b659f..b2aa6f3dd52 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -1551,7 +1551,7 @@ impl BlockFlow { self.assign_inline_sizes(layout_context); // Re-run layout on our children. for child in flow::mut_base(self).children.iter_mut() { - sequential::traverse_flow_tree_preorder(child, layout_context, RelayoutMode::Force); + sequential::reflow(child, layout_context, RelayoutMode::Force); } // Assign our final-final block size. self.assign_block_size(layout_context); diff --git a/components/layout/parallel.rs b/components/layout/parallel.rs index 16a68796ffb..6b8cb3ef2cc 100644 --- a/components/layout/parallel.rs +++ b/components/layout/parallel.rs @@ -187,7 +187,8 @@ fn top_down_flow<'scope>(unsafe_flows: &[UnsafeFlow], } } -pub fn traverse_flow_tree_preorder( +/// Run the main layout passes in parallel. +pub fn reflow( root: &mut Flow, profiler_metadata: Option, time_profiler_chan: time::ProfilerChan, diff --git a/components/layout/sequential.rs b/components/layout/sequential.rs index 9e6ea4c2fe6..f0f0a0e7c79 100644 --- a/components/layout/sequential.rs +++ b/components/layout/sequential.rs @@ -24,7 +24,8 @@ pub fn resolve_generated_content(root: &mut Flow, layout_context: &LayoutContext ResolveGeneratedContent::new(&layout_context).traverse(root, 0); } -pub fn traverse_flow_tree_preorder(root: &mut Flow, layout_context: &LayoutContext, relayout_mode: RelayoutMode) { +/// Run the main layout passes sequentially. +pub fn reflow(root: &mut Flow, layout_context: &LayoutContext, relayout_mode: RelayoutMode) { fn doit(flow: &mut Flow, assign_inline_sizes: AssignISizes, assign_block_sizes: AssignBSizes, diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index 540ea92fd70..5cefd1488a2 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -929,7 +929,7 @@ impl LayoutThread { fn solve_constraints(layout_root: &mut Flow, layout_context: &LayoutContext) { let _scope = layout_debug_scope!("solve_constraints"); - sequential::traverse_flow_tree_preorder(layout_root, layout_context, RelayoutMode::Incremental); + sequential::reflow(layout_root, layout_context, RelayoutMode::Incremental); } /// Performs layout constraint solving in parallel. @@ -946,11 +946,11 @@ impl LayoutThread { // NOTE: this currently computes borders, so any pruning should separate that // operation out. - parallel::traverse_flow_tree_preorder(layout_root, - profiler_metadata, - time_profiler_chan, - layout_context, - traversal); + parallel::reflow(layout_root, + profiler_metadata, + time_profiler_chan, + layout_context, + traversal); } /// Computes the stacking-relative positions of all flows and, if the painting is dirty and the