servo: Merge #18659 - stylo: unship some stuff (from emilio:unship-stuff); r=xidorn

Source-Repo: https://github.com/servo/servo
Source-Revision: 7574d2647699e211638379f8f89760c57a1d6cc8

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 474b342746281ee8a4d8ad91231d6f4b39617b93

servo/components/style/gecko/generated/bindings.rs

@@ -1548,8 +1548,7 @@ extern "C" {
 extern "C" {
     pub fn Gecko_MatchStringArgPseudo(element: RawGeckoElementBorrowed,
                                       type_: CSSPseudoClassType,
-                                      ident: *const u16,
-                                      set_slow_selector: *mut bool) -> bool;
+                                      ident: *const u16) -> bool;
 }
 extern "C" {
     pub fn Gecko_AddPropertyToSet(arg1: nsCSSPropertyIDSetBorrowedMut,

servo/components/style/gecko/non_ts_pseudo_class_list.rs

@@ -59,8 +59,7 @@ macro_rules! apply_non_ts_list {
                 ("-moz-drag-over", MozDragOver, mozDragOver, IN_DRAGOVER_STATE, _),
                 ("target", Target, target, IN_TARGET_STATE, _),
                 ("indeterminate", Indeterminate, indeterminate, IN_INDETERMINATE_STATE, _),
-                // FIXME(emilio): Unship this for content docs (bug 1396073).
-                ("-moz-devtools-highlighted", MozDevtoolsHighlighted, mozDevtoolsHighlighted, IN_DEVTOOLS_HIGHLIGHTED_STATE, _),
+                ("-moz-devtools-highlighted", MozDevtoolsHighlighted, mozDevtoolsHighlighted, IN_DEVTOOLS_HIGHLIGHTED_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
                 // FIXME(emilio): Unship this for content docs (bug 1396073).
                 ("-moz-styleeditor-transitioning", MozStyleeditorTransitioning, mozStyleeditorTransitioning, IN_STYLEEDITOR_TRANSITIONING_STATE, _),
                 ("fullscreen", Fullscreen, fullscreen, IN_FULLSCREEN_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
@@ -120,9 +119,6 @@ macro_rules! apply_non_ts_list {
             string: [
                 // FIXME(emilio): Unship this for content docs (bug 1396066).
                 ("-moz-system-metric", MozSystemMetric, mozSystemMetric, _, _),
-                // FIXME(emilio): Unship this for content docs (bug 1396073).
-                ("-moz-empty-except-children-with-localname", MozEmptyExceptChildrenWithLocalname,
-                 mozEmptyExceptChildrenWithLocalname, _, _),
                 ("lang", Lang, lang, _, _),
             ],
             keyword: [

servo/components/style/gecko/wrapper.rs

@@ -1970,17 +1970,13 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             }
             NonTSPseudoClass::MozSystemMetric(ref s) |
             NonTSPseudoClass::MozLocaleDir(ref s) |
-            NonTSPseudoClass::MozEmptyExceptChildrenWithLocalname(ref s) |
             NonTSPseudoClass::Dir(ref s) => {
                 unsafe {
-                    let mut set_slow_selector = false;
-                    let matches = Gecko_MatchStringArgPseudo(self.0,
-                                       pseudo_class.to_gecko_pseudoclasstype().unwrap(),
-                                       s.as_ptr(), &mut set_slow_selector);
-                    if set_slow_selector {
-                        flags_setter(self, HAS_SLOW_SELECTOR);
-                    }
-                    matches
+                    Gecko_MatchStringArgPseudo(
+                        self.0,
+                        pseudo_class.to_gecko_pseudoclasstype().unwrap(),
+                        s.as_ptr(),
+                    )
                 }
             }
         }