mirror of
https://github.com/servo/servo.git
synced 2025-06-09 00:53:26 +00:00
No-op refactor: root_flow param for perform_post_style_recalc_layout_passes
This whole method was a large `if let` block:
```rust
if let Some(mut root_flow) = self.root_flow.clone() {
// ...
}
```
Move that `if let` to callers to make it clear that the method
doesn’t need to be called when `self.root_flow` is `None`.
By itself, this commit doesn’t change anything.
But it enables the next one.
This commit is contained in:
Simon Sapin
parent
bb54f0a429
commit
02dc8b286a
1 changed files with 92 additions and 90 deletions
|
|
@ -1189,11 +1189,14 @@ impl LayoutThread {
|
||||||
unsafe { layout_context.style_context.stylist.rule_tree.maybe_gc(); }
|
unsafe { layout_context.style_context.stylist.rule_tree.maybe_gc(); }
|
||||||
|
|
||||||
// Perform post-style recalculation layout passes.
|
// Perform post-style recalculation layout passes.
|
||||||
self.perform_post_style_recalc_layout_passes(&data.reflow_info,
|
if let Some(mut root_flow) = self.root_flow.clone() {
|
||||||
Some(&data.query_type),
|
self.perform_post_style_recalc_layout_passes(&mut root_flow,
|
||||||
Some(&document),
|
&data.reflow_info,
|
||||||
&mut rw_data,
|
Some(&data.query_type),
|
||||||
&mut layout_context);
|
Some(&document),
|
||||||
|
&mut rw_data,
|
||||||
|
&mut layout_context);
|
||||||
|
}
|
||||||
|
|
||||||
self.respond_to_query_if_necessary(&data.query_type,
|
self.respond_to_query_if_necessary(&data.query_type,
|
||||||
&mut *rw_data,
|
&mut *rw_data,
|
||||||
|
|
@ -1360,109 +1363,108 @@ impl LayoutThread {
|
||||||
let mut layout_context = self.build_layout_context(guards, &*rw_data, false);
|
let mut layout_context = self.build_layout_context(guards, &*rw_data, false);
|
||||||
|
|
||||||
if let Some(mut root_flow) = self.root_flow.clone() {
|
if let Some(mut root_flow) = self.root_flow.clone() {
|
||||||
// Perform an abbreviated style recalc that operates without access to the DOM.
|
{
|
||||||
let animations = self.running_animations.read();
|
// Perform an abbreviated style recalc that operates without access to the DOM.
|
||||||
profile(time::ProfilerCategory::LayoutStyleRecalc,
|
let animations = self.running_animations.read();
|
||||||
self.profiler_metadata(),
|
profile(time::ProfilerCategory::LayoutStyleRecalc,
|
||||||
self.time_profiler_chan.clone(),
|
self.profiler_metadata(),
|
||||||
|| {
|
self.time_profiler_chan.clone(),
|
||||||
animation::recalc_style_for_animations(&layout_context,
|
|| {
|
||||||
FlowRef::deref_mut(&mut root_flow),
|
animation::recalc_style_for_animations(
|
||||||
&animations)
|
&layout_context, FlowRef::deref_mut(&mut root_flow), &animations)
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
self.perform_post_style_recalc_layout_passes(&mut root_flow,
|
||||||
|
&reflow_info,
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
&mut *rw_data,
|
||||||
|
&mut layout_context);
|
||||||
}
|
}
|
||||||
|
|
||||||
self.perform_post_style_recalc_layout_passes(&reflow_info,
|
|
||||||
None,
|
|
||||||
None,
|
|
||||||
&mut *rw_data,
|
|
||||||
&mut layout_context);
|
|
||||||
|
|
||||||
assert!(layout_context.pending_images.is_none());
|
assert!(layout_context.pending_images.is_none());
|
||||||
}
|
}
|
||||||
|
|
||||||
fn perform_post_style_recalc_layout_passes(&mut self,
|
fn perform_post_style_recalc_layout_passes(&mut self,
|
||||||
|
root_flow: &mut FlowRef,
|
||||||
data: &Reflow,
|
data: &Reflow,
|
||||||
query_type: Option<&ReflowQueryType>,
|
query_type: Option<&ReflowQueryType>,
|
||||||
document: Option<&ServoLayoutDocument>,
|
document: Option<&ServoLayoutDocument>,
|
||||||
rw_data: &mut LayoutThreadData,
|
rw_data: &mut LayoutThreadData,
|
||||||
context: &mut LayoutContext) {
|
context: &mut LayoutContext) {
|
||||||
if let Some(mut root_flow) = self.root_flow.clone() {
|
// Kick off animations if any were triggered, expire completed ones.
|
||||||
// Kick off animations if any were triggered, expire completed ones.
|
animation::update_animation_state(&self.constellation_chan,
|
||||||
animation::update_animation_state(&self.constellation_chan,
|
&self.script_chan,
|
||||||
&self.script_chan,
|
&mut *self.running_animations.write(),
|
||||||
&mut *self.running_animations.write(),
|
&mut *self.expired_animations.write(),
|
||||||
&mut *self.expired_animations.write(),
|
&self.new_animations_receiver,
|
||||||
&self.new_animations_receiver,
|
self.id,
|
||||||
self.id,
|
&self.timer);
|
||||||
&self.timer);
|
|
||||||
|
|
||||||
profile(time::ProfilerCategory::LayoutRestyleDamagePropagation,
|
profile(time::ProfilerCategory::LayoutRestyleDamagePropagation,
|
||||||
|
self.profiler_metadata(),
|
||||||
|
self.time_profiler_chan.clone(),
|
||||||
|
|| {
|
||||||
|
// Call `compute_layout_damage` even in non-incremental mode, because it sets flags
|
||||||
|
// that are needed in both incremental and non-incremental traversals.
|
||||||
|
let damage = FlowRef::deref_mut(root_flow).compute_layout_damage();
|
||||||
|
|
||||||
|
if opts::get().nonincremental_layout || damage.contains(REFLOW_ENTIRE_DOCUMENT) {
|
||||||
|
FlowRef::deref_mut(root_flow).reflow_entire_document()
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if opts::get().trace_layout {
|
||||||
|
layout_debug::begin_trace(root_flow.clone());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resolve generated content.
|
||||||
|
profile(time::ProfilerCategory::LayoutGeneratedContent,
|
||||||
|
self.profiler_metadata(),
|
||||||
|
self.time_profiler_chan.clone(),
|
||||||
|
|| sequential::resolve_generated_content(FlowRef::deref_mut(root_flow), &context));
|
||||||
|
|
||||||
|
// Guess float placement.
|
||||||
|
profile(time::ProfilerCategory::LayoutFloatPlacementSpeculation,
|
||||||
|
self.profiler_metadata(),
|
||||||
|
self.time_profiler_chan.clone(),
|
||||||
|
|| sequential::guess_float_placement(FlowRef::deref_mut(root_flow)));
|
||||||
|
|
||||||
|
// Perform the primary layout passes over the flow tree to compute the locations of all
|
||||||
|
// the boxes.
|
||||||
|
if flow::base(&**root_flow).restyle_damage.intersects(REFLOW | REFLOW_OUT_OF_FLOW) {
|
||||||
|
profile(time::ProfilerCategory::LayoutMain,
|
||||||
self.profiler_metadata(),
|
self.profiler_metadata(),
|
||||||
self.time_profiler_chan.clone(),
|
self.time_profiler_chan.clone(),
|
||||||
|| {
|
|| {
|
||||||
// Call `compute_layout_damage` even in non-incremental mode, because it sets flags
|
let profiler_metadata = self.profiler_metadata();
|
||||||
// that are needed in both incremental and non-incremental traversals.
|
|
||||||
let damage = FlowRef::deref_mut(&mut root_flow).compute_layout_damage();
|
|
||||||
|
|
||||||
if opts::get().nonincremental_layout || damage.contains(REFLOW_ENTIRE_DOCUMENT) {
|
if let (true, Some(traversal)) = (self.parallel_flag, self.parallel_traversal.as_mut()) {
|
||||||
FlowRef::deref_mut(&mut root_flow).reflow_entire_document()
|
// Parallel mode.
|
||||||
|
LayoutThread::solve_constraints_parallel(traversal,
|
||||||
|
FlowRef::deref_mut(root_flow),
|
||||||
|
profiler_metadata,
|
||||||
|
self.time_profiler_chan.clone(),
|
||||||
|
&*context);
|
||||||
|
} else {
|
||||||
|
//Sequential mode
|
||||||
|
LayoutThread::solve_constraints(FlowRef::deref_mut(root_flow), &context)
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if opts::get().trace_layout {
|
|
||||||
layout_debug::begin_trace(root_flow.clone());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Resolve generated content.
|
|
||||||
profile(time::ProfilerCategory::LayoutGeneratedContent,
|
|
||||||
self.profiler_metadata(),
|
|
||||||
self.time_profiler_chan.clone(),
|
|
||||||
|| sequential::resolve_generated_content(FlowRef::deref_mut(&mut root_flow), &context));
|
|
||||||
|
|
||||||
// Guess float placement.
|
|
||||||
profile(time::ProfilerCategory::LayoutFloatPlacementSpeculation,
|
|
||||||
self.profiler_metadata(),
|
|
||||||
self.time_profiler_chan.clone(),
|
|
||||||
|| sequential::guess_float_placement(FlowRef::deref_mut(&mut root_flow)));
|
|
||||||
|
|
||||||
// Perform the primary layout passes over the flow tree to compute the locations of all
|
|
||||||
// the boxes.
|
|
||||||
if flow::base(&*root_flow).restyle_damage.intersects(REFLOW | REFLOW_OUT_OF_FLOW) {
|
|
||||||
profile(time::ProfilerCategory::LayoutMain,
|
|
||||||
self.profiler_metadata(),
|
|
||||||
self.time_profiler_chan.clone(),
|
|
||||||
|| {
|
|
||||||
let profiler_metadata = self.profiler_metadata();
|
|
||||||
|
|
||||||
if let (true, Some(traversal)) = (self.parallel_flag, self.parallel_traversal.as_mut()) {
|
|
||||||
// Parallel mode.
|
|
||||||
LayoutThread::solve_constraints_parallel(traversal,
|
|
||||||
FlowRef::deref_mut(&mut root_flow),
|
|
||||||
profiler_metadata,
|
|
||||||
self.time_profiler_chan.clone(),
|
|
||||||
&*context);
|
|
||||||
} else {
|
|
||||||
//Sequential mode
|
|
||||||
LayoutThread::solve_constraints(FlowRef::deref_mut(&mut root_flow), &context)
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
profile(time::ProfilerCategory::LayoutStoreOverflow,
|
|
||||||
self.profiler_metadata(),
|
|
||||||
self.time_profiler_chan.clone(),
|
|
||||||
|| {
|
|
||||||
sequential::store_overflow(context,
|
|
||||||
FlowRef::deref_mut(&mut root_flow) as &mut Flow);
|
|
||||||
});
|
|
||||||
|
|
||||||
self.perform_post_main_layout_passes(data,
|
|
||||||
query_type,
|
|
||||||
document,
|
|
||||||
rw_data,
|
|
||||||
context);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
profile(time::ProfilerCategory::LayoutStoreOverflow,
|
||||||
|
self.profiler_metadata(),
|
||||||
|
self.time_profiler_chan.clone(),
|
||||||
|
|| {
|
||||||
|
sequential::store_overflow(context,
|
||||||
|
FlowRef::deref_mut(root_flow) as &mut Flow);
|
||||||
|
});
|
||||||
|
|
||||||
|
self.perform_post_main_layout_passes(data,
|
||||||
|
query_type,
|
||||||
|
document,
|
||||||
|
rw_data,
|
||||||
|
context);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn perform_post_main_layout_passes(&mut self,
|
fn perform_post_main_layout_passes(&mut self,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue