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

style: Simplify selector flags setup even more

Browse source 
In my investigation for bug 1766439, I am digging into why selector
matching regressed.

It doesn't help that the selector-matching code is instantiated a
gazillion times (so there's a ton of copies of the relevant functions).

This was needed in the past because we had different ways of setting the
selector flags on elements, but I unified that recently and now we only
need to either set them or not. That is the kind of thing that
MatchingContext is really good for, so pass that instead on
MatchingContext creation.

Differential Revision: https://phabricator.services.mozilla.com/D145428
This commit is contained in:
Emilio Cobos Álvarez 2023-08-12 00:26:15 +02:00 • committed by Martin Robinson
parent db53845694
commit 4878422c93
14 changed files with 176 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/style/selector_map.rs
View file

@ -14,7 +14,7 @@ use crate::stylist::{CascadeData, Rule};
use crate::AllocErr;
use crate::{Atom, LocalName, Namespace, ShrinkIfNeeded, WeakAtom};
use precomputed_hash::PrecomputedHash;
use selectors::matching::{matches_selector, ElementSelectorFlags, MatchingContext};
use selectors::matching::{matches_selector, MatchingContext};
use selectors::parser::{Combinator, Component, SelectorIter};
use smallvec::SmallVec;
use std::collections::hash_map;
@ -186,18 +186,16 @@ impl SelectorMap<Rule> {
///
/// Extract matching rules as per element's ID, classes, tag name, etc..
/// Sort the Rules at the end to maintain cascading order.
pub fn get_all_matching_rules<E, F>(
pub fn get_all_matching_rules<E>(
&self,
element: E,
rule_hash_target: E,
matching_rules_list: &mut ApplicableDeclarationList,
context: &mut MatchingContext<E::Impl>,
flags_setter: &mut F,
cascade_level: CascadeLevel,
cascade_data: &CascadeData,
) where
E: TElement,
F: FnMut(&E, ElementSelectorFlags),
{
if self.is_empty() {
return;
@ -211,7 +209,6 @@ impl SelectorMap<Rule> {
&self.root,
matching_rules_list,
context,
flags_setter,
cascade_level,
cascade_data,
);
@ -224,7 +221,6 @@ impl SelectorMap<Rule> {
rules,
matching_rules_list,
context,
flags_setter,
cascade_level,
cascade_data,
)
@ -238,7 +234,6 @@ impl SelectorMap<Rule> {
rules,
matching_rules_list,
context,
flags_setter,
cascade_level,
cascade_data,
)
@ -253,7 +248,6 @@ impl SelectorMap<Rule> {
rules,
matching_rules_list,
context,
flags_setter,
cascade_level,
cascade_data,
)
@ -267,7 +261,6 @@ impl SelectorMap<Rule> {
rules,
matching_rules_list,
context,
flags_setter,
cascade_level,
cascade_data,
)
@ -279,7 +272,6 @@ impl SelectorMap<Rule> {
rules,
matching_rules_list,
context,
flags_setter,
cascade_level,
cascade_data,
)
@ -290,24 +282,21 @@ impl SelectorMap<Rule> {
&self.other,
matching_rules_list,
context,
flags_setter,
cascade_level,
cascade_data,
);
}
/// Adds rules in `rules` that match `element` to the `matching_rules` list.
pub(crate) fn get_matching_rules<E, F>(
pub(crate) fn get_matching_rules<E>(
element: E,
rules: &[Rule],
matching_rules: &mut ApplicableDeclarationList,
context: &mut MatchingContext<E::Impl>,
flags_setter: &mut F,
cascade_level: CascadeLevel,
cascade_data: &CascadeData,
) where
E: TElement,
F: FnMut(&E, ElementSelectorFlags),
{
for rule in rules {
if matches_selector(
@ -316,7 +305,6 @@ impl SelectorMap<Rule> {
Some(&rule.hashes),
&element,
context,
flags_setter,
) {
matching_rules
.push(rule.to_applicable_declaration_block(cascade_level, cascade_data));