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

Auto merge of #16938 - emilio:traversal-assert, r=bzbarsky

Browse source 
stylo: Don't mess up traversal drivers.

Right now it's harmless, but it trips assertions that are nice to have, just in
case it stops being the case.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16938)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-05-18 13:38:41 -05:00 • committed by GitHub
commit e1ecd3b89c
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ports/geckolib/glue.rs
View file

@ -210,14 +210,14 @@ fn traverse_subtree(element: GeckoElement,
debug!("Traversing subtree:"); debug!("Traversing subtree:");
debug!("{:?}", ShowSubtreeData(element.as_node())); debug!("{:?}", ShowSubtreeData(element.as_node()));
let traversal_driver = if global_style_data.style_thread_pool.is_none() { let traversal_driver = if global_style_data.style_thread_pool.is_none() || !element.is_root() {
TraversalDriver::Sequential TraversalDriver::Sequential
} else { } else {
TraversalDriver::Parallel TraversalDriver::Parallel
}; };
let traversal = RecalcStyleOnly::new(shared_style_context, traversal_driver); let traversal = RecalcStyleOnly::new(shared_style_context, traversal_driver);
if traversal_driver.is_parallel() && element.is_root() { if traversal_driver.is_parallel() {
parallel::traverse_dom(&traversal, element, token, parallel::traverse_dom(&traversal, element, token,
global_style_data.style_thread_pool.as_ref().unwrap()); global_style_data.style_thread_pool.as_ref().unwrap());
} else { } else {