Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #9964 - mbrubeck:incremental-damage, r=pcwalton

Browse source 
Compute damage even when incremental layout is disabled

This fixes traversals that use the damage flags to decide which nodes to process, such as `resolve_generated_content`, which was broken in non-incremental mode. r? @pcwalton

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9964)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-03-12 05:00:17 +05:30
commit d330ecdafc
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/layout/layout_thread.rs
View file

@ -1302,9 +1302,11 @@ impl LayoutThread {
self.profiler_metadata(), self.profiler_metadata(),
self.time_profiler_chan.clone(), self.time_profiler_chan.clone(),
|| { || {
if opts::get().nonincremental_layout || // Call `compute_layout_damage` even in non-incremental mode, because it sets flags
flow_ref::deref_mut(&mut root_flow).compute_layout_damage() // that are needed in both incremental and non-incremental traversals.
.contains(REFLOW_ENTIRE_DOCUMENT) { let damage = flow_ref::deref_mut(&mut root_flow).compute_layout_damage();
if opts::get().nonincremental_layout || damage.contains(REFLOW_ENTIRE_DOCUMENT) {
flow_ref::deref_mut(&mut root_flow).reflow_entire_document() flow_ref::deref_mut(&mut root_flow).reflow_entire_document()
} }
}); });