Commit 4b79ad86 authored by Emilio Cobos Álvarez's avatar Emilio Cobos Álvarez
Browse files

servo: Merge #19059 - style: Make the SelectorMap API slightly nicer (from... 

servo: Merge #19059 - style: Make the SelectorMap API slightly nicer (from emilio:selector-map-nicer); r=nox

Source-Repo: https://github.com/servo/servo
Source-Revision: 1b73cf33525afbbe2d077554d1965b74ef9ae5e3

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 6987ea98f71bcb9e63b1ecfc2c033b751967a890
parent 01008c7d

servo/components/style/invalidation/element/collector.rs

+2 −2
Original line number Diff line number Diff line
@@ -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;

                }

servo/components/style/selector_map.rs

+3 −3
Original line number Diff line number Diff line
@@ -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;

        }

servo/components/style/stylist.rs

+2 −2
Original line number Diff line number Diff line
@@ -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,