Merging upstream version 127.0.

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

8 files changed, 23 insertions, 34 deletions

diff --git a/testing/web-platform/meta/css/cssom-view/offsetTop-offsetLeft-with-zoom.html.ini b/testing/web-platform/meta/css/cssom-view/offsetTop-offsetLeft-with-zoom.html.ini
deleted file mode 100644
index 0e344ab958..0000000000
--- a/testing/web-platform/meta/css/cssom-view/offsetTop-offsetLeft-with-zoom.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[offsetTop-offsetLeft-with-zoom.html]
-  [Verifies that offsetTop and offsetLeft find the right OffsetParent and return values excluding the target zoom]
-    expected: FAIL
diff --git a/testing/web-platform/meta/css/cssom-view/scroll-behavior-element.html.ini b/testing/web-platform/meta/css/cssom-view/scroll-behavior-element.html.ini
index 88fc41c002..81dea603f4 100644
--- a/testing/web-platform/meta/css/cssom-view/scroll-behavior-element.html.ini
+++ b/testing/web-platform/meta/css/cssom-view/scroll-behavior-element.html.ini
@@ -4,12 +4,11 @@
 
   [Element with smooth scroll-behavior ; scrollBy() with auto behavior]
     expected:
-      if (os == "win") and swgl: [PASS, FAIL]
       if os == "linux": [PASS, FAIL]
 
   [Element with smooth scroll-behavior ; scrollTo() with auto behavior]
     expected:
-      if (os == "win") and debug and not swgl: [PASS, FAIL]
+      if (os == "win") and debug: [PASS, FAIL]
       if os == "linux": [PASS, FAIL]
 
   [Element with smooth scroll-behavior ; scroll() with default behavior]
@@ -22,23 +21,17 @@
 
   [Element with auto scroll-behavior ; scrollIntoView() with smooth behavior]
     expected:
-      if debug and (os == "linux") and not fission and not swgl: [PASS, FAIL]
+      if debug and (os == "linux") and not fission: [PASS, FAIL]
       if debug and (os == "mac"): [PASS, FAIL]
 
   [Element with smooth scroll-behavior ; scrollIntoView() with auto behavior]
     expected:
-      if not swgl and debug and (os == "linux") and not fission: [PASS, FAIL]
-      if swgl: [PASS, FAIL]
+      if not fission and (os == "linux") and debug: [PASS, FAIL]
 
   [Element with smooth scroll-behavior ; scroll() with auto behavior]
     expected:
-      if (os == "linux") and debug and fission and swgl: [PASS, FAIL]
-      if (os == "linux") and debug and not fission: [PASS, FAIL]
+      if not fission and (os == "linux") and debug: [PASS, FAIL]
 
   [Element with smooth scroll-behavior ; scroll() with smooth behavior]
     expected:
       if (processor == "x86") and not debug: [PASS, FAIL]
-
-  [Element with auto scroll-behavior ; scrollBy() with smooth behavior]
-    expected:
-      if swgl and (os == "linux") and not fission: [PASS, FAIL]
diff --git a/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-window.html.ini b/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-window.html.ini
new file mode 100644
index 0000000000..a782282d75
--- /dev/null
+++ b/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-window.html.ini
@@ -0,0 +1,4 @@
+[scroll-behavior-main-frame-window.html]
+  [Main frame with smooth scroll-behavior ; scroll() with default behavior]
+    expected:
+      if not fission and (os == "linux") and debug: [PASS, FAIL]
diff --git a/testing/web-platform/meta/css/cssom-view/scroll-behavior-scrollintoview-nested.html.ini b/testing/web-platform/meta/css/cssom-view/scroll-behavior-scrollintoview-nested.html.ini
index 89f51ee229..5e18ed0daa 100644
--- a/testing/web-platform/meta/css/cssom-view/scroll-behavior-scrollintoview-nested.html.ini
+++ b/testing/web-platform/meta/css/cssom-view/scroll-behavior-scrollintoview-nested.html.ini
@@ -1,5 +1,5 @@
 [scroll-behavior-scrollintoview-nested.html]
   [scrollIntoView with nested elements with different scroll-behavior]
     expected:
