From b9aa10448f0208af191e941f716b8c5f951b8e4c Mon Sep 17 00:00:00 2001
From: Xidorn Quan <me@upsuper.org>
Date: Mon, 23 Oct 2017 01:36:07 -0500
Subject: [PATCH] servo: Merge #18987 - Remove XBL as a separate cascading
 level in Stylo (from upsuper:xbl-cascade); r=emilio

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))

Source-Repo: https://github.com/servo/servo
Source-Revision: 819dff79087d2c45203d97f9837dd0e07513304e

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : e51cdc33ed34941e4b8617e2dd89dea4b92d8f9e
---
 servo/components/style/rule_tree/mod.rs | 3 ---
 servo/components/style/stylist.rs       | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/servo/components/style/rule_tree/mod.rs b/servo/components/style/rule_tree/mod.rs
index 02c329257ace..e2a8cbc106e6 100644
--- a/servo/components/style/rule_tree/mod.rs
+++ b/servo/components/style/rule_tree/mod.rs
@@ -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 |
diff --git a/servo/components/style/stylist.rs b/servo/components/style/stylist.rs
index 038b7ceb8887..33a4000172f7 100644
--- a/servo/components/style/stylist.rs
+++ b/servo/components/style/stylist.rs
@@ -1309,7 +1309,7 @@ impl Stylist {
                     &mut matching_context,
                     stylist.quirks_mode,
                     flags_setter,
-                    CascadeLevel::XBL,
+                    CascadeLevel::AuthorNormal,
                 );
             }
         });