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

script: Refactor CSSStyleDeclaration and fix some bugs in the way.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-01-27 01:21:35 +01:00
parent b5c94bad37
commit dd90366775
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
4 changed files with 166 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

27
components/style/properties/declaration_block.rs
View file

@ -192,7 +192,10 @@ impl PropertyDeclarationBlock {
}
/// Set the declaration importance for a given property, if found.
pub fn set_importance(&mut self, property: &PropertyId, new_importance: Importance) {
///
/// Returns whether any declaration was updated.
pub fn set_importance(&mut self, property: &PropertyId, new_importance: Importance) -> bool {
let mut updated_at_least_one = false;
for &mut (ref declaration, ref mut importance) in &mut self.declarations {
if declaration.id().is_or_is_longhand_of(property) {
match (*importance, new_importance) {
@ -202,23 +205,35 @@ impl PropertyDeclarationBlock {
(Importance::Important, Importance::Normal) => {
self.important_count -= 1;
}
_ => {}
_ => {
continue;
}
}
updated_at_least_one = true;
*importance = new_importance;
}
}
updated_at_least_one
}
/// https://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-removeproperty
pub fn remove_property(&mut self, property: &PropertyId) {
///
/// Returns whether any declaration was actually removed.
pub fn remove_property(&mut self, property: &PropertyId) -> bool {
let important_count = &mut self.important_count;
let mut removed_at_least_one = false;
self.declarations.retain(|&(ref declaration, importance)| {
let remove = declaration.id().is_or_is_longhand_of(property);
if remove && importance.important() {
*important_count -= 1
if remove {
removed_at_least_one = true;
if importance.important() {
*important_count -= 1
}
}
!remove
})
});
removed_at_least_one
}
/// Take a declaration block known to contain a single property and serialize it.