Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Avoid walking the rule tree three times from apply_declarations.

Browse source 
Just once is slow enough.

Differential Revision: https://phabricator.services.mozilla.com/D6574
This commit is contained in:
Emilio Cobos Álvarez 2018-09-24 08:42:15 +00:00
parent 3b153af49c
commit 75bebf1618
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/style/properties/cascade.rs
View file

@ -20,6 +20,7 @@ use selector_parser::PseudoElement;
use servo_arc::Arc; use servo_arc::Arc;
use shared_lock::StylesheetGuards; use shared_lock::StylesheetGuards;
use smallbitvec::SmallBitVec; use smallbitvec::SmallBitVec;
use smallvec::SmallVec;
use std::borrow::Cow; use std::borrow::Cow;
use std::cell::RefCell; use std::cell::RefCell;
use style_adjuster::StyleAdjuster; use style_adjuster::StyleAdjuster;
@ -240,10 +241,12 @@ where
let inherited_style = parent_style.unwrap_or(device.default_computed_values()); let inherited_style = parent_style.unwrap_or(device.default_computed_values());
let mut declarations = SmallVec::<[(&_, CascadeLevel); 32]>::new();
let custom_properties = { let custom_properties = {
let mut builder = CustomPropertiesBuilder::new(inherited_style.custom_properties()); let mut builder = CustomPropertiesBuilder::new(inherited_style.custom_properties());
for (declaration, _cascade_level) in iter_declarations() { for (declaration, cascade_level) in iter_declarations() {
declarations.push((declaration, cascade_level));
if let PropertyDeclaration::Custom(ref declaration) = *declaration { if let PropertyDeclaration::Custom(ref declaration) = *declaration {
builder.cascade(&declaration.name, &declaration.value); builder.cascade(&declaration.name, &declaration.value);
} }
@ -278,7 +281,7 @@ where
let mut cascade = Cascade::new(&mut context, cascade_mode); let mut cascade = Cascade::new(&mut context, cascade_mode);
cascade cascade
.apply_properties::<EarlyProperties, I>(ApplyResetProperties::Yes, iter_declarations()); .apply_properties::<EarlyProperties, _>(ApplyResetProperties::Yes, declarations.iter().cloned());
cascade.compute_visited_style_if_needed( cascade.compute_visited_style_if_needed(
element, element,
@ -297,7 +300,7 @@ where
ApplyResetProperties::Yes ApplyResetProperties::Yes
}; };
cascade.apply_properties::<LateProperties, I>(apply_reset, iter_declarations()); cascade.apply_properties::<LateProperties, _>(apply_reset, declarations.iter().cloned());
using_cached_reset_properties using_cached_reset_properties
}; };