Bug 1620467 - Part 9: Make appearance: textfield behave like auto e…

…xcept on search and number inputs. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D83435
dothq · Jul 16, 2020 · 9f7843c · 9f7843c
1 parent 557d031
commit 9f7843c
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 9 deletions.
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
@@ -1332,12 +1332,36 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay {
   }
 
   mozilla::StyleAppearance EffectiveAppearance() const {
-    if (mAppearance == mozilla::StyleAppearance::Auto ||
-        (mAppearance == mozilla::StyleAppearance::Button &&
-         mButtonAppearance == mozilla::StyleButtonAppearance::Disallow)) {
-      return mDefaultAppearance;
+    switch (mAppearance) {
+      case mozilla::StyleAppearance::Auto:
+        return mDefaultAppearance;
+      case mozilla::StyleAppearance::Textfield:
+        // `appearance: textfield` should behave like `auto` on all elements
+        // except <input type=search> elements, which we identify using the
+        // internal -moz-default-appearance property.  (In the browser chrome
+        // we have some other elements that set `-moz-default-appearance:
+        // searchfield`, but not in content documents.)
+        if (mDefaultAppearance == mozilla::StyleAppearance::Searchfield) {
+          return mAppearance;
+        }
+        // We also need to support `appearance: textfield` on <input
+        // type=number>, since that is the only way in Gecko to disable the
+        // spinners.
+        if (mDefaultAppearance == mozilla::StyleAppearance::NumberInput) {
+          return mAppearance;
+        }
+        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
+        // -moz-button-appearance property.
+        if (mButtonAppearance == mozilla::StyleButtonAppearance::Disallow) {
+          return mDefaultAppearance;
+        }
+        return mAppearance;
+      default:
+        return mAppearance;
     }
-    return mAppearance;
   }
 
   static mozilla::StyleDisplayOutside DisplayOutside(

diff --git 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,4 +1,3 @@
 [appearance-textfield-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-textfield-001.html.ini b/testing/web-platform/meta/css/css-ui/webkit-appearance-textfield-001.html.ini
@@ -1,4 +1,3 @@
 [webkit-appearance-textfield-001.html]
   disabled:
     if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1562932
-  expected: FAIL
diff --git a/toolkit/themes/linux/global/search-textbox.css b/toolkit/themes/linux/global/search-textbox.css
@@ -8,7 +8,8 @@
 /* ::::: search textbox ::::: */
 
 :host {
-  appearance: textfield;
+  appearance: auto;
+  -moz-default-appearance: textfield;
   cursor: text;
   margin: 2px 4px; /* matches <input> global.css margin */
   padding: 2px 2px 3px;

diff --git a/toolkit/themes/windows/global/search-textbox.css b/toolkit/themes/windows/global/search-textbox.css
@@ -8,7 +8,8 @@
 /* ::::: search textbox ::::: */
 
 :host {
-  appearance: textfield;
+  appearance: auto;
+  -moz-default-appearance: textfield;
   cursor: text;
   margin: 2px 4px; /* matches <input> global.css margin */
   padding: 2px 2px 3px;