Auto merge of #17221 - aethanyc:support-xbl-stylesheet, r=heycam

stylo: Get rules from Gecko XBL stylesheets in cascading (Bug 1290276)

The change was reviewed in https://bugzilla.mozilla.org/show_bug.cgi?id=1290276

<!-- 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/17221)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-06-08 00:19:27 -07:00 committed by GitHub
commit 433b7bf9fa
7 changed files with 4847 additions and 3818 deletions

View file

@ -406,6 +406,8 @@ pub enum CascadeLevel {
PresHints,
/// User normal rules.
UserNormal,
/// XBL <stylesheet> rules.
XBL,
/// Author normal rules.
AuthorNormal,
/// Style attribute normal rules.
@ -1048,7 +1050,8 @@ impl StrongRuleNode {
CascadeLevel::UANormal |
CascadeLevel::UAImportant |
CascadeLevel::UserNormal |
CascadeLevel::UserImportant => {
CascadeLevel::UserImportant |
CascadeLevel::XBL => {
for (id, declaration) in longhands {
if properties.contains(id) {
// This property was set by a non-author rule.