mirror of
https://github.com/servo/servo.git
synced 2025-07-23 07:13:52 +01:00
Change the mis-named 'traverse_flow_tree_preorder' to 'reflow'
This commit is contained in:
parent
ee697a926d
commit
832b811198
4 changed files with 11 additions and 9 deletions
|
@ -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);
|
||||
|
|
|
@ -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<TimerMetadata>,
|
||||
time_profiler_chan: time::ProfilerChan,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue