Skip to content

Commit

Permalink
Auto merge of #12969 - cers:master, r=nox
Browse files Browse the repository at this point in the history 
Track only the number of important declarations in a declaration block

<!-- Please describe your changes on the following line: -->
Track only the number of important declarations in a declaration block

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #12959 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because "the existing tests should cover it"

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/12969)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Aug 22, 2016
2 parents 32a0493 + 908b962 commit 57340e4
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 33 deletions.
15 changes: 3 additions & 12 deletions components/script/dom/element.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -774,8 +774,6 @@ impl Element {
Arc::make_mut(&mut declarations.declarations).remove(index);
if importance.unwrap().important() {
declarations.important_count -= 1;
} else {
declarations.normal_count -= 1;
}
}
}
Expand All @@ -802,11 +800,9 @@ impl Element {
if existing_declaration.0.name() == incoming_declaration.name() {
match (existing_declaration.1, importance) {
(Importance::Normal, Importance::Important) => {
declaration_block.normal_count -= 1;
declaration_block.important_count += 1;
}
(Importance::Important, Importance::Normal) => {
declaration_block.normal_count += 1;
declaration_block.important_count -= 1;
}
_ => {}
Expand All @@ -818,23 +814,20 @@ impl Element {
existing_declarations.push((incoming_declaration, importance));
if importance.important() {
declaration_block.important_count += 1;
} else {
declaration_block.normal_count += 1;
}
}
}
return;
}

let (normal_count, important_count) = if importance.important() {
(0, declarations.len() as u32)
let important_count = if importance.important() {
declarations.len() as u32
} else {
(declarations.len() as u32, 0)
0
};

*inline_declarations = Some(PropertyDeclarationBlock {
declarations: Arc::new(declarations.into_iter().map(|d| (d, importance)).collect()),
normal_count: normal_count,
important_count: important_count,
});
}
Expand All @@ -856,11 +849,9 @@ impl Element {
if properties.iter().any(|p| declaration.name() == **p) {
match (*importance, new_importance) {
(Importance::Normal, Importance::Important) => {
block.normal_count -= 1;
block.important_count += 1;
}
(Importance::Important, Importance::Normal) => {
block.normal_count += 1;
block.important_count -= 1;
}
_ => {}
Expand Down
11 changes: 0 additions & 11 deletions components/style/properties/properties.mako.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,6 @@ pub struct PropertyDeclarationBlock {
#[cfg_attr(feature = "servo", ignore_heap_size_of = "#7038")]
pub declarations: Arc<Vec<(PropertyDeclaration, Importance)>>,

/// The number of entries in `self.declaration` with `Importance::Normal`
pub normal_count: u32,

/// The number of entries in `self.declaration` with `Importance::Important`
pub important_count: u32,
}
Expand Down Expand Up @@ -548,7 +545,6 @@ impl<'a, 'b> DeclarationParser for PropertyDeclarationParser<'a, 'b> {
pub fn parse_property_declaration_list(context: &ParserContext, input: &mut Parser)
-> PropertyDeclarationBlock {
let mut declarations = Vec::new();
let mut normal_count = 0;
let mut important_count = 0;
let parser = PropertyDeclarationParser {
context: context,
Expand All @@ -559,8 +555,6 @@ pub fn parse_property_declaration_list(context: &ParserContext, input: &mut Pars
Ok((results, importance)) => {
if importance.important() {
important_count += results.len() as u32;
} else {
normal_count += results.len() as u32;
}
declarations.extend(results.into_iter().map(|d| (d, importance)))
}
Expand All @@ -574,7 +568,6 @@ pub fn parse_property_declaration_list(context: &ParserContext, input: &mut Pars
}
let mut block = PropertyDeclarationBlock {
declarations: Arc::new(declarations),
normal_count: normal_count,
important_count: important_count,
};
deduplicate_property_declarations(&mut block);
Expand Down Expand Up @@ -605,13 +598,11 @@ fn deduplicate_property_declarations(block: &mut PropertyDeclarationBlock) {
remove_one(&mut deduplicated, |d| {
matches!(d, &(PropertyDeclaration::${property.camel_case}(..), _))
});
block.normal_count -= 1;
}
seen_important.set_${property.ident}()
} else {
if seen_normal.get_${property.ident}() ||
seen_important.get_${property.ident}() {
block.normal_count -= 1;
continue
}
seen_normal.set_${property.ident}()
Expand All @@ -631,13 +622,11 @@ fn deduplicate_property_declarations(block: &mut PropertyDeclarationBlock) {
remove_one(&mut deduplicated, |d| {
matches!(d, &(PropertyDeclaration::Custom(ref n, _), _) if n == name)
});
block.normal_count -= 1;
}
seen_custom_important.push(name.clone())
} else {
if seen_custom_normal.contains(name) ||
seen_custom_important.contains(name) {
block.normal_count -= 1;
continue
}
seen_custom_normal.push(name.clone())
Expand Down
8 changes: 5 additions & 3 deletions components/style/selector_matching.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ impl Stylist {
// Take apart the StyleRule into individual Rules and insert
// them into the SelectorMap of that priority.
macro_rules! append(
($style_rule: ident, $priority: ident, $importance: expr, $count: ident) => {
if $style_rule.declarations.$count > 0 {
($style_rule: ident, $priority: ident, $importance: expr, $count: expr) => {
if $count > 0 {
for selector in &$style_rule.selectors {
let map = if let Some(ref pseudo) = selector.pseudo_element {
self.pseudos_map
Expand Down Expand Up @@ -191,6 +191,8 @@ impl Stylist {
for rule in stylesheet.effective_rules(&self.device) {
match *rule {
CSSRule::Style(ref style_rule) => {
let important_count = style_rule.declarations.important_count;
let normal_count = style_rule.declarations.declarations.len() as u32 - important_count;
append!(style_rule, normal, Importance::Normal, normal_count);
append!(style_rule, important, Importance::Important, important_count);
rules_source_order += 1;
Expand Down Expand Up @@ -394,7 +396,7 @@ impl Stylist {

// Step 4: Normal style attributes.
if let Some(ref sa) = style_attribute {
if sa.normal_count > 0 {
if sa.declarations.len() as u32 - sa.important_count > 0 {
relations |= AFFECTED_BY_STYLE_ATTRIBUTE;
Push::push(
applicable_declarations,
Expand Down
4 changes: 0 additions & 4 deletions tests/unit/style/properties/serialization.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ fn property_declaration_block_should_serialize_correctly() {
let block = PropertyDeclarationBlock {
declarations: Arc::new(declarations),

// Incorrect, but not used here:
normal_count: 0,
important_count: 0,
};

Expand All @@ -67,8 +65,6 @@ mod shorthand_serialization {
let block = PropertyDeclarationBlock {
declarations: Arc::new(properties.into_iter().map(|d| (d, Importance::Normal)).collect()),

// Incorrect, but not used here:
normal_count: 0,
important_count: 0,
};

Expand Down
3 changes: 0 additions & 3 deletions tests/unit/style/stylesheets.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ fn test_parse_stylesheet() {
(PropertyDeclaration::Custom(Atom::from("a"), DeclaredValue::Inherit),
Importance::Important),
]),
normal_count: 0,
important_count: 2,
},
}),
Expand Down Expand Up @@ -152,7 +151,6 @@ fn test_parse_stylesheet() {
longhands::display::SpecifiedValue::block)),
Importance::Normal),
]),
normal_count: 1,
important_count: 0,
},
}),
Expand Down Expand Up @@ -208,7 +206,6 @@ fn test_parse_stylesheet() {
(PropertyDeclaration::BackgroundClip(DeclaredValue::Initial),
Importance::Normal),
]),
normal_count: 8,
important_count: 0,
},
}),
Expand Down

0 comments on commit 57340e4

Please sign in to comment.