Bug 1845690 - Don't expose -moz-headerbar system colors to content. r=stransky

I forgot to make these chrome-only.

Move them a bit further down after the standard colors while at it.

Differential Revision: https://phabricator.services.mozilla.com/D184682

servo/components/style/values/specified/color.rs

@@ -233,12 +233,6 @@ pub enum SystemColor {
     /// Used for menubar item text when hovered.
     MozMenubarhovertext,
 
-    /// Colors used for the header bar (sorta like the tab bar / menubar).
-    MozHeaderbar,
-    MozHeaderbartext,
-    MozHeaderbarinactive,
-    MozHeaderbarinactivetext,
-
     /// On platforms where these colors are the same as -moz-field, use
     /// -moz-fieldtext as foreground color
     MozEventreerow,
@@ -255,6 +249,17 @@ pub enum SystemColor {
     /// Used for button background when disabled.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     MozButtondisabledface,
+
+    /// Colors used for the header bar (sorta like the tab bar / menubar).
+    #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
+    MozHeaderbar,
+    #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
+    MozHeaderbartext,
+    #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
+    MozHeaderbarinactive,
+    #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
+    MozHeaderbarinactivetext,
+
     /// Foreground color of default buttons.
     MozMacDefaultbuttontext,
     /// Ring color around text fields and lists.

widget/nsXPLookAndFeel.cpp

@@ -260,15 +260,15 @@ static const char sColorPrefs[][41] = {
     "ui.-moz_menuhoverdisabled",
     "ui.-moz_menuhovertext",
     "ui.-moz_menubarhovertext",
-    "ui.-moz-headerbar",
-    "ui.-moz-headerbartext",
-    "ui.-moz-headerbarinactive",
-    "ui.-moz-headerbarinactivetext",
     "ui.-moz_eventreerow",
     "ui.-moz_oddtreerow",
     "ui.-moz-buttonactivetext",
     "ui.-moz-buttonactiveface",
     "ui.-moz-buttondisabledface",
+    "ui.-moz-headerbar",
+    "ui.-moz-headerbartext",
+    "ui.-moz-headerbarinactive",
+    "ui.-moz-headerbarinactivetext",
     "ui.-moz-mac-defaultbuttontext",
     "ui.-moz-mac-focusring",
     "ui.-moz-mac-menutextdisable",