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

style: Hoist cascade() to CustomPropertyBuilder.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-10-08 19:12:47 +02:00
parent 715fc9cea6
commit 4914351f2b
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 42 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

101
components/style/custom_properties.rs
View file

@ -481,13 +481,48 @@ impl<'a> CustomPropertiesBuilder<'a> {
name: &'a Name, name: &'a Name,
specified_value: DeclaredValue<'a, Box<SpecifiedValue>>, specified_value: DeclaredValue<'a, Box<SpecifiedValue>>,
) { ) {
cascade( let was_already_present = !self.seen.insert(name);
&mut self.custom_properties, if was_already_present {
self.inherited, return;
&mut self.seen, }
name,
specified_value, let map = match self.custom_properties {
) Some(ref mut map) => map,
None => {
let mut map = OrderedMap::new();
if let Some(inherited) = self.inherited {
for (name, inherited_value) in inherited.iter() {
map.insert(name, BorrowedSpecifiedValue {
css: &inherited_value.css,
first_token_type: inherited_value.first_token_type,
last_token_type: inherited_value.last_token_type,
references: None
})
}
}
self.custom_properties = Some(map);
self.custom_properties.as_mut().unwrap()
}
};
match specified_value {
DeclaredValue::Value(ref specified_value) => {
map.insert(name, BorrowedSpecifiedValue {
css: &specified_value.css,
first_token_type: specified_value.first_token_type,
last_token_type: specified_value.last_token_type,
references: Some(&specified_value.references),
});
},
DeclaredValue::WithVariables(_) => unreachable!(),
DeclaredValue::CSSWideKeyword(keyword) => match keyword {
CSSWideKeyword::Initial => {
map.remove(&name);
}
CSSWideKeyword::Unset | // Custom properties are inherited by default.
CSSWideKeyword::Inherit => {} // The inherited value is what we already have.
}
}
} }
/// Returns the final map of applicable custom properties. /// Returns the final map of applicable custom properties.
@ -507,58 +542,6 @@ impl<'a> CustomPropertiesBuilder<'a> {
} }
} }
/// Add one custom property declaration to a map, unless another with the same
/// name was already there.
fn cascade<'a>(
custom_properties: &mut Option<OrderedMap<&'a Name, BorrowedSpecifiedValue<'a>>>,
inherited: Option<&'a Arc<CustomPropertiesMap>>,
seen: &mut PrecomputedHashSet<&'a Name>,
name: &'a Name,
specified_value: DeclaredValue<'a, Box<SpecifiedValue>>
) {
let was_already_present = !seen.insert(name);
if was_already_present {
return;
}
let map = match *custom_properties {
Some(ref mut map) => map,
None => {
let mut map = OrderedMap::new();
if let Some(inherited) = inherited {
for (name, inherited_value) in inherited.iter() {
map.insert(name, BorrowedSpecifiedValue {
css: &inherited_value.css,
first_token_type: inherited_value.first_token_type,
last_token_type: inherited_value.last_token_type,
references: None
})
}
}
*custom_properties = Some(map);
custom_properties.as_mut().unwrap()
}
};
match specified_value {
DeclaredValue::Value(ref specified_value) => {
map.insert(name, BorrowedSpecifiedValue {
css: &specified_value.css,
first_token_type: specified_value.first_token_type,
last_token_type: specified_value.last_token_type,
references: Some(&specified_value.references),
});
},
DeclaredValue::WithVariables(_) => unreachable!(),
DeclaredValue::CSSWideKeyword(keyword) => match keyword {
CSSWideKeyword::Initial => {
map.remove(&name);
}
CSSWideKeyword::Unset | // Custom properties are inherited by default.
CSSWideKeyword::Inherit => {} // The inherited value is what we already have.
}
}
}
/// https://drafts.csswg.org/css-variables/#cycles /// https://drafts.csswg.org/css-variables/#cycles
/// ///
/// The initial value of a custom property is represented by this property not /// The initial value of a custom property is represented by this property not