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

Update rust-selectors

Browse source 
Update for https://github.com/servo/rust-selectors/pull/37
This commit is contained in:
Simon Sapin 2015-07-17 18:18:39 +02:00
parent 0d7744b198
commit 055a1c5cee
18 changed files with 171 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/layout/traversal.rs
View file

@ -16,7 +16,6 @@ use wrapper::{layout_node_to_unsafe_layout_node, LayoutNode};
use wrapper::{ThreadSafeLayoutNode, UnsafeLayoutNode};
use selectors::bloom::BloomFilter;
use selectors::Node;
use util::opts;
use util::tid::tid;
@ -162,10 +161,7 @@ impl<'a> PreorderDomTraversal for RecalcStyleForNode<'a> {
let parent_opt = node.layout_parent_node(self.layout_context.shared);
// Get the style bloom filter.
let bf = take_task_local_bloom_filter(parent_opt, self.layout_context);
// Just needs to be wrapped in an option for `match_node`.
let some_bf = Some(bf);
let mut bf = take_task_local_bloom_filter(parent_opt, self.layout_context);
let nonincremental_layout = opts::get().nonincremental_layout;
if nonincremental_layout || node.is_dirty() {
@ -192,7 +188,7 @@ impl<'a> PreorderDomTraversal for RecalcStyleForNode<'a> {
// Perform the CSS selector matching.
let stylist = unsafe { &*self.layout_context.shared.stylist };
node.match_node(stylist,
&some_bf,
Some(&*bf),
&mut applicable_declarations,
&mut shareable);
} else if node.has_changed() {
@ -211,7 +207,9 @@ impl<'a> PreorderDomTraversal for RecalcStyleForNode<'a> {
// Add ourselves to the LRU cache.
if shareable {
style_sharing_candidate_cache.insert_if_possible(&node);
if let Some(element) = node.as_element() {
style_sharing_candidate_cache.insert_if_possible(&element);
}
}
}
StyleSharingResult::StyleWasShared(index, damage) => {
@ -221,8 +219,6 @@ impl<'a> PreorderDomTraversal for RecalcStyleForNode<'a> {
}
}
let mut bf = some_bf.unwrap();
let unsafe_layout_node = layout_node_to_unsafe_layout_node(&node);
// Before running the children, we need to insert our nodes into the bloom