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

Auto merge of #17426 - aethanyc:fix-has-author-specified-rules-xbl, r=heycam

Browse source 
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 -->
This commit is contained in:
bors-servo 2017-06-20 02:05:08 -07:00 • committed by GitHub
commit a7ac9214f2
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/rule_tree/mod.rs
View file

@ -1112,8 +1112,7 @@ impl StrongRuleNode {
CascadeLevel::UANormal | CascadeLevel::UANormal |
CascadeLevel::UAImportant | CascadeLevel::UAImportant |
CascadeLevel::UserNormal | CascadeLevel::UserNormal |
CascadeLevel::UserImportant | CascadeLevel::UserImportant => {
CascadeLevel::XBL => {
for (id, declaration) in longhands { for (id, declaration) in longhands {
if properties.contains(id) { if properties.contains(id) {
// This property was set by a non-author rule. // This property was set by a non-author rule.
@ -1136,6 +1135,7 @@ impl StrongRuleNode {
} }
// Author rules: // Author rules:
CascadeLevel::PresHints | CascadeLevel::PresHints |
CascadeLevel::XBL |
CascadeLevel::AuthorNormal | CascadeLevel::AuthorNormal |
CascadeLevel::StyleAttributeNormal | CascadeLevel::StyleAttributeNormal |
CascadeLevel::SMILOverride | CascadeLevel::SMILOverride |