From def92d1b8e9d373e2f6f27c366d578d97d8960c6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:34:50 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 layout/style/res/forms.css |  4 ++++
 layout/style/res/html.css  | 12 +++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'layout/style/res')

diff --git a/layout/style/res/forms.css b/layout/style/res/forms.css
index 587534e9f3..044d460ad4 100644
--- a/layout/style/res/forms.css
+++ b/layout/style/res/forms.css
@@ -73,6 +73,8 @@ fieldset {
 
 label {
   cursor: default;
+  /* If you add declarations here, consider whether the select > label and file
+   * input label need them as well. */
 }
 
 /* Default inputs, text inputs, and selects */
@@ -281,6 +283,7 @@ select > button {
 select > label {
   display: inline-block;
   overflow: clip;
+  cursor: unset;
 }
 
 option[label]::before {
@@ -627,6 +630,7 @@ input[type=file] > label {
   min-inline-size: 12em;
   text-align: match-parent;
 
+  cursor: unset;
   color: unset;
   font-size: unset;
   letter-spacing: unset;
diff --git a/layout/style/res/html.css b/layout/style/res/html.css
index ff58ecd4d1..18dd1c4855 100644
--- a/layout/style/res/html.css
+++ b/layout/style/res/html.css
@@ -765,7 +765,7 @@ video > .caption-box {
  * The pseudo element won't inherit CSS styles from its direct parent, `::cue`
  * would actually inherit styles from video because it's video's pseudo element.
  * Therefore, we have to explicitly set some styles which are already defined
- * in its parent element in vtt.jsm.
+ * in its parent element in vtt.sys.mjs.
  */
 ::cue {
   color: rgba(255, 255, 255, 1);
@@ -816,15 +816,21 @@ dialog::backdrop {
   background: rgba(0, 0, 0, 0.1);
 }
 
+/* https://html.spec.whatwg.org/#the-marquee-element-2 */
 marquee {
-  inline-size: -moz-available;
   display: inline-block;
+  text-align: initial;
+  overflow: hidden !important;
+
+  /* See https://github.com/whatwg/html/issues/10249 */
+  inline-size: -moz-available;
   vertical-align: text-bottom;
-  text-align: start;
+  white-space: nowrap;
 }
 
 marquee:is([direction="up"], [direction="down"]) {
   block-size: 200px;
+  white-space: unset;
 }
 
 /* Ruby */
-- 
cgit v1.2.3