Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 8 insertions, 9 deletions

diff --git a/layout/style/res/forms.css b/layout/style/res/forms.css
index 044d460ad4..7a5c25fc6e 100644
--- a/layout/style/res/forms.css
+++ b/layout/style/res/forms.css
@@ -192,6 +192,10 @@ input::-moz-text-control-preview {
   line-height: -moz-block-height !important;
 }
 
+input[type=password] {
+  -moz-default-appearance: password-input;
+}
+
 input[type=password]::-moz-text-control-editing-root,
 input[type=password]::-moz-text-control-preview {
   /*
@@ -631,10 +635,6 @@ input[type=file] > label {
   text-align: match-parent;
 
   cursor: unset;
-  color: unset;
-  font-size: unset;
-  letter-spacing: unset;
-
   user-select: none;
   unicode-bidi: plaintext;
 }
@@ -842,7 +842,6 @@ input[type=range]::slider-thumb {
 }
 
 input[type=number] {
-  appearance: auto;
   -moz-default-appearance: number-input;
 }
 
diff --git a/layout/style/res/html.css b/layout/style/res/html.css
index 18dd1c4855..769ebece45 100644
--- a/layout/style/res/html.css
+++ b/layout/style/res/html.css
@@ -136,7 +136,7 @@ body {
   margin: 8px;
 }
 
-p, dl, multicol {
+p, dl {
   display: block;
   margin-block-start: 1em;
   margin-block-end: 1em;
diff --git a/layout/style/res/quirk.css b/layout/style/res/quirk.css
index 6e74839ee3..0379033515 100644
--- a/layout/style/res/quirk.css
+++ b/layout/style/res/quirk.css
@@ -59,7 +59,7 @@ table {
  * selectors will be hashed in the selector maps and things will be much more
  * efficient.
  */
-:is(body, td, th) > :is(p, dl, multicol, blockquote, h1, h2, h3, h4, h5, h6, listing, plaintext, xmp, pre, ul, menu, dir, ol):-moz-first-node {
+:is(body, td, th) > :is(p, dl, blockquote, h1, h2, h3, h4, h5, h6, listing, plaintext, xmp, pre, ul, menu, dir, ol):-moz-first-node {
   margin-block-start: 0;
 }
 
@@ -71,11 +71,11 @@ td > p:-moz-last-node, th > p:-moz-last-node {
  *  collapse the bottom or top margins of empty elements
  *  - see bug 97361
  */
-:is(body, td, th) > :is(p, dl, multicol, blockquote, h1, h2, h3, h4, h5, h6, listing, plaintext, xmp, pre, ul, menu, dir, ol):-moz-only-whitespace:-moz-first-node {
+:is(body, td, th) > :is(p, dl, blockquote, h1, h2, h3, h4, h5, h6, listing, plaintext, xmp, pre, ul, menu, dir, ol):-moz-only-whitespace:-moz-first-node {
   margin-block-end: 0;
 }
 
-:is(td, th) > :is(p, dl, multicol, blockquote, h1, h2, h3, h4, h5, h6, listing, plaintext, xmp, pre, ul, menu, dir, ol):-moz-only-whitespace:-moz-last-node {
+:is(td, th) > :is(p, dl, blockquote, h1, h2, h3, h4, h5, h6, listing, plaintext, xmp, pre, ul, menu, dir, ol):-moz-only-whitespace:-moz-last-node {
   margin-block-start: 0;
 }