aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Cobos Álvarez <emilio@crisal.io>2017-05-18 20:06:43 +0200
committerEmilio Cobos Álvarez <emilio@crisal.io>2017-05-18 20:06:43 +0200
commitb2db9d59cab53f70e7ed6ad8f4b68a818d00a1d3 (patch)
treed7c904c9a41653f3e023515ef620fee1948a95e3
parent9d887a23756c9b646394831a073a3a0cbfc07e15 (diff)
downloadservo-b2db9d59cab53f70e7ed6ad8f4b68a818d00a1d3.tar.gz
servo-b2db9d59cab53f70e7ed6ad8f4b68a818d00a1d3.zip
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.
-rw-r--r--ports/geckolib/glue.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs
index afbb8c7ef57..d04625727aa 100644
--- a/ports/geckolib/glue.rs
+++ b/ports/geckolib/glue.rs
@@ -210,14 +210,14 @@ fn traverse_subtree(element: GeckoElement,
debug!("Traversing subtree:");
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
} else {
TraversalDriver::Parallel
};
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,
global_style_data.style_thread_pool.as_ref().unwrap());
} else {