-      if (os == "linux") and not fission and not swgl: [PASS, FAIL]
-      if os == "android": FAIL
+      if not fission and (os == "linux"): [PASS, FAIL]
+      if not fission and (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/cssom-view/scroll-behavior-smooth-positions.html.ini b/testing/web-platform/meta/css/cssom-view/scroll-behavior-smooth-positions.html.ini
index 7c7983f540..b1d9973082 100644
--- a/testing/web-platform/meta/css/cssom-view/scroll-behavior-smooth-positions.html.ini
+++ b/testing/web-platform/meta/css/cssom-view/scroll-behavior-smooth-positions.html.ini
@@ -8,6 +8,7 @@
     expected:
       if (os == "win") and debug: [PASS, FAIL]
       if (os == "linux") and not fission: [PASS, FAIL]
+      if (os == "android") and debug: [PASS, FAIL]
 
   [Scroll positions when performing smooth scrolling from (1000, 500) to (500, 250) using scrollBy() ]
     expected:
@@ -17,15 +18,6 @@
     expected:
       if (os == "win") and debug: [PASS, FAIL]
 
-  [Scroll positions when performing smooth scrolling from 0 to 250 by setting scrollTop ]
-    expected:
-      if swgl and (os == "win"): [PASS, FAIL]
-
   [Scroll positions when performing smooth scrolling from (0, 500) to (500, 250) using scrollTo() ]
     expected:
-      if (os == "linux") and swgl and not fission: [PASS, FAIL]
       if (os == "win") and not debug: [PASS, FAIL]
-
-  [Scroll positions when performing smooth scrolling from (1000, 0) to (500, 250) using scrollTo() ]
-    expected:
-      if swgl and (os == "linux") and not fission: [PASS, FAIL]
diff --git a/testing/web-platform/meta/css/cssom-view/scroll-behavior-subframe-root.html.ini b/testing/web-platform/meta/css/cssom-view/scroll-behavior-subframe-root.html.ini
index ae344d3d26..6737ece6f5 100644
--- a/testing/web-platform/meta/css/cssom-view/scroll-behavior-subframe-root.html.ini
+++ b/testing/web-platform/meta/css/cssom-view/scroll-behavior-subframe-root.html.ini
@@ -7,7 +7,7 @@
 
   [Subframe setting scrollTop with smooth scroll-behavior]
     expected:
-      if (os == "win") and debug and not swgl: [PASS, FAIL]
+      if (os == "win") and debug: [PASS, FAIL]
 
   [Subframe with smooth scroll-behavior ; scrollTo() with smooth behavior]
     expected:
@@ -19,9 +19,12 @@
 
   [Subframe with smooth scroll-behavior ; scroll() with default behavior]
     expected:
-      if not fission and not swgl and debug: [PASS, FAIL]
-      if not fission and swgl: [PASS, FAIL]
+      if not fission and debug: [PASS, FAIL]
 
   [Subframe with smooth scroll-behavior ; scrollBy() with auto behavior]
     expected:
-      if not fission and debug and not swgl: [PASS, FAIL]
+      if not fission and debug: [PASS, FAIL]
+
+  [Subframe with auto scroll-behavior ; scroll() with smooth behavior]
+    expected:
+      if not fission and debug: [PASS, FAIL]
diff --git a/testing/web-platform/meta/css/cssom-view/scroll-behavior-subframe-window.html.ini b/testing/web-platform/meta/css/cssom-view/scroll-behavior-subframe-window.html.ini
index f80bab1793..931a52f70f 100644
--- a/testing/web-platform/meta/css/cssom-view/scroll-behavior-subframe-window.html.ini
+++ b/testing/web-platform/meta/css/cssom-view/scroll-behavior-subframe-window.html.ini
@@ -8,11 +8,6 @@
       if debug and (os == "linux") and not fission: [PASS, FAIL]
       if debug and (os == "mac"): [PASS, FAIL]
 
-  [Main frame with smooth scroll-behavior ; scrollTo() with auto behavior]
-    expected:
-      if swgl and (os == "win"): [PASS, FAIL]
-      if swgl and (os == "linux"): [PASS, FAIL]
-
   [Main frame with smooth scroll-behavior ; scrollTo() with smooth behavior]
     expected:
       if (os == "win") and debug: [PASS, FAIL]
@@ -24,3 +19,7 @@
   [Main frame with auto scroll-behavior ; scrollBy() with smooth behavior]
     expected:
       if (processor == "x86") and debug: [PASS, FAIL]
+
+  [Main frame with auto scroll-behavior ; scroll() with smooth behavior]
+    expected:
+      if not fission and (os == "linux") and debug: [PASS, FAIL]
diff --git a/testing/web-platform/meta/css/cssom-view/scrollIntoView-smooth.html.ini b/testing/web-platform/meta/css/cssom-view/scrollIntoView-smooth.html.ini
index ae9764e572..158d14c244 100644
--- a/testing/web-platform/meta/css/cssom-view/scrollIntoView-smooth.html.ini
+++ b/testing/web-platform/meta/css/cssom-view/scrollIntoView-smooth.html.ini
@@ -11,6 +11,7 @@
 
   [Smooth scrollIntoView should scroll the element to the 'nearest' position]
     expected:
+      if (os == "linux") and debug and not fission: [PASS, FAIL]
       if os == "android": FAIL
 
   [Smooth scrollIntoView should scroll the element to the 'start' position]