Backed out changeset 64682b454ac6 (bug 1688325) for causing failures on browser_inplace-editor_maxwidth.js. CLOSED TREE

layout/reftests/writing-mode/reftest.list

@@ -63,9 +63,10 @@ fuzzy(0-116,0-94) fuzzy-if(winWidget,0-135,0-124) == 1115916-1-vertical-metrics.
 
 == ua-style-sheet-fieldset-1.html ua-style-sheet-fieldset-1-ref.html
 
-# Android theme uses different padding in themed textareas by default.
-skip-if(Android) == ua-style-sheet-textarea-1.html ua-style-sheet-textarea-1a-ref.html
-skip-if(Android) == ua-style-sheet-textarea-1.html ua-style-sheet-textarea-1c-ref.html
+# These don't like padding on textareas by default different to the UA stylesheet ones.
+# FIXME(emilio): Maybe these should be rewritten to use -moz-appearance: none?
+skip-if(Android||winWidget||!nativeThemePref) == ua-style-sheet-textarea-1.html ua-style-sheet-textarea-1a-ref.html
+skip-if(!winWidget) == ua-style-sheet-textarea-1.html ua-style-sheet-textarea-1c-ref.html
 
 fuzzy-if(Android,0-1,0-18) == ua-style-sheet-checkbox-radio-1.html ua-style-sheet-checkbox-radio-1-ref.html
 # Android uses different margins for buttons compared to the ref.

layout/reftests/writing-mode/ua-style-sheet-textarea-1a-ref.html

@@ -7,11 +7,11 @@
 
 .ltr textarea, .rtl textarea {
   margin: 1px 0;
-  padding: 2px;
+  padding: 0 1px;
 }
 .v-rl textarea {
   margin: 0 1px;
-  padding: 2px;
+  padding: 1px 0;
 }
 </style>
 <div class=ltr>

layout/reftests/writing-mode/ua-style-sheet-textarea-1c-ref.html

@@ -5,6 +5,8 @@
 .v-rl { writing-mode: vertical-rl; }
 .ltr, .rtl, .v-rl { border: 1px solid blue; }
 
+/* Vista or later wants 2px padding on textareas by default,
+   see nsNativeThemeWin::GetWidgetPadding(). */
 textarea {
   padding: 2px;
 }

layout/style/res/forms.css

@@ -99,12 +99,6 @@ input {
   overflow-clip-box: padding-box content-box;
 }
 
-@media (-moz-non-native-content-theme) {
-  input {
-    padding-inline: 2px;
-  }
-}
-
 input::-moz-text-control-editing-root,
 input::placeholder {
   word-wrap: normal;
@@ -117,7 +111,8 @@ textarea {
   -moz-default-appearance: textarea;
   margin-block: 1px;
   border: 2px inset ThreeDLightShadow;
-  padding: 2px;
+  /* The 1px inline padding is for parity with Win/IE */
+  padding-inline: 1px;
   background-color: Field;
   color: FieldText;
   font: medium -moz-fixed;
@@ -130,6 +125,12 @@ textarea {
   overflow-clip-box: content-box;
 }
 
+@media (-moz-non-native-content-theme) {
+  input, textarea {
+    padding-inline: 2px;
+  }
+}
+
 /* A few properties that we don't want to inherit by default: */
 input, textarea, select, button, ::file-selector-button {
   text-align: initial;