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

style: Don't waste a whole selector map for each class / id in the document.

Browse source 
It's just useless.
This commit is contained in:
Emilio Cobos Álvarez 2017-09-05 11:52:49 +02:00
parent d880efcab3
commit cc31397a2e
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/style/invalidation/element/invalidation_map.rs
View file

@ -139,10 +139,10 @@ impl SelectorMapEntry for StateDependency {
pub struct InvalidationMap { pub struct InvalidationMap {
/// A map from a given class name to all the selectors with that class /// A map from a given class name to all the selectors with that class
/// selector. /// selector.
pub class_to_selector: MaybeCaseInsensitiveHashMap<Atom, SelectorMap<Dependency>>, pub class_to_selector: MaybeCaseInsensitiveHashMap<Atom, SmallVec<[Dependency; 1]>>,
/// A map from a given id to all the selectors with that ID in the /// A map from a given id to all the selectors with that ID in the
/// stylesheets currently applying to the document. /// stylesheets currently applying to the document.
pub id_to_selector: MaybeCaseInsensitiveHashMap<Atom, SelectorMap<Dependency>>, pub id_to_selector: MaybeCaseInsensitiveHashMap<Atom, SmallVec<[Dependency; 1]>>,
/// A map of all the state dependencies. /// A map of all the state dependencies.
pub state_affecting_selectors: SelectorMap<StateDependency>, pub state_affecting_selectors: SelectorMap<StateDependency>,
/// A map of other attribute affecting selectors. /// A map of other attribute affecting selectors.
@ -245,21 +245,21 @@ impl InvalidationMap {
for class in compound_visitor.classes { for class in compound_visitor.classes {
self.class_to_selector self.class_to_selector
.entry(class, quirks_mode) .entry(class, quirks_mode)
.or_insert_with(SelectorMap::new) .or_insert_with(SmallVec::new)
.insert(Dependency { .push(Dependency {
selector: selector.clone(), selector: selector.clone(),
selector_offset: sequence_start, selector_offset: sequence_start,
}, quirks_mode); })
} }
for id in compound_visitor.ids { for id in compound_visitor.ids {
self.id_to_selector self.id_to_selector
.entry(id, quirks_mode) .entry(id, quirks_mode)
.or_insert_with(SelectorMap::new) .or_insert_with(SmallVec::new)
.insert(Dependency { .push(Dependency {
selector: selector.clone(), selector: selector.clone(),
selector_offset: sequence_start, selector_offset: sequence_start,
}, quirks_mode); })
} }
if !compound_visitor.state.is_empty() { if !compound_visitor.state.is_empty() {
@ -299,14 +299,7 @@ impl InvalidationMap {
let mut n = 0; let mut n = 0;
n += self.class_to_selector.malloc_shallow_size_of_hash(malloc_enclosing_size_of); n += self.class_to_selector.malloc_shallow_size_of_hash(malloc_enclosing_size_of);
for (_, val) in self.class_to_selector.iter() {
n += val.malloc_size_of_children(malloc_enclosing_size_of);
}
n += self.id_to_selector.malloc_shallow_size_of_hash(malloc_enclosing_size_of); n += self.id_to_selector.malloc_shallow_size_of_hash(malloc_enclosing_size_of);
for (_, val) in self.id_to_selector.iter() {
n += val.malloc_size_of_children(malloc_enclosing_size_of);
}
n += self.state_affecting_selectors.malloc_size_of_children(malloc_enclosing_size_of); n += self.state_affecting_selectors.malloc_size_of_children(malloc_enclosing_size_of);

12
components/style/invalidation/element/invalidator.rs
View file

@ -792,20 +792,26 @@ impl<'a, 'b: 'a, E> InvalidationCollector<'a, 'b, E>
let removed_id = self.removed_id; let removed_id = self.removed_id;
if let Some(ref id) = removed_id { if let Some(ref id) = removed_id {
if let Some(deps) = map.id_to_selector.get(id, quirks_mode) { if let Some(deps) = map.id_to_selector.get(id, quirks_mode) {
self.collect_dependencies_in_map(deps) for dep in deps {
self.scan_dependency(dep, false);
}
} }
} }
let added_id = self.added_id; let added_id = self.added_id;
if let Some(ref id) = added_id { if let Some(ref id) = added_id {
if let Some(deps) = map.id_to_selector.get(id, quirks_mode) { if let Some(deps) = map.id_to_selector.get(id, quirks_mode) {
self.collect_dependencies_in_map(deps) for dep in deps {
self.scan_dependency(dep, false);
}
} }
} }
for class in self.classes_added.iter().chain(self.classes_removed.iter()) { for class in self.classes_added.iter().chain(self.classes_removed.iter()) {
if let Some(deps) = map.class_to_selector.get(class, quirks_mode) { if let Some(deps) = map.class_to_selector.get(class, quirks_mode) {
self.collect_dependencies_in_map(deps) for dep in deps {
self.scan_dependency(dep, false);
}
} }
} }