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

Introduce and use Scoped TLS.

Browse source 
It turns out that it's problematic to embed ThreadLocalStyleContext within
LayoutContext, because parameterizing the former on TElement (which we do
in the next patch) infects all the traversal stuff with the trait parameters,
which we don't really want.

In general, it probably makes sense to use separate scoped TLS types for
the separate DOM and Flow tree passes, so we can add a different ScopedTLS
type for the Flow pass if we ever need it.

We also reorder the |scope| and |shared| parameters in parallel.rs, because
it aligns more with the order in style/parallel.rs. I did this when I was
adding a TLS parameter to all these functions, which I realized we don't need
for now.
This commit is contained in:
Bobby Holley 2016-12-16 11:50:11 -08:00
parent 8f7f62f810
commit c5f01fe3b8
16 changed files with 212 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/style/sequential.rs
View file

@ -5,7 +5,6 @@
//! Implements sequential traversal over the DOM tree.
use dom::{TElement, TNode};
use std::borrow::Borrow;
use traversal::{DomTraversal, PerLevelTraversalData, PreTraverseToken};
pub fn traverse_dom<N, D>(traversal: &D,
@ -16,43 +15,41 @@ pub fn traverse_dom<N, D>(traversal: &D,
{
debug_assert!(token.should_traverse());
fn doit<N, D>(traversal: &D, node: N, data: &mut PerLevelTraversalData)
fn doit<N, D>(traversal: &D, traversal_data: &mut PerLevelTraversalData,
thread_local: &mut D::ThreadLocalContext, node: N)
where N: TNode,
D: DomTraversal<N>
{
traversal.process_preorder(node, data);
traversal.process_preorder(traversal_data, thread_local, node);
if let Some(el) = node.as_element() {
if let Some(ref mut depth) = data.current_dom_depth {
if let Some(ref mut depth) = traversal_data.current_dom_depth {
*depth += 1;
}
D::traverse_children(el, |kid| doit(traversal, kid, data));
D::traverse_children(el, |kid| doit(traversal, traversal_data, thread_local, kid));
if let Some(ref mut depth) = data.current_dom_depth {
if let Some(ref mut depth) = traversal_data.current_dom_depth {
*depth -= 1;
}
}
if D::needs_postorder_traversal() {
traversal.process_postorder(node);
traversal.process_postorder(thread_local, node);
}
}
let mut data = PerLevelTraversalData {
let mut traversal_data = PerLevelTraversalData {
current_dom_depth: None,
};
let mut tlc = traversal.create_thread_local_context();
if token.traverse_unstyled_children_only() {
for kid in root.as_node().children() {
if kid.as_element().map_or(false, |el| el.get_data().is_none()) {
doit(traversal, kid, &mut data);
doit(traversal, &mut traversal_data, &mut tlc, kid);
}
}
} else {
doit(traversal, root.as_node(), &mut data);
doit(traversal, &mut traversal_data, &mut tlc, root.as_node());
}
// Clear the local LRU cache since we store stateful elements inside.
let tlc = traversal.create_or_get_thread_local_context();
(*tlc).borrow().style_sharing_candidate_cache.borrow_mut().clear();
}