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

Rearrange compute_style and eliminate MatchResults.

Browse source 
This simplifies things by avoiding the computation of MatchResults when we
don't need them.

We continue to compute rule_nodes_changed, even though we don't use it
for the moment, since we will need it soon for various incremental restyle
optimizations.

MozReview-Commit-ID: 4qsUYaD5Bs2
This commit is contained in:
Bobby Holley 2017-04-05 18:55:09 -07:00
parent 42f5aea76a
commit 19743a67ba
2 changed files with 23 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

44
components/style/traversal.rs
View file

@ -10,7 +10,8 @@ use atomic_refcell::{AtomicRefCell, AtomicRefMut};
use context::{SharedStyleContext, StyleContext, ThreadLocalStyleContext};
use data::{ElementData, ElementStyles, StoredRestyleHint};
use dom::{DirtyDescendants, NodeInfo, TElement, TNode};
use matching::{MatchMethods, MatchResults};
use matching::MatchMethods;
use matching::relations_are_shareable;
use restyle_hints::{RESTYLE_DESCENDANTS, RESTYLE_SELF};
use selector_parser::RestyleDamage;
use servo_config::opts;
@ -586,7 +587,7 @@ fn compute_style<E, D>(_traversal: &D,
}
}
let match_results = match kind {
match kind {
MatchAndCascade => {
// Ensure the bloom filter is up to date.
let dom_depth =
@ -605,35 +606,30 @@ fn compute_style<E, D>(_traversal: &D,
// Perform CSS selector matching.
context.thread_local.statistics.elements_matched += 1;
element.match_element(context, &mut data)
let (primary_relations, _rule_nodes_changed) =
element.match_element(context, &mut data);
// Cascade properties and compute values.
element.cascade_element(context, &mut data);
// If the style is shareable, add it to the LRU cache.
if relations_are_shareable(&primary_relations) {
context.thread_local
.style_sharing_candidate_cache
.insert_if_possible(&element,
data.styles().primary.values(),
primary_relations);
}
}
CascadeWithReplacements(hint) => {
let rule_nodes_changed =
let _rule_nodes_changed =
element.cascade_with_replacements(hint, context, &mut data);
MatchResults {
primary_relations: None,
rule_nodes_changed: rule_nodes_changed,
}
element.cascade_element(context, &mut data);
}
CascadeOnly => {
MatchResults {
primary_relations: None,
rule_nodes_changed: false,
}
element.cascade_element(context, &mut data);
}
};
// Cascade properties and compute values.
element.cascade_element(context, &mut data);
// If the style is shareable, add it to the LRU cache.
if match_results.primary_is_shareable() {
context.thread_local
.style_sharing_candidate_cache
.insert_if_possible(&element,
data.styles().primary.values(),
match_results.primary_relations.unwrap());
}
}
fn preprocess_children<E, D>(traversal: &D,