diff options
| author | Bastien Orivel <eijebong@bananium.fr> | 2019-06-24 23:04:13 +0200 |
|---|---|---|
| committer | Bastien Orivel <eijebong@bananium.fr> | 2019-07-12 21:01:33 +0200 |
| commit | 28fa0f8009e78d6bd9dead87f82eba83df1189e8 (patch) | |
| tree | 940f7e27709da5b2450d2872e94af5b8a9337de7 /components/style/parallel.rs | |
| parent | df73c71fb18c144abedd6889c34dd1031ffcbb8e (diff) | |
| download | servo-28fa0f8009e78d6bd9dead87f82eba83df1189e8.tar.gz servo-28fa0f8009e78d6bd9dead87f82eba83df1189e8.zip | |
Update rayon to dedupe crossbeam-epoch
As a bonus this also removes one version of crossbeam-utils
Diffstat (limited to 'components/style/parallel.rs')
| -rw-r--r-- | components/style/parallel.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/style/parallel.rs b/components/style/parallel.rs index 619be351579..d4aa0af6acf 100644 --- a/components/style/parallel.rs +++ b/components/style/parallel.rs @@ -104,7 +104,7 @@ fn top_down_dom<'a, 'scope, E, D>( nodes: &'a [SendNode<E::ConcreteNode>], root: OpaqueNode, mut traversal_data: PerLevelTraversalData, - scope: &'a rayon::Scope<'scope>, + scope: &'a rayon::ScopeFifo<'scope>, pool: &'scope rayon::ThreadPool, traversal: &'scope D, tls: &'scope ScopedTLS<'scope, ThreadLocalStyleContext<E>>, @@ -248,7 +248,7 @@ pub fn traverse_nodes<'a, 'scope, E, D, I>( recursion_ok: bool, root: OpaqueNode, traversal_data: PerLevelTraversalData, - scope: &'a rayon::Scope<'scope>, + scope: &'a rayon::ScopeFifo<'scope>, pool: &'scope rayon::ThreadPool, traversal: &'scope D, tls: &'scope ScopedTLS<'scope, ThreadLocalStyleContext<E>>, @@ -276,7 +276,7 @@ pub fn traverse_nodes<'a, 'scope, E, D, I>( if may_dispatch_tail { top_down_dom(&work, root, traversal_data, scope, pool, traversal, tls); } else { - scope.spawn(move |scope| { + scope.spawn_fifo(move |scope| { profiler_label!(Style); let work = work; top_down_dom(&work, root, traversal_data, scope, pool, traversal, tls); @@ -286,7 +286,7 @@ pub fn traverse_nodes<'a, 'scope, E, D, I>( for chunk in nodes.chunks(WORK_UNIT_MAX).into_iter() { let nodes: WorkUnit<E::ConcreteNode> = chunk.collect(); let traversal_data_copy = traversal_data.clone(); - scope.spawn(move |scope| { + scope.spawn_fifo(move |scope| { profiler_label!(Style); let n = nodes; top_down_dom(&*n, root, traversal_data_copy, scope, pool, traversal, tls) |