Auto merge of #15837 - upsuper:bug1344135, r=emilio

Return true in set_property only when declaration block is changed

This is [bug 1344135](https://bugzilla.mozilla.org/show_bug.cgi?id=1344135).

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15837)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-03-07 13:51:33 -08:00 committed by GitHub
commit b11847d86c
3 changed files with 13 additions and 10 deletions

View file

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

View file

@ -171,10 +171,11 @@ impl PropertyDeclarationBlock {
} }
/// Adds or overrides the declaration for a given property in this block, /// 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, pub fn set_parsed_declaration(&mut self,
declaration: PropertyDeclaration, declaration: PropertyDeclaration,
importance: Importance) { importance: Importance) -> bool {
for slot in &mut *self.declarations { for slot in &mut *self.declarations {
if slot.0.id() == declaration.id() { if slot.0.id() == declaration.id() {
match (slot.1, importance) { match (slot.1, importance) {
@ -184,10 +185,12 @@ impl PropertyDeclarationBlock {
(Importance::Important, Importance::Normal) => { (Importance::Important, Importance::Normal) => {
self.important_count -= 1; self.important_count -= 1;
} }
_ => {} _ => if slot.0 == declaration {
return false;
}
} }
*slot = (declaration, importance); *slot = (declaration, importance);
return return true;
} }
} }
@ -195,6 +198,7 @@ impl PropertyDeclarationBlock {
if importance.important() { if importance.important() {
self.important_count += 1; self.important_count += 1;
} }
true
} }
/// Set the declaration importance for a given property, if found. /// Set the declaration importance for a given property, if found.

View file

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