Skip to content

Commit

Permalink
Auto merge of #17426 - aethanyc:fix-has-author-specified-rules-xbl, r…
Browse files Browse the repository at this point in the history
…=heycam

stylo: Fix has_author_specified_rules() for rules in XBL stylesheets

This change is reviewed in https://bugzilla.mozilla.org/show_bug.cgi?id=1372062

<!-- 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/17426)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Jun 20, 2017
2 parents c04a29b + 945c3e4 commit a7ac921
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions components/style/rule_tree/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1112,8 +1112,7 @@ impl StrongRuleNode {
CascadeLevel::UANormal |
CascadeLevel::UAImportant |
CascadeLevel::UserNormal |
CascadeLevel::UserImportant |
CascadeLevel::XBL => {
CascadeLevel::UserImportant => {
for (id, declaration) in longhands {
if properties.contains(id) {
// This property was set by a non-author rule.
Expand All @@ -1136,6 +1135,7 @@ impl StrongRuleNode {
}
// Author rules:
CascadeLevel::PresHints |
CascadeLevel::XBL |
CascadeLevel::AuthorNormal |
CascadeLevel::StyleAttributeNormal |
CascadeLevel::SMILOverride |
Expand Down

0 comments on commit a7ac921

Please sign in to comment.