Bug 1466963: Trivially simplify a condition. r?xidorn
MozReview-Commit-ID: L9LzpPt4js4
--- a/servo/components/style/properties/declaration_block.rs
+++ b/servo/components/style/properties/declaration_block.rs
@@ -512,25 +512,25 @@ impl PropertyDeclarationBlock {
if !definitely_new {
let mut index_to_remove = None;
for (i, slot) in self.declarations.iter_mut().enumerate() {
if slot.id() != declaration.id() {
continue;
}
- let important = self.declarations_importance[i];
- // For declarations from parsing, non-important declarations
- // shouldn't override existing important one.
- if important && !importance.important() &&
- matches!(source, DeclarationSource::Parsing) {
- return false;
- }
+ if matches!(source, DeclarationSource::Parsing) {
+ let important = self.declarations_importance[i];
- if matches!(source, DeclarationSource::Parsing) {
+ // For declarations from parsing, non-important declarations
+ // shouldn't override existing important one.
+ if important && !importance.important() {
+ return false;
+ }
+
// As a compatibility hack, specially on Android,
// don't allow to override a prefixed webkit display
// value with an unprefixed version from parsing
// code.
//
// TODO(emilio): Unship.
if let PropertyDeclaration::Display(old_display) = *slot {
use properties::longhands::display::computed_value::T as display;