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

Merge style_affecting_attributes_selectors with selectors_for_cache_revalidation.

Browse source
This commit is contained in:
Bobby Holley 2017-04-11 14:06:11 +08:00
parent 6515f78f6d
commit d51d95d0c7
3 changed files with 8 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

28
components/style/matching.rs
View file

@ -95,12 +95,9 @@ pub enum CacheMiss {
Class,
/// The presentation hints didn't match.
PresHints,
/// The element and the candidate didn't match the same set of
/// sibling-affecting rules.
SiblingRules,
/// The element and the candidate didn't match the same set of style
/// affecting attribute selectors.
AttrRules,
/// The element and the candidate didn't match the same set of revalidation
/// selectors.
Revalidation,
}
fn element_matches_candidate<E: TElement>(element: &E,
@ -155,13 +152,7 @@ fn element_matches_candidate<E: TElement>(element: &E,
}
if !revalidate(element, candidate_element, shared_context) {
miss!(SiblingRules)
}
if !match_same_style_affecting_attributes_rules(element,
candidate_element,
shared_context) {
miss!(AttrRules)
miss!(Revalidation)
}
let data = candidate_element.borrow_data().unwrap();
@ -201,14 +192,6 @@ fn have_same_class<E: TElement>(element: &E,
element_class_attributes == *candidate.class_attributes.as_ref().unwrap()
}
// TODO: These re-match the candidate every time, which is suboptimal.
#[inline]
fn match_same_style_affecting_attributes_rules<E: TElement>(element: &E,
candidate: &E,
ctx: &SharedStyleContext) -> bool {
ctx.stylist.match_same_style_affecting_attributes_rules(element, candidate)
}
#[inline]
fn revalidate<E: TElement>(element: &E,
candidate: &E,
@ -1031,8 +1014,7 @@ pub trait MatchMethods : TElement {
// Too expensive failure, give up, we don't want another
// one of these.
CacheMiss::PresHints |
CacheMiss::SiblingRules |
CacheMiss::AttrRules => break,
CacheMiss::Revalidation => break,
_ => {}
}
}