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

Auto merge of #19059 - emilio:selector-map-nicer, r=nox

Browse source 
style: Make the SelectorMap API slightly nicer.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19059)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-10-30 06:42:14 -05:00 • committed by GitHub
commit 1b73cf3352
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/invalidation/element/collector.rs
View file

@ -341,7 +341,7 @@ where
self.quirks_mode,
self.removed_id,
self.classes_removed,
&mut |dependency| {
|dependency| {
self.scan_dependency(dependency, VisitedDependent::No);
true
},
@ -358,7 +358,7 @@ where
self.quirks_mode,
self.removed_id,
self.classes_removed,
&mut |dependency| {
|dependency| {
if !dependency.state.intersects(state_changes) {
return true;
}

6
components/style/selector_map.rs
View file

@ -294,7 +294,7 @@ impl<T: SelectorMapEntry> SelectorMap<T> {
/// FIXME(bholley) This overlaps with SelectorMap<Rule>::get_all_matching_rules,
/// but that function is extremely hot and I'd rather not rearrange it.
#[inline]
pub fn lookup<'a, E, F>(&'a self, element: E, quirks_mode: QuirksMode, f: &mut F) -> bool
pub fn lookup<'a, E, F>(&'a self, element: E, quirks_mode: QuirksMode, mut f: F) -> bool
where
E: TElement,
F: FnMut(&'a T) -> bool
@ -361,14 +361,14 @@ impl<T: SelectorMapEntry> SelectorMap<T> {
quirks_mode: QuirksMode,
additional_id: Option<&Atom>,
additional_classes: &[Atom],
f: &mut F,
mut f: F,
) -> bool
where
E: TElement,
F: FnMut(&'a T) -> bool
{
// Do the normal lookup.
if !self.lookup(element, quirks_mode, f) {
if !self.lookup(element, quirks_mode, |entry| f(entry)) {
return false;
}

4
components/style/stylist.rs
View file

@ -1475,7 +1475,7 @@ impl Stylist {
data.selectors_for_cache_revalidation.lookup(
element,
self.quirks_mode,
&mut |selector_and_hashes| {
|selector_and_hashes| {
results.push(matches_selector(
&selector_and_hashes.selector,
selector_and_hashes.selector_offset,
@ -1493,7 +1493,7 @@ impl Stylist {
stylist.cascade_data.author.selectors_for_cache_revalidation.lookup(
element,
stylist.quirks_mode,
&mut |selector_and_hashes| {
|selector_and_hashes| {
results.push(matches_selector(
&selector_and_hashes.selector,
selector_and_hashes.selector_offset,