From f2744d489b117f26a07b1ef5ad6ff05ed644d632 Mon Sep 17 00:00:00 2001 From: Cameron McCormack Date: Thu, 16 Jul 2020 22:04:28 +0000 Subject: [PATCH] Bug 1620467 - Part 10: Make remaining appearance values behave like auto. r=emilio This includes all of the values, plus menulist-button, which doesn't behave any differently from menulist currently. Differential Revision: https://phabricator.services.mozilla.com/D83436 --- layout/style/nsStyleStruct.h | 15 +++++++++++++++ .../css/css-ui/appearance-checkbox-001.html.ini | 1 - .../css/css-ui/appearance-listbox-001.html.ini | 1 - .../css/css-ui/appearance-menulist-001.html.ini | 1 - .../appearance-menulist-button-001.html.ini | 1 - ...arance-menulist-button-002.tentative.html.ini} | 2 +- .../meta/css/css-ui/appearance-meter-001.html.ini | 2 -- .../css-ui/appearance-progress-bar-001.html.ini | 3 --- .../meta/css/css-ui/appearance-radio-001.html.ini | 1 - .../css-ui/appearance-searchfield-001.html.ini | 1 - .../css/css-ui/appearance-textarea-001.html.ini | 1 - .../webkit-appearance-checkbox-001.html.ini | 1 - .../css-ui/webkit-appearance-listbox-001.html.ini | 1 - .../webkit-appearance-menulist-001.html.ini | 1 - ...webkit-appearance-menulist-button-001.html.ini | 1 - ...arance-menulist-button-002.tentative.html.ini} | 2 +- .../css-ui/webkit-appearance-meter-001.html.ini | 2 -- .../webkit-appearance-progress-bar-001.html.ini | 3 --- .../css-ui/webkit-appearance-radio-001.html.ini | 1 - .../webkit-appearance-searchfield-001.html.ini | 2 -- .../webkit-appearance-textarea-001.html.ini | 1 - ...appearance-menulist-button-002.tentative.html} | 12 ++++++++++++ ...appearance-menulist-button-002.tentative.html} | 12 ++++++++++++ 23 files changed, 41 insertions(+), 27 deletions(-) rename testing/web-platform/meta/css/css-ui/{appearance-menulist-button-002.html.ini => appearance-menulist-button-002.tentative.html.ini} (68%) rename testing/web-platform/meta/css/css-ui/{webkit-appearance-menulist-button-002.html.ini => webkit-appearance-menulist-button-002.tentative.html.ini} (64%) rename testing/web-platform/tests/css/css-ui/{appearance-menulist-button-002.html => appearance-menulist-button-002.tentative.html} (66%) rename testing/web-platform/tests/css/css-ui/{webkit-appearance-menulist-button-002.html => webkit-appearance-menulist-button-002.tentative.html} (69%) diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h index c671ffe34ddf..d586a8a1aadd 100644 --- a/layout/style/nsStyleStruct.h +++ b/layout/style/nsStyleStruct.h @@ -1334,6 +1334,15 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay { mozilla::StyleAppearance EffectiveAppearance() const { switch (mAppearance) { case mozilla::StyleAppearance::Auto: + case mozilla::StyleAppearance::Searchfield: + case mozilla::StyleAppearance::Textarea: + case mozilla::StyleAppearance::Checkbox: + case mozilla::StyleAppearance::Radio: + case mozilla::StyleAppearance::Menulist: + case mozilla::StyleAppearance::Listbox: + case mozilla::StyleAppearance::Meter: + case mozilla::StyleAppearance::ProgressBar: + // These are all the values that behave like `auto`. return mDefaultAppearance; case mozilla::StyleAppearance::Textfield: // `appearance: textfield` should behave like `auto` on all elements @@ -1351,6 +1360,12 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay { return mAppearance; } return mDefaultAppearance; + case mozilla::StyleAppearance::MenulistButton: + // `appearance: menulist-button` should behave like `auto` on all + // elements except for drop down selects, but since we have very little + // difference between menulist and menulist-button handling, we don't + // bother. + return mDefaultAppearance; case mozilla::StyleAppearance::Button: // `appearance: button` should behave like `auto` for a specific list // of widget elements, and we encode that using the internal diff --git 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 index d787512f57f1..e8dc516e990e 100644 --- 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,4 +1,3 @@ [appearance-checkbox-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: FAIL diff --git 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 index 381097273f41..005245787629 100644 --- 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,4 +1,3 @@ [appearance-listbox-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: FAIL diff --git 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 index 69ef8533b370..41c82ab248b5 100644 --- 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,4 +1,3 @@ [appearance-menulist-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: FAIL diff --git 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 index 8d4496ac07d3..68f7f137db5b 100644 --- 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,4 +1,3 @@ [appearance-menulist-button-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: FAIL diff --git 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.tentative.html.ini similarity index 68% rename from testing/web-platform/meta/css/css-ui/appearance-menulist-button-002.html.ini rename to testing/web-platform/meta/css/css-ui/appearance-menulist-button-002.tentative.html.ini index 63b88910f38a..57ca2cd206ac 100644 --- 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.tentative.html.ini @@ -1,4 +1,4 @@ -[appearance-menulist-button-002.html] +[appearance-menulist-button-002.tentative.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 expected: FAIL diff --git 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 index 1a212fb1c7d1..46cfb4c2406c 100644 --- 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,5 +1,3 @@ [appearance-meter-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: - FAIL diff --git 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 index a16e444bfa65..def262bd6a4f 100644 --- 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,6 +1,3 @@ [appearance-progress-bar-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: - if os == "android": PASS - FAIL diff --git 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 index d25f2eb51ad7..03d28c1d0ebb 100644 --- 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,4 +1,3 @@ [appearance-radio-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: FAIL diff --git 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 index 28eb81145ace..d553897e3fb9 100644 --- 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,4 +1,3 @@ [appearance-searchfield-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: FAIL diff --git 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 index 11a084d48f9f..a2a358ec0ac5 100644 --- 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,4 +1,3 @@ [appearance-textarea-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: FAIL diff --git a/testing/web-platform/meta/css/css-ui/webkit-appearance-checkbox-001.html.ini b/testing/web-platform/meta/css/css-ui/webkit-appearance-checkbox-001.html.ini index 5824df1fe17c..b39022bad31d 100644 --- a/testing/web-platform/meta/css/css-ui/webkit-appearance-checkbox-001.html.ini +++ b/testing/web-platform/meta/css/css-ui/webkit-appearance-checkbox-001.html.ini @@ -1,4 +1,3 @@ [webkit-appearance-checkbox-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: FAIL diff --git a/testing/web-platform/meta/css/css-ui/webkit-appearance-listbox-001.html.ini b/testing/web-platform/meta/css/css-ui/webkit-appearance-listbox-001.html.ini index c31867b29cfc..923e27578ccb 100644 --- a/testing/web-platform/meta/css/css-ui/webkit-appearance-listbox-001.html.ini +++ b/testing/web-platform/meta/css/css-ui/webkit-appearance-listbox-001.html.ini @@ -1,4 +1,3 @@ [webkit-appearance-listbox-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: FAIL diff --git a/testing/web-platform/meta/css/css-ui/webkit-appearance-menulist-001.html.ini b/testing/web-platform/meta/css/css-ui/webkit-appearance-menulist-001.html.ini index d2bf6dc2c02d..69ae6882dadf 100644 --- a/testing/web-platform/meta/css/css-ui/webkit-appearance-menulist-001.html.ini +++ b/testing/web-platform/meta/css/css-ui/webkit-appearance-menulist-001.html.ini @@ -1,4 +1,3 @@ [webkit-appearance-menulist-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: FAIL diff --git a/testing/web-platform/meta/css/css-ui/webkit-appearance-menulist-button-001.html.ini b/testing/web-platform/meta/css/css-ui/webkit-appearance-menulist-button-001.html.ini index 65ab61045c80..a8356f3ef40a 100644 --- a/testing/web-platform/meta/css/css-ui/webkit-appearance-menulist-button-001.html.ini +++ b/testing/web-platform/meta/css/css-ui/webkit-appearance-menulist-button-001.html.ini @@ -1,4 +1,3 @@ [webkit-appearance-menulist-button-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: FAIL diff --git 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.tentative.html.ini similarity index 64% rename from testing/web-platform/meta/css/css-ui/webkit-appearance-menulist-button-002.html.ini rename to testing/web-platform/meta/css/css-ui/webkit-appearance-menulist-button-002.tentative.html.ini index 0ea6953306d3..f3dc2e870a3b 100644 --- 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.tentative.html.ini @@ -1,4 +1,4 @@ -[webkit-appearance-menulist-button-002.html] +[webkit-appearance-menulist-button-002.tentative.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 expected: FAIL diff --git 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 index 39f6a0c9011f..484b3a37942b 100644 --- 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,5 +1,3 @@ [webkit-appearance-meter-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: - if os == "mac": FAIL diff --git 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 index af3a312ec0c3..f1cbfd113464 100644 --- 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,6 +1,3 @@ [webkit-appearance-progress-bar-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: - if os == "android": PASS - FAIL diff --git a/testing/web-platform/meta/css/css-ui/webkit-appearance-radio-001.html.ini b/testing/web-platform/meta/css/css-ui/webkit-appearance-radio-001.html.ini index ea28fa444fb0..b0d3a4844779 100644 --- a/testing/web-platform/meta/css/css-ui/webkit-appearance-radio-001.html.ini +++ b/testing/web-platform/meta/css/css-ui/webkit-appearance-radio-001.html.ini @@ -1,4 +1,3 @@ [webkit-appearance-radio-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: FAIL diff --git 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 index d5cb15d910d8..191455d41013 100644 --- 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,5 +1,3 @@ [webkit-appearance-searchfield-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: - if os == "mac": FAIL diff --git a/testing/web-platform/meta/css/css-ui/webkit-appearance-textarea-001.html.ini b/testing/web-platform/meta/css/css-ui/webkit-appearance-textarea-001.html.ini index 505bb9ad669f..7c4319334a4c 100644 --- a/testing/web-platform/meta/css/css-ui/webkit-appearance-textarea-001.html.ini +++ b/testing/web-platform/meta/css/css-ui/webkit-appearance-textarea-001.html.ini @@ -1,4 +1,3 @@ [webkit-appearance-textarea-001.html] disabled: if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932 - expected: FAIL diff --git a/testing/web-platform/tests/css/css-ui/appearance-menulist-button-002.html b/testing/web-platform/tests/css/css-ui/appearance-menulist-button-002.tentative.html similarity index 66% rename from testing/web-platform/tests/css/css-ui/appearance-menulist-button-002.html rename to testing/web-platform/tests/css/css-ui/appearance-menulist-button-002.tentative.html index 60a4312b16cd..257945062356 100644 --- a/testing/web-platform/tests/css/css-ui/appearance-menulist-button-002.html +++ b/testing/web-platform/tests/css/css-ui/appearance-menulist-button-002.tentative.html @@ -8,6 +8,18 @@ #container { width: 500px; } #container > #drop-down-select { appearance: none; appearance: menulist-button; } +
a diff --git a/testing/web-platform/tests/css/css-ui/webkit-appearance-menulist-button-002.html b/testing/web-platform/tests/css/css-ui/webkit-appearance-menulist-button-002.tentative.html similarity index 69% rename from testing/web-platform/tests/css/css-ui/webkit-appearance-menulist-button-002.html rename to testing/web-platform/tests/css/css-ui/webkit-appearance-menulist-button-002.tentative.html index 078d568faa17..9fccd82713c5 100644 --- a/testing/web-platform/tests/css/css-ui/webkit-appearance-menulist-button-002.html +++ b/testing/web-platform/tests/css/css-ui/webkit-appearance-menulist-button-002.tentative.html @@ -12,6 +12,18 @@ Edit the appearance-* file instead and then run: #container { width: 500px; } #container > #drop-down-select { -webkit-appearance: none; -webkit-appearance: menulist-button; } +
a