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

Store bloom filter hashes inline.

Browse source 
MozReview-Commit-ID: F07JkdduLaI
This commit is contained in:
Bobby Holley 2017-04-17 19:05:25 -07:00
parent 9524c5cb57
commit 69e3870cdd
2 changed files with 90 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

48
components/selectors/matching.rs
View file

@ -4,7 +4,6 @@
use bloom::BloomFilter;
use parser::{CaseSensitivity, Combinator, ComplexSelector, LocalName};
use parser::{SimpleSelector, Selector, SelectorInner};
use precomputed_hash::PrecomputedHash;
use std::borrow::Borrow;
use tree::Element;
@ -113,49 +112,18 @@ fn may_match<E>(sel: &SelectorInner<E::Impl>,
-> bool
where E: Element,
{
let mut selector = &*sel.complex;
// See if the bloom filter can exclude any of the descendant selectors, and
// reject if we can.
loop {
match selector.next {
None => break,
Some((ref cs, Combinator::Child)) |
Some((ref cs, Combinator::Descendant)) => selector = &**cs,
Some((ref cs, _)) => {
selector = &**cs;
continue;
}
};
// Check against the list of precomputed hashes.
for hash in sel.ancestor_hashes.iter() {
// If we hit the 0 sentinel hash, that means the rest are zero as well.
if *hash == 0 {
break;
}
for ss in selector.compound_selector.iter() {
match *ss {
SimpleSelector::LocalName(LocalName { ref name, ref lower_name }) => {
if !bf.might_contain_hash(name.precomputed_hash()) &&
!bf.might_contain_hash(lower_name.precomputed_hash()) {
return false
}
},
SimpleSelector::Namespace(ref namespace) => {
if !bf.might_contain_hash(namespace.url.precomputed_hash()) {
return false
}
},
SimpleSelector::ID(ref id) => {
if !bf.might_contain_hash(id.precomputed_hash()) {
return false
}
},
SimpleSelector::Class(ref class) => {
if !bf.might_contain_hash(class.precomputed_hash()) {
return false
}
},
_ => {},
}
if !bf.might_contain_hash(*hash) {
return false;
}
}
// If we haven't proven otherwise, it may match.
true
}