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

style: Avoid some allocations in selector serialization.

Browse source 
The allocations in display_to_css_identifier show up in the profiles of
bug 1675628.

Differential Revision: https://phabricator.services.mozilla.com/D97856
This commit is contained in:
Emilio Cobos Álvarez 2020-11-22 01:02:22 +00:00
parent 4ea378a6ae
commit 9f40b9ba38
19 changed files with 220 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/style/sharing/mod.rs
View file

@ -73,7 +73,7 @@ use crate::properties::ComputedValues;
use crate::rule_tree::StrongRuleNode;
use crate::style_resolver::{PrimaryStyle, ResolvedElementStyles};
use crate::stylist::Stylist;
use crate::Atom;
use crate::values::AtomIdent;
use atomic_refcell::{AtomicRefCell, AtomicRefMut};
use owning_ref::OwningHandle;
use selectors::matching::{ElementSelectorFlags, VisitedHandlingMode};
@ -126,13 +126,13 @@ pub struct ValidationData {
///
/// TODO(emilio): Maybe check whether rules for these classes apply to the
/// element?
class_list: Option<SmallVec<[Atom; 5]>>,
class_list: Option<SmallVec<[AtomIdent; 5]>>,
/// The part list of this element.
///
/// TODO(emilio): Maybe check whether rules with these part names apply to
/// the element?
part_list: Option<SmallVec<[Atom; 5]>>,
part_list: Option<SmallVec<[AtomIdent; 5]>>,
/// The list of presentational attributes of the element.
pres_hints: Option<SmallVec<[ApplicableDeclarationBlock; 5]>>,
@ -168,7 +168,7 @@ impl ValidationData {
}
/// Get or compute the part-list associated with this element.
pub fn part_list<E>(&mut self, element: E) -> &[Atom]
pub fn part_list<E>(&mut self, element: E) -> &[AtomIdent]
where
E: TElement,
{
@ -176,7 +176,7 @@ impl ValidationData {
return &[];
}
self.part_list.get_or_insert_with(|| {
let mut list = SmallVec::<[Atom; 5]>::new();
let mut list = SmallVec::<[_; 5]>::new();
element.each_part(|p| list.push(p.clone()));
// See below for the reasoning.
if !list.spilled() {
@ -187,12 +187,12 @@ impl ValidationData {
}
/// Get or compute the class-list associated with this element.
pub fn class_list<E>(&mut self, element: E) -> &[Atom]
pub fn class_list<E>(&mut self, element: E) -> &[AtomIdent]
where
E: TElement,
{
self.class_list.get_or_insert_with(|| {
let mut list = SmallVec::<[Atom; 5]>::new();
let mut list = SmallVec::<[_; 5]>::new();
element.each_class(|c| list.push(c.clone()));
// Assuming there are a reasonable number of classes (we use the
// inline capacity as "reasonable number"), sort them to so that
@ -294,12 +294,12 @@ impl<E: TElement> Deref for StyleSharingCandidate<E> {
impl<E: TElement> StyleSharingCandidate<E> {
/// Get the classlist of this candidate.
fn class_list(&mut self) -> &[Atom] {
fn class_list(&mut self) -> &[AtomIdent] {
self.validation_data.class_list(self.element)
}
/// Get the part list of this candidate.
fn part_list(&mut self) -> &[Atom] {
fn part_list(&mut self) -> &[AtomIdent] {
self.validation_data.part_list(self.element)
}
@ -361,11 +361,11 @@ impl<E: TElement> StyleSharingTarget<E> {
}
}
fn class_list(&mut self) -> &[Atom] {
fn class_list(&mut self) -> &[AtomIdent] {
self.validation_data.class_list(self.element)
}
fn part_list(&mut self) -> &[Atom] {
fn part_list(&mut self) -> &[AtomIdent] {
self.validation_data.part_list(self.element)
}