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

style: Don't go through remove_cycles if there are no references in the specified values.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-10-08 20:55:10 +02:00
parent c354f224ff
commit 7e143372bd
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/style/custom_properties.rs
View file

@ -466,6 +466,7 @@ fn parse_var_function<'i, 't>(
/// properties. /// properties.
pub struct CustomPropertiesBuilder<'a> { pub struct CustomPropertiesBuilder<'a> {
seen: PrecomputedHashSet<&'a Name>, seen: PrecomputedHashSet<&'a Name>,
may_have_cycles: bool,
specified_custom_properties: OrderedMap<&'a Name, Option<BorrowedSpecifiedValue<'a>>>, specified_custom_properties: OrderedMap<&'a Name, Option<BorrowedSpecifiedValue<'a>>>,
inherited: Option<&'a Arc<CustomPropertiesMap>>, inherited: Option<&'a Arc<CustomPropertiesMap>>,
} }
@ -475,6 +476,7 @@ impl<'a> CustomPropertiesBuilder<'a> {
pub fn new(inherited: Option<&'a Arc<CustomPropertiesMap>>) -> Self { pub fn new(inherited: Option<&'a Arc<CustomPropertiesMap>>) -> Self {
Self { Self {
seen: PrecomputedHashSet::default(), seen: PrecomputedHashSet::default(),
may_have_cycles: false,
specified_custom_properties: OrderedMap::new(), specified_custom_properties: OrderedMap::new(),
inherited, inherited,
} }
@ -493,6 +495,7 @@ impl<'a> CustomPropertiesBuilder<'a> {
match specified_value { match specified_value {
DeclaredValue::Value(ref specified_value) => { DeclaredValue::Value(ref specified_value) => {
self.may_have_cycles |= !specified_value.references.is_empty();
self.specified_custom_properties.insert(name, Some(BorrowedSpecifiedValue { self.specified_custom_properties.insert(name, Some(BorrowedSpecifiedValue {
css: &specified_value.css, css: &specified_value.css,
first_token_type: specified_value.first_token_type, first_token_type: specified_value.first_token_type,
@ -522,7 +525,9 @@ impl<'a> CustomPropertiesBuilder<'a> {
return self.inherited.cloned(); return self.inherited.cloned();
} }
remove_cycles(&mut self.specified_custom_properties); if self.may_have_cycles {
remove_cycles(&mut self.specified_custom_properties);
}
Some(Arc::new(substitute_all(self.specified_custom_properties, self.inherited))) Some(Arc::new(substitute_all(self.specified_custom_properties, self.inherited)))
} }
} }