Bug 1620467 - Part 2: Add unprefixed appearance property and make -moz-appearance and -webkit-appearance be aliases. r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D83428
2020-07-16 22:04:11 +00:00 · 2020-07-16 22:04:11 +00:00 · 1739610d9a
--- a/devtools/server/actors/animation-type-longhand.js
+++ b/devtools/server/actors/animation-type-longhand.js
@ -14,7 +14,7 @@ exports.ANIMATION_TYPE_FOR_LONGHANDS = [
      "align-self",
      "align-tracks",
      "aspect-ratio",
-      "-moz-appearance",
+      "appearance",
      "backface-visibility",
      "background-attachment",
      "background-blend-mode",
--- a/devtools/shared/css/generated/properties-db.js
+++ b/devtools/shared/css/generated/properties-db.js
@ -188,7 +188,7 @@ exports.CSS_PROPERTIES = {
  "-moz-appearance": {
    "isInherited": false,
    "subproperties": [
-      "-moz-appearance"
+      "appearance"
    ],
    "supports": [],
    "values": [
@ -222,6 +222,7 @@ exports.CSS_PROPERTIES = {
      "-moz-window-frame-right",
      "-moz-window-titlebar",
      "-moz-window-titlebar-maximized",
+      "auto",
      "button",
      "button-arrow-down",
      "button-arrow-next",
@ -1505,7 +1506,7 @@ exports.CSS_PROPERTIES = {
  "-webkit-appearance": {
    "isInherited": false,
    "subproperties": [
-      "-moz-appearance"
+      "appearance"
    ],
    "supports": [],
    "values": [
@ -1539,6 +1540,7 @@ exports.CSS_PROPERTIES = {
      "-moz-window-frame-right",
      "-moz-window-titlebar",
      "-moz-window-titlebar-maximized",
+      "auto",
      "button",
      "button-arrow-down",
      "button-arrow-next",
@ -2919,7 +2921,7 @@ exports.CSS_PROPERTIES = {
      "transform-style",
      "transform-origin",
      "contain",
-      "-moz-appearance",
+      "appearance",
      "-moz-orient",
      "will-change",
      "shape-image-threshold",
@ -3324,6 +3326,146 @@ exports.CSS_PROPERTIES = {
      "unset"
    ]
  },
+  "appearance": {
+    "isInherited": false,
+    "subproperties": [
+      "appearance"
+    ],
+    "supports": [],
+    "values": [
+      "-moz-gtk-info-bar",
+      "-moz-mac-active-source-list-selection",
+      "-moz-mac-disclosure-button-closed",
+      "-moz-mac-disclosure-button-open",
+      "-moz-mac-fullscreen-button",
+      "-moz-mac-help-button",
+      "-moz-mac-source-list",
+      "-moz-mac-source-list-selection",
+      "-moz-mac-vibrancy-dark",
+      "-moz-mac-vibrancy-light",
+      "-moz-mac-vibrant-titlebar-dark",
+      "-moz-mac-vibrant-titlebar-light",
+      "-moz-menulist-arrow-button",
+      "-moz-win-borderless-glass",
+      "-moz-win-browsertabbar-toolbox",
+      "-moz-win-communications-toolbox",
+      "-moz-win-exclude-glass",
+      "-moz-win-glass",
+      "-moz-win-media-toolbox",
+      "-moz-window-button-box",
+      "-moz-window-button-box-maximized",
+      "-moz-window-button-close",
+      "-moz-window-button-maximize",
+      "-moz-window-button-minimize",
+      "-moz-window-button-restore",
+      "-moz-window-frame-bottom",
+      "-moz-window-frame-left",
+      "-moz-window-frame-right",
+      "-moz-window-titlebar",
+      "-moz-window-titlebar-maximized",
+      "auto",
+      "button",
+      "button-arrow-down",
+      "button-arrow-next",
+      "button-arrow-previous",
+      "button-arrow-up",
+      "button-focus",
+      "checkbox",
+      "checkbox-container",
+      "checkbox-label",
+      "checkmenuitem",
+      "dialog",
+      "dualbutton",
+      "groupbox",
+      "inherit",
+      "initial",
+      "inner-spin-button",
+      "listbox",
+      "menuarrow",
+      "menubar",
+      "menucheckbox",
+      "menuimage",
+      "menuitem",
+      "menuitemtext",
+      "menulist",
+      "menulist-button",
+      "menulist-text",
+      "menupopup",
+      "menuradio",
+      "menuseparator",
+      "meter",
+      "meterbar",
+      "meterchunk",
+      "none",
+      "number-input",
+      "progress-bar",
+      "progressbar",
+      "progressbar-vertical",
+      "progresschunk",
+      "radio",
+      "radio-container",
+      "radio-label",
+      "radiomenuitem",
+      "range",
+      "range-thumb",
+      "resizer",
+      "resizerpanel",
+      "revert",
+      "scale-horizontal",
+      "scale-vertical",
+      "scalethumb-horizontal",
+      "scalethumb-vertical",
+      "scalethumbend",
+      "scalethumbstart",
+      "scalethumbtick",
+      "scrollbar",
+      "scrollbar-horizontal",
+      "scrollbar-small",
+      "scrollbar-vertical",
+      "scrollbarbutton-down",
+      "scrollbarbutton-left",
+      "scrollbarbutton-right",
+      "scrollbarbutton-up",
+      "scrollbarthumb-horizontal",
+      "scrollbarthumb-vertical",
+      "scrollbartrack-horizontal",
+      "scrollbartrack-vertical",
+      "scrollcorner",
+      "searchfield",
+      "separator",
+      "spinner",
+      "spinner-downbutton",
+      "spinner-textfield",
+      "spinner-upbutton",
+      "splitter",
+      "statusbar",
+      "statusbarpanel",
+      "tab",
+      "tab-scroll-arrow-back",
+      "tab-scroll-arrow-forward",
+      "tabpanel",
+      "tabpanels",
+      "textarea",
+      "textfield",
+      "textfield-multiline",
+      "toolbar",
+      "toolbarbutton",
+      "toolbarbutton-dropdown",
+      "toolbargripper",
+      "toolbox",
+      "tooltip",
+      "treeheader",
+      "treeheadercell",
+      "treeheadersortarrow",
+      "treeitem",
+      "treeline",
+      "treetwisty",
+      "treetwistyopen",
+      "treeview",
+      "unset",
+      "window"
+    ]
+  },
  "backface-visibility": {
    "isInherited": false,
    "subproperties": [
--- a/dom/animation/test/mozilla/file_discrete_animations.html
+++ b/dom/animation/test/mozilla/file_discrete_animations.html
@ -9,11 +9,6 @@
 "use strict";

 const gMozillaSpecificProperties = {
-  "-moz-appearance": {
-    // https://drafts.csswg.org/css-align/#propdef-align-content
-    from: "button",
-    to: "none"
-  },
  "-moz-box-align": {
    // https://developer.mozilla.org/en/docs/Web/CSS/box-align
    from: "center",
--- a/dom/animation/test/mozilla/test_moz_prefixed_properties.html
+++ b/dom/animation/test/mozilla/test_moz_prefixed_properties.html
@ -13,9 +13,6 @@
 "use strict";

 const testcases = [
-  {
-    property: "-moz-appearance",
-  },
  {
    property: "-moz-box-align"
  },
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@ -1592,20 +1592,27 @@ var gCSSProperties = {
      "steps(0, step-end, 1)",
    ],
  },
-  "-moz-appearance": {
-    domProp: "MozAppearance",
+  appearance: {
+    domProp: "appearance",
    inherited: false,
    type: CSS_TYPE_LONGHAND,
    initial_values: ["none"],
-    other_values: ["radio", "menulist"],
+    other_values: ["auto", "radio", "menulist"],
    invalid_values: [],
  },
+  "-moz-appearance": {
+    domProp: "MozAppearance",
+    inherited: false,
+    type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
+    alias_for: "appearance",
+    subproperties: ["appearance"],
+  },
  "-webkit-appearance": {
    domProp: "webkitAppearance",
    inherited: false,
    type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
-    alias_for: "-moz-appearance",
-    subproperties: ["-moz-appearance"],
+    alias_for: "appearance",
+    subproperties: ["appearance"],
  },
  "border-inline": {
    domProp: "borderInline",
--- a/servo/components/style/properties/longhands/box.mako.rs
+++ b/servo/components/style/properties/longhands/box.mako.rs
@ -615,22 +615,19 @@ ${helpers.predefined_type(
    spec="https://drafts.csswg.org/css-contain/#contain-property",
 )}

-// Non-standard
 ${helpers.predefined_type(
-    "-moz-appearance",
+    "appearance",
    "Appearance",
    "computed::Appearance::None",
    engines="gecko",
-    alias="-webkit-appearance",
-    spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-appearance)",
+    alias="-moz-appearance -webkit-appearance",
+    spec="https://drafts.csswg.org/css-ui-4/#propdef-appearance",
    animation_value_type="discrete",
    gecko_ffi_name="mAppearance",
 )}

-// A UA-sheet only property that is always set to the same value as
-// -moz-appearance.  Used to record telemetry for when author sheets
-// override the value of -moz-appearance; see
-// nsIFrame::RecordAppearanceTelemetry.
+// The inherent widget type of an element, selected by specifying
+// `appearance: auto`.
 ${helpers.predefined_type(
    "-moz-default-appearance",
    "Appearance",
--- a/servo/components/style/style_adjuster.rs
+++ b/servo/components/style/style_adjuster.rs
@ -763,10 +763,10 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
    where
        E: TElement,
    {
-        use crate::properties::longhands::_moz_appearance::computed_value::T as Appearance;
+        use crate::properties::longhands::appearance::computed_value::T as Appearance;
        use crate::properties::longhands::line_height::computed_value::T as LineHeight;

-        if self.style.get_box().clone__moz_appearance() == Appearance::Menulist {
+        if self.style.get_box().clone_appearance() == Appearance::Menulist {
            if self.style.get_inherited_text().clone_line_height() == LineHeight::normal() {
                return;
            }
--- a/servo/components/style/values/specified/box.rs
+++ b/servo/components/style/values/specified/box.rs
@ -1526,6 +1526,11 @@ pub enum Resize {
 pub enum Appearance {
    /// No appearance at all.
    None,
+    /// Default appearance for the element.
+    ///
+    /// This value doesn't make sense for -moz-default-appearance, but we don't bother to guard
+    /// against parsing it.
+    Auto,
    /// A typical dialog button.
    Button,
    /// Various arrows that go in buttons
--- a/testing/web-platform/meta/css/css-ui/appearance-checkbox-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-checkbox-001.html.ini
@ -1,3 +1,4 @@
 [appearance-checkbox-001.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
+  expected: FAIL
--- a/testing/web-platform/meta/css/css-ui/appearance-cssom-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-cssom-001.html.ini
@ -1,190 +1,40 @@
 [appearance-cssom-001.html]
-  [appearance: menulist-button]
-    expected: FAIL
-
-  [appearance: continuous-capacity-level-indicator (invalid)]
-    expected: FAIL
-
-  [appearance: toolbarbutton-dropdown (invalid)]
-    expected: FAIL
-
-  [appearance: statusbar (invalid)]
-    expected: FAIL
-
-  [appearance: button-arrow-next (invalid)]
-    expected: FAIL
-
-  [appearance: meterchunk (invalid)]
-    expected: FAIL
-
-  [appearance: resizerpanel (invalid)]
-    expected: FAIL
-
-  [appearance: media-volume-slider (invalid)]
-    expected: FAIL
-
-  [appearance: scrollbarbutton-left (invalid)]
-    expected: FAIL
-
  [appearance: scale-vertical (invalid)]
    expected: FAIL

-  [appearance: menucheckbox (invalid)]
-    expected: FAIL
-
  [-webkit-appearance: square-button]
    expected: FAIL

-  [appearance: -moz-window-button-restore (invalid)]
-    expected: FAIL
-
-  [appearance: media-time-remaining-display (invalid)]
-    expected: FAIL
-
  [-webkit-appearance: progressbar (invalid)]
    expected: FAIL

-  [appearance: radio-container (invalid)]
-    expected: FAIL
-
-  [appearance: media-seek-back-button (invalid)]
-    expected: FAIL
-
-  [appearance: media-seek-forward-button (invalid)]
-    expected: FAIL
-
-  [-webkit-appearance: auto]
-    expected: FAIL
-
-  [appearance: relevancy-level-indicator (invalid)]
-    expected: FAIL
-
-  [appearance: listitem (invalid)]
-    expected: FAIL
-
-  [appearance: scrollbarbutton-down (invalid)]
-    expected: FAIL
-
  [appearance: scalethumb-vertical (invalid)]
    expected: FAIL

-  [appearance: scrollbarbutton-up (invalid)]
-    expected: FAIL
-
  [-webkit-appearance: scalethumbend (invalid)]
    expected: FAIL

-  [appearance: tabpanel (invalid)]
-    expected: FAIL
-
-  [appearance: sliderthumb-vertical (invalid)]
-    expected: FAIL
-
-  [appearance: button-arrow-down (invalid)]
-    expected: FAIL
-
-  [appearance: textarea]
-    expected: FAIL
-
  [appearance: number-input (invalid)]
    expected: FAIL

-  [appearance: tabpanels (invalid)]
-    expected: FAIL
-
  [-webkit-appearance: range-thumb (invalid)]
    expected: FAIL

  [-webkit-appearance: inner-spin-button (invalid)]
    expected: FAIL

-  [appearance: -moz-win-communicationstext (invalid)]
-    expected: FAIL
-
-  [appearance: treeheadercell (invalid)]
-    expected: FAIL
-
  [appearance: inner-spin-button (invalid)]
    expected: FAIL

-  [appearance: tab (invalid)]
-    expected: FAIL
-
  [appearance: scrollbarthumb-vertical (invalid)]
    expected: FAIL

  [appearance: scalethumb-horizontal (invalid)]
    expected: FAIL

-  [appearance: media-exit-fullscreen-button (invalid)]
-    expected: FAIL
-
-  [appearance: color-well (invalid)]
-    expected: FAIL
-
-  [appearance: media-sliderthumb (invalid)]
-    expected: FAIL
-
-  [appearance: media-fullscreen-volume-slider (invalid)]
-    expected: FAIL
-
-  [appearance: media-current-time-display (invalid)]
-    expected: FAIL
-
-  [appearance: separator (invalid)]
-    expected: FAIL
-
-  [appearance: dualbutton (invalid)]
-    expected: FAIL
-
-  [appearance: bogus-button (invalid)]
-    expected: FAIL
-
-  [appearance: searchfield-decoration (invalid)]
-    expected: FAIL
-
  [appearance: scalethumbend (invalid)]
    expected: FAIL

-  [appearance: -moz-win-browsertabbar-toolbox (invalid)]
-    expected: FAIL
-
-  [appearance: menupopup (invalid)]
-    expected: FAIL
-
-  [appearance: checkmenuitem (invalid)]
-    expected: FAIL
-
-  [appearance: radio-label (invalid)]
-    expected: FAIL
-
-  [appearance: progress-bar]
-    expected: FAIL
-
-  [appearance: button-focus (invalid)]
-    expected: FAIL
-
-  [appearance: -moz-window-button-close (invalid)]
-    expected: FAIL
-
-  [appearance: listbox]
-    expected: FAIL
-
-  [appearance: media-volume-slider-mute-button (invalid)]
-    expected: FAIL
-
-  [appearance: checkbox-container (invalid)]
-    expected: FAIL
-
-  [appearance: button]
-    expected: FAIL
-
-  [appearance: progresschunk-vertical (invalid)]
-    expected: FAIL
-
-  [appearance: treetwisty (invalid)]
-    expected: FAIL
-
  [-webkit-appearance: scrollbartrack-horizontal (invalid)]
    expected: FAIL

@ -194,219 +44,45 @@
  [-webkit-appearance: push-button]
    expected: FAIL

-  [appearance: menuarrow (invalid)]
-    expected: FAIL
-
  [appearance: scrollbartrack-vertical (invalid)]
    expected: FAIL

-  [appearance: treeitem (invalid)]
-    expected: FAIL
-
-  [appearance: media-play-button (invalid)]
-    expected: FAIL
-
-  [appearance: searchfield]
-    expected: FAIL
-
-  [appearance: rating-level-indicator (invalid)]
-    expected: FAIL
-
-  [appearance: -moz-window-frame-right (invalid)]
-    expected: FAIL
-
-  [appearance: spinner-downbutton (invalid)]
-    expected: FAIL
-
-  [appearance: splitter (invalid)]
-    expected: FAIL
-
-  [appearance: media-controls-background (invalid)]
-    expected: FAIL
-
  [appearance: square-button]
    expected: FAIL

-  [appearance: resizer (invalid)]
-    expected: FAIL
-
-  [appearance: -moz-win-borderless-glass (invalid)]
-    expected: FAIL
-
-  [appearance: toolbox (invalid)]
-    expected: FAIL
-
-  [appearance: media-enter-fullscreen-button (invalid)]
-    expected: FAIL
-
-  [appearance: statusbarpanel (invalid)]
-    expected: FAIL
-
-  [appearance: -moz-window-titlebar-maximized (invalid)]
-    expected: FAIL
-
-  [appearance: media-controls-light-bar-background (invalid)]
-    expected: FAIL
-
  [appearance: push-button]
    expected: FAIL

-  [appearance: treetwistyopen (invalid)]
-    expected: FAIL
-
-  [appearance: progress-bar-value (invalid)]
-    expected: FAIL
-
-  [appearance: scrollbarbutton-right (invalid)]
-    expected: FAIL
-
-  [appearance: borderless-attachment (invalid)]
-    expected: FAIL
-
-  [appearance: media-controls-fullscreen-background (invalid)]
-    expected: FAIL
-
-  [appearance: treeheader (invalid)]
-    expected: FAIL
-
  [appearance: slider-horizontal]
    expected: FAIL

-  [appearance: checkbox-label (invalid)]
-    expected: FAIL
-
-  [appearance: -apple-pay-button (invalid)]
-    expected: FAIL
-
  [-webkit-appearance: progressbar-vertical (invalid)]
    expected: FAIL

-  [appearance: -moz-window-button-box (invalid)]
-    expected: FAIL
-
-  [appearance: spinner-upbutton (invalid)]
-    expected: FAIL
-
-  [appearance: groupbox (invalid)]
-    expected: FAIL
-
-  [appearance: snapshotted-plugin-overlay (invalid)]
-    expected: FAIL
-
-  [appearance: discrete-capacity-level-indicator (invalid)]
-    expected: FAIL
-
-  [appearance: media-volume-slider-container (invalid)]
-    expected: FAIL
-
-  [appearance: caps-lock-indicator (invalid)]
-    expected: FAIL
-
  [-webkit-appearance: scrollbarthumb-horizontal (invalid)]
    expected: FAIL

-  [appearance: auto]
-    expected: FAIL
-
  [appearance: progressbar-vertical (invalid)]
    expected: FAIL

-  [appearance: tooltip (invalid)]
-    expected: FAIL
-
-  [appearance: button-arrow-previous (invalid)]
-    expected: FAIL
-
-  [appearance: toolbarbutton (invalid)]
-    expected: FAIL
-
-  [appearance: searchfield-cancel-button (invalid)]
-    expected: FAIL
-
-  [appearance: -moz-win-exclude-glass (invalid)]
-    expected: FAIL
-
-  [appearance: media-return-to-realtime-button (invalid)]
-    expected: FAIL
-
  [-webkit-appearance: meterbar (invalid)]
    expected: FAIL

  [-webkit-appearance: slider-horizontal]
    expected: FAIL

-  [appearance: -moz-window-frame-left (invalid)]
-    expected: FAIL
-
  [-webkit-appearance: scalethumb-vertical (invalid)]
    expected: FAIL

-  [appearance: media-toggle-closed-captions-button (invalid)]
-    expected: FAIL
-
-  [appearance: checkbox]
-    expected: FAIL
-
  [appearance: textfield-multiline (invalid)]
    expected: FAIL

-  [appearance: treeline (invalid)]
-    expected: FAIL
-
-  [appearance: attachment (invalid)]
-    expected: FAIL
-
-  [appearance: none]
-    expected: FAIL
-
-  [appearance: searchfield-results-button (invalid)]
-    expected: FAIL
-
-  [appearance: searchfield-results-decoration (invalid)]
-    expected: FAIL
-
-  [appearance: radiomenuitem (invalid)]
-    expected: FAIL
-
-  [appearance: progresschunk (invalid)]
-    expected: FAIL
-
-  [appearance: toolbar (invalid)]
-    expected: FAIL
-
-  [appearance: menulist]
-    expected: FAIL
-
  [-webkit-appearance: scalethumbstart (invalid)]
    expected: FAIL

-  [appearance: treeview (invalid)]
-    expected: FAIL
-
-  [appearance: toolbargripper (invalid)]
-    expected: FAIL
-
-  [appearance: slider-vertical (invalid)]
-    expected: FAIL
-
  [-webkit-appearance: scale-vertical (invalid)]
    expected: FAIL

-  [appearance: sheet (invalid)]
-    expected: FAIL
-
-  [appearance: menuimage (invalid)]
-    expected: FAIL
-
-  [appearance: media-rewind-button (invalid)]
-    expected: FAIL
-
-  [appearance: menuseparator (invalid)]
-    expected: FAIL
-
-  [appearance: list-button (invalid)]
-    expected: FAIL
-
  [-webkit-appearance: scalethumb-horizontal (invalid)]
    expected: FAIL

@ -416,111 +92,33 @@
  [-webkit-appearance: scrollbarthumb-vertical (invalid)]
    expected: FAIL

-  [appearance: -moz-window-button-maximize (invalid)]
-    expected: FAIL
-
  [appearance: scale-horizontal (invalid)]
    expected: FAIL

-  [appearance: button-arrow-up (invalid)]
-    expected: FAIL
-
-  [appearance: media-controls-dark-bar-background (invalid)]
-    expected: FAIL
-
-  [appearance: menuitemtext (invalid)]
-    expected: FAIL
-
-  [appearance: -moz-window-titlebar (invalid)]
-    expected: FAIL
-
-  [appearance: menubar (invalid)]
-    expected: FAIL
-
-  [appearance: tab-scroll-arrow-back (invalid)]
-    expected: FAIL
-
-  [appearance: menuradio (invalid)]
-    expected: FAIL
-
  [appearance: range-thumb (invalid)]
    expected: FAIL

-  [appearance: -moz-window-button-box-maximized (invalid)]
-    expected: FAIL
-
-  [appearance: media-mute-button (invalid)]
-    expected: FAIL
-
-  [appearance: textfield]
-    expected: FAIL
-
  [appearance: meterbar (invalid)]
    expected: FAIL

  [-moz-appearance (should not be supported)]
    expected: FAIL

-  [appearance: default-button (invalid)]
-    expected: FAIL
-
-  [appearance: media-fullscreen-volume-slider-thumb (invalid)]
-    expected: FAIL
-
-  [appearance: media-overlay-play-button (invalid)]
-    expected: FAIL
-
  [appearance: scalethumbtick (invalid)]
    expected: FAIL

-  [appearance: radio]
-    expected: FAIL
-
-  [appearance: -moz-win-media-toolbox (invalid)]
-    expected: FAIL
-
  [appearance: progressbar (invalid)]
    expected: FAIL

-  [appearance: media-slider (invalid)]
-    expected: FAIL
-
  [appearance: scalethumbstart (invalid)]
    expected: FAIL

  [-webkit-appearance: range (invalid)]
    expected: FAIL

-  [appearance: spinner-textfield (invalid)]
-    expected: FAIL
-
-  [appearance: spinner (invalid)]
-    expected: FAIL
-
-  [appearance: treeheadersortarrow (invalid)]
-    expected: FAIL
-
-  [appearance: -moz-win-glass (invalid)]
-    expected: FAIL
-
-  [appearance: meter]
-    expected: FAIL
-
-  [appearance: image-controls-button (invalid)]
-    expected: FAIL
-
-  [appearance: -moz-window-button-minimize (invalid)]
-    expected: FAIL
-
  [appearance: scrollbartrack-horizontal (invalid)]
    expected: FAIL

-  [appearance: sliderthumb-horizontal (invalid)]
-    expected: FAIL
-
-  [appearance: menuitem (invalid)]
-    expected: FAIL
-
  [appearance: scrollbarthumb-horizontal (invalid)]
    expected: FAIL

@ -530,33 +128,9 @@
  [appearance: range (invalid)]
    expected: FAIL

-  [appearance: media-volume-sliderthumb (invalid)]
-    expected: FAIL
-
  [-webkit-appearance: textfield-multiline (invalid)]
    expected: FAIL

-  [appearance: -moz-window-frame-bottom (invalid)]
-    expected: FAIL
-
-  [appearance: -moz-win-communications-toolbox (invalid)]
-    expected: FAIL
-
-  [appearance: tab-scroll-arrow-forward (invalid)]
-    expected: FAIL
-
-  [appearance: menulist-text (invalid)]
-    expected: FAIL
-
-  [appearance: caret (invalid)]
-    expected: FAIL
-
-  [appearance: menulist-textfield (invalid)]
-    expected: FAIL
-
-  [appearance: button-bevel (invalid)]
-    expected: FAIL
-
  [-webkit-appearance: scale-horizontal (invalid)]
    expected: FAIL

--- a/testing/web-platform/meta/css/css-ui/appearance-initial-value-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-initial-value-001.html.ini
@ -1,7 +0,0 @@
-[appearance-initial-value-001.html]
-  [support for appearance]
-    expected: FAIL
-
-  [initial value for appearance]
-    expected: FAIL
-
--- a/testing/web-platform/meta/css/css-ui/appearance-listbox-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-listbox-001.html.ini
@ -1,3 +1,4 @@
 [appearance-listbox-001.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
+  expected: FAIL
--- a/testing/web-platform/meta/css/css-ui/appearance-menulist-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-menulist-001.html.ini
@ -1,3 +1,4 @@
 [appearance-menulist-001.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
+  expected: FAIL
--- a/testing/web-platform/meta/css/css-ui/appearance-menulist-button-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-menulist-button-001.html.ini
@ -1,3 +1,4 @@
 [appearance-menulist-button-001.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
+  expected: FAIL
--- a/testing/web-platform/meta/css/css-ui/appearance-menulist-button-002.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-menulist-button-002.html.ini
@ -1,5 +1,3 @@
 [appearance-menulist-button-002.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
-  expected:
-    FAIL
--- a/testing/web-platform/meta/css/css-ui/appearance-meter-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-meter-001.html.ini
@ -1,3 +1,5 @@
 [appearance-meter-001.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
+  expected:
+    if os == "mac": FAIL
--- a/testing/web-platform/meta/css/css-ui/appearance-parsing.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-parsing.html.ini
@ -1,10 +0,0 @@
-[appearance-parsing.html]
-  [parsing via modification of cssText]
-    expected: FAIL
-
-  [parsing via attribute change steps of CSS declaration block's owner node]
-    expected: FAIL
-
-  [parsing via creation of CSS declaration block]
-    expected: FAIL
-
--- a/testing/web-platform/meta/css/css-ui/appearance-progress-bar-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-progress-bar-001.html.ini
@ -1,3 +1,6 @@
 [appearance-progress-bar-001.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
+  expected:
+    if os == "android": PASS
+    FAIL
--- a/testing/web-platform/meta/css/css-ui/appearance-property.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-property.html.ini
@ -1,13 +0,0 @@
-[appearance-property.html]
-  [property access]
-    expected: FAIL
-
-  [removeProperty]
-    expected: FAIL
-
-  [getPropertyValue]
-    expected: FAIL
-
-  [setProperty]
-    expected: FAIL
-
--- a/testing/web-platform/meta/css/css-ui/appearance-push-button-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-push-button-001.html.ini
@ -1,3 +1,4 @@
 [appearance-push-button-001.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
+  expected: FAIL
--- a/testing/web-platform/meta/css/css-ui/appearance-radio-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-radio-001.html.ini
@ -1,3 +1,4 @@
 [appearance-radio-001.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
+  expected: FAIL
--- a/testing/web-platform/meta/css/css-ui/appearance-searchfield-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-searchfield-001.html.ini
@ -1,3 +1,5 @@
 [appearance-searchfield-001.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
+  expected:
+    if os == "mac": FAIL
--- a/testing/web-platform/meta/css/css-ui/appearance-serialization.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-serialization.html.ini
@ -1,10 +0,0 @@
-[appearance-serialization.html]
-  [serialization via CSSStyleRule]
-    expected: FAIL
-
-  [serialization via CSSStyleDeclaration]
-    expected: FAIL
-
-  [serialization via CSSMediaRule]
-    expected: FAIL
-
--- a/testing/web-platform/meta/css/css-ui/appearance-slider-horizontal-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-slider-horizontal-001.html.ini
@ -1,3 +1,4 @@
 [appearance-slider-horizontal-001.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
+  expected: FAIL
--- a/testing/web-platform/meta/css/css-ui/appearance-square-button-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-square-button-001.html.ini
@ -1,3 +1,4 @@
 [appearance-square-button-001.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
+  expected: FAIL
--- a/testing/web-platform/meta/css/css-ui/appearance-textarea-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-textarea-001.html.ini
@ -1,3 +1,4 @@
 [appearance-textarea-001.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
+  expected: FAIL
--- a/testing/web-platform/meta/css/css-ui/appearance-textfield-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-textfield-001.html.ini
@ -1,3 +1,4 @@
 [appearance-textfield-001.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
+  expected: FAIL
--- a/testing/web-platform/meta/css/css-ui/inheritance.html.ini
+++ b/testing/web-platform/meta/css/css-ui/inheritance.html.ini
@ -8,9 +8,6 @@
  [Property caret-shape has initial value auto]
    expected: FAIL

-  [Property appearance does not inherit]
-    expected: FAIL
-
  [Property nav-up has initial value auto]
    expected: FAIL

@ -32,6 +29,3 @@
  [Property nav-up does not inherit]
    expected: FAIL

-  [Property appearance has initial value none]
-    expected: FAIL
-
--- a/testing/web-platform/meta/css/css-ui/webkit-appearance-auto-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/webkit-appearance-auto-001.html.ini
@ -1,4 +1,3 @@
 [webkit-appearance-auto-001.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
-  expected: FAIL
--- a/testing/web-platform/meta/css/css-ui/webkit-appearance-menulist-button-002.html.ini
+++ b/testing/web-platform/meta/css/css-ui/webkit-appearance-menulist-button-002.html.ini
@ -1,5 +1,3 @@
 [webkit-appearance-menulist-button-002.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
-  expected:
-    if os != "android": FAIL
--- a/testing/web-platform/meta/css/css-ui/webkit-appearance-meter-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/webkit-appearance-meter-001.html.ini
@ -1,4 +1,5 @@
 [webkit-appearance-meter-001.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
-  expected: FAIL
+  expected:
+    if os == "mac": FAIL
--- a/testing/web-platform/meta/css/css-ui/webkit-appearance-parsing.html.ini
+++ b/testing/web-platform/meta/css/css-ui/webkit-appearance-parsing.html.ini
@ -1,10 +0,0 @@
-[webkit-appearance-parsing.html]
-  [parsing via modification of cssText]
-    expected: FAIL
-
-  [parsing via attribute change steps of CSS declaration block's owner node]
-    expected: FAIL
-
-  [parsing via creation of CSS declaration block]
-    expected: FAIL
-
--- a/testing/web-platform/meta/css/css-ui/webkit-appearance-progress-bar-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/webkit-appearance-progress-bar-001.html.ini
@ -1,4 +1,6 @@
 [webkit-appearance-progress-bar-001.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
-  expected: FAIL
+  expected:
+    if os == "android": PASS
+    FAIL
--- a/testing/web-platform/meta/css/css-ui/webkit-appearance-property.html.ini
+++ b/testing/web-platform/meta/css/css-ui/webkit-appearance-property.html.ini
@ -1,40 +0,0 @@
-[webkit-appearance-property.html]
-  [removeProperty - camel-cased property name (ignored)]
-    expected: FAIL
-
-  [removeProperty - webkit-cased property name (ignored)]
-    expected: FAIL
-
-  [setProperty - CSS property name]
-    expected: FAIL
-
-  [property assignment - webkit-cased property name]
-    expected: FAIL
-
-  [setProperty - camel-cased property name (ignored)]
-    expected: FAIL
-
-  [property assignment - camel-cased property name]
-    expected: FAIL
-
-  [property access - CSS property name]
-    expected: FAIL
-
-  [removeProperty - CSS property name]
-    expected: FAIL
-
-  [property access - webkit-cased property name]
-    expected: FAIL
-
-  [property access - camel-cased property name]
-    expected: FAIL
-
-  [getPropertyValue - CSS property name]
-    expected: FAIL
-
-  [property assignment - CSS property name]
-    expected: FAIL
-
-  [setProperty - webkit-cased property name (ignored)]
-    expected: FAIL
-
--- a/testing/web-platform/meta/css/css-ui/webkit-appearance-searchfield-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/webkit-appearance-searchfield-001.html.ini
@ -1,4 +1,5 @@
 [webkit-appearance-searchfield-001.html]
  disabled:
    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
-  expected: FAIL
+  expected:
+    if os == "mac": FAIL
--- a/testing/web-platform/meta/css/css-ui/webkit-appearance-serialization.html.ini
+++ b/testing/web-platform/meta/css/css-ui/webkit-appearance-serialization.html.ini
@ -1,10 +0,0 @@
-[webkit-appearance-serialization.html]
-  [serialization via CSSStyleRule]
-    expected: FAIL
-
-  [serialization via CSSStyleDeclaration]
-    expected: FAIL
-
-  [serialization via CSSMediaRule]
-    expected: FAIL
-
--- a/testing/web-platform/meta/html/rendering/widgets/appearance/default-styles.html.ini
+++ b/testing/web-platform/meta/html/rendering/widgets/appearance/default-styles.html.ini
@ -1,22 +1,7 @@
 [default-styles.html]
-  [<marquee>]
-    expected: FAIL
-
-  [<input type="HIDDEN">]
-    expected: FAIL
-
-  [<summary>]
-    expected: FAIL
-
  [<input type="button">]
    expected: FAIL

-  [<input> (namespace: null)]
-    expected: FAIL
-
-  [<keygen>]
-    expected: FAIL
-
  [<textarea>]
    expected: FAIL

@ -29,12 +14,6 @@
  [<select multiple="">]
    expected: FAIL

-  [<video>]
-    expected: FAIL
-
-  [The body element]
-    expected: FAIL
-
  [<input type="text">]
    expected: FAIL

@ -62,9 +41,6 @@
  [<progress>]
    expected: FAIL

-  [<input> (namespace: http://www.w3.org/2000/svg)]
-    expected: FAIL
-
  [<input type="checkbox">]
    expected: FAIL

@ -77,15 +53,9 @@
  [<input type="unknowntype">]
    expected: FAIL

-  [<input type="file">]
-    expected: FAIL
-
  [<input type="email">]
    expected: FAIL

-  [<input type="image">]
-    expected: FAIL
-
  [<input type="search">]
    expected: FAIL

@ -95,9 +65,6 @@
  [<input type="submit">]
    expected: FAIL

-  [<details>]
-    expected: FAIL
-
  [<input type="date">]
    expected: FAIL

@ -113,24 +80,9 @@
  [<input type="number">]
    expected: FAIL

-  [<menuitem>]
-    expected: FAIL
-
-  [<video controls="">]
-    expected: FAIL
-
-  [<input type="hidden">]
-    expected: FAIL
-
  [<input type="url">]
    expected: FAIL

  [<input type="password">]
    expected: FAIL

-  [<div>]
-    expected: FAIL
-
-  [The html element]
-    expected: FAIL
-
--- a/testing/web-platform/meta/html/rendering/widgets/baseline-alignment-and-overflow.tentative.html.ini
+++ b/testing/web-platform/meta/html/rendering/widgets/baseline-alignment-and-overflow.tentative.html.ini
@ -23,3 +23,21 @@
    expected:
      if os == "linux": FAIL

+  [<input type="radio" style="overflow: visible; appearance: auto;">]
+    expected: FAIL
+
+  [<input type="checkbox" style="overflow: visible; appearance: auto;">]
+    expected: FAIL
+
+  [<input type="radio" style="overflow: hidden; appearance: auto;">]
+    expected: FAIL
+
+  [<input type="radio" style="overflow: scroll; appearance: auto;">]
+    expected: FAIL
+
+  [<input type="checkbox" style="overflow: hidden; appearance: auto;">]
+    expected: FAIL
+
+  [<input type="checkbox" style="overflow: scroll; appearance: auto;">]
+    expected: FAIL
+