Skip to content
Permalink
Browse files

Re-enable parallel selector matching.

The problems that were caused because of Yellow River seem to be fixed.

(See #1319).
  • Loading branch information...
pradeep90 committed Dec 18, 2013
1 parent d4fcbf5 commit f9c7c485eae308411d40150805950a17cd6b3613
Showing with 2 additions and 3 deletions.
  1. +2 −3 src/components/main/css/matching.rs
@@ -8,6 +8,7 @@ use std::cell::Cell;
use std::comm;
use std::task;
use std::vec;
use std::rt;
use extra::arc::{Arc, RWArc};

use css::node_style::StyledNode;
@@ -43,9 +44,7 @@ impl MatchMethods for AbstractNode<LayoutView> {
}
}
fn match_subtree(&self, stylist: RWArc<Stylist>) {
// FIXME(pcwalton): Racy. Parallel CSS selector matching is disabled.
//let num_tasks = rt::default_sched_threads() * 2;
let num_tasks = 1;
let num_tasks = rt::default_sched_threads() * 2;
let mut node_count = 0;
let mut nodes_per_task = vec::from_elem(num_tasks, ~[]);

5 comments on commit f9c7c48

@bors-servo

This comment has been minimized.

Copy link
Contributor

replied Dec 18, 2013

saw approval from pcwalton
at pradeep90@f9c7c48

@bors-servo

This comment has been minimized.

Copy link
Contributor

replied Dec 18, 2013

merging pradeep90/servo/master = f9c7c48 into auto

@bors-servo

This comment has been minimized.

Copy link
Contributor

replied Dec 18, 2013

pradeep90/servo/master = f9c7c48 merged ok, testing candidate = da4cff0

@bors-servo

This comment has been minimized.

Copy link
Contributor

replied Dec 18, 2013

fast-forwarding master to auto = da4cff0

Please sign in to comment.
You can’t perform that action at this time.