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

Return true in set_property only when declaration block is changed

Browse source
This commit is contained in:
Xidorn Quan 2017-03-06 22:21:59 +11:00
parent c62973b77b
commit 4f07826837
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/dom/cssstyledeclaration.rs
View file

@ -266,11 +266,9 @@ impl CSSStyleDeclaration {
// Step 8
// Step 9
// We could try to be better I guess?
*changed = !declarations.is_empty();
*changed = false;
for declaration in declarations {
// TODO(emilio): We could check it changed
pdb.set_parsed_declaration(declaration.0, importance);
*changed |= pdb.set_parsed_declaration(declaration.0, importance);
}
Ok(())

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

@ -171,10 +171,11 @@ impl PropertyDeclarationBlock {
}
/// Adds or overrides the declaration for a given property in this block,
/// without taking into account any kind of priority.
/// without taking into account any kind of priority. Returns whether the
/// declaration block is actually changed.
pub fn set_parsed_declaration(&mut self,
declaration: PropertyDeclaration,
importance: Importance) {
importance: Importance) -> bool {
for slot in &mut *self.declarations {
if slot.0.id() == declaration.id() {
match (slot.1, importance) {
@ -184,10 +185,12 @@ impl PropertyDeclarationBlock {
(Importance::Important, Importance::Normal) => {
self.important_count -= 1;
}
_ => {}
_ => if slot.0 == declaration {
return false;
}
}
*slot = (declaration, importance);
return
return true;
}
}
@ -195,6 +198,7 @@ impl PropertyDeclarationBlock {
if importance.important() {
self.important_count += 1;
}
true
}
/// Set the declaration importance for a given property, if found.

5
ports/geckolib/glue.rs
View file

@ -837,10 +837,11 @@ fn set_property(declarations: RawServoDeclarationBlockBorrowed, property_id: Pro
Box::new(StdoutErrorReporter), extra_data) {
let mut declarations = RwLock::<PropertyDeclarationBlock>::as_arc(&declarations).write();
let importance = if is_important { Importance::Important } else { Importance::Normal };
let mut changed = false;
for decl in decls.into_iter() {
declarations.set_parsed_declaration(decl.0, importance);
changed |= declarations.set_parsed_declaration(decl.0, importance);
}
true
changed
} else {
false
}