Auto merge of #18987 - upsuper:xbl-cascade, r=emilio

Remove XBL as a separate cascading level in Stylo

In Gecko, we handle XBL rules like author rules everywhere, except that XBL rules are added and sorted in an independent step, behave as if it has a separate level.

It is not clear to me why Stylo chose to add a separate level for XBL rules, but it doesn't seem that there is anything special to do with XBL rules.

This bug happens because we don't handle XBL important rules which are handled as part of author rules in Gecko due to lack of the additional level there. We should just follow what Gecko does here and handle them all the same.

(This is the Servo part of [bug 1408811](https://bugzilla.mozilla.org/show_bug.cgi?id=1408811))
This commit is contained in:
bors-servo 2017-10-23 01:36:07 -05:00 committed by GitHub
commit 819dff7908
2 changed files with 1 additions and 4 deletions

View file

@ -488,8 +488,6 @@ pub enum CascadeLevel {
PresHints,
/// User normal rules.
UserNormal,
/// XBL <stylesheet> rules.
XBL,
/// Author normal rules.
AuthorNormal,
/// Style attribute normal rules.
@ -1258,7 +1256,6 @@ impl StrongRuleNode {
}
// Author rules:
CascadeLevel::PresHints |
CascadeLevel::XBL |
CascadeLevel::AuthorNormal |
CascadeLevel::StyleAttributeNormal |
CascadeLevel::SMILOverride |

View file

@ -1309,7 +1309,7 @@ impl Stylist {
&mut matching_context,
stylist.quirks_mode,
flags_setter,
CascadeLevel::XBL,
CascadeLevel::AuthorNormal,
);
}
});