Merging upstream version 125.0.1.

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

8 files changed, 118 insertions, 0 deletions

diff --git a/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/common-to-both-axes-supercedes-first-in-tree-order.html.ini b/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/common-to-both-axes-supercedes-first-in-tree-order.html.ini
new file mode 100644
index 0000000000..bab7f67ea5
--- /dev/null
+++ b/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/common-to-both-axes-supercedes-first-in-tree-order.html.ini
@@ -0,0 +1,31 @@
+[common-to-both-axes-supercedes-first-in-tree-order.html]
+  expected: TIMEOUT
+  [box0 is common to both axes and is the snap target despite being last in tree order.]
+    expected: TIMEOUT
+
+  [box1 is common to both axes and is the snap target despite being last in tree order.]
+    expected: NOTRUN
+
+  [box2 is common to both axes and is the snap target despite being last in tree order.]
+    expected: NOTRUN
+
+  [box3 is common to both axes and is the snap target despite being last in tree order.]
+    expected: NOTRUN
+
+  [box4 is common to both axes and is the snap target despite being last in tree order.]
+    expected: NOTRUN
+
+  [box5 is common to both axes and is the snap target despite being last in tree order.]
+    expected: NOTRUN
+
+  [box6 is common to both axes and is the snap target despite being last in tree order.]
+    expected: NOTRUN
+
+  [box7 is common to both axes and is the snap target despite being last in tree order.]
+    expected: NOTRUN
+
+  [box8 is common to both axes and is the snap target despite being last in tree order.]
+    expected: NOTRUN
+
+  [box9 is common to both axes and is the snap target despite being last in tree order.]
+    expected: NOTRUN
diff --git a/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/nested-supercedes-common-to-both-axes.html.ini b/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/nested-supercedes-common-to-both-axes.html.ini
new file mode 100644
index 0000000000..7c18bbe0c5
--- /dev/null
+++ b/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/nested-supercedes-common-to-both-axes.html.ini
@@ -0,0 +1,3 @@
+[nested-supercedes-common-to-both-axes.html]
+  [scroller prefers nested area over area aligned in both axes.]
+    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-common-to-both-axes.html.ini b/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-common-to-both-axes.html.ini
new file mode 100644
index 0000000000..17b4d5c080
--- /dev/null
+++ b/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-common-to-both-axes.html.ini
@@ -0,0 +1,3 @@
+[prefer-common-to-both-axes.html]
+  [scroller prefers target aligned in both axes.]
+    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-first-in-tree-order.html.ini b/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-first-in-tree-order.html.ini
new file mode 100644
index 0000000000..4857eb42d2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-first-in-tree-order.html.ini
@@ -0,0 +1,4 @@
+[prefer-first-in-tree-order.html]
+  expected: TIMEOUT
+  [first in tree-order is selected as snap target.]
+    expected: TIMEOUT
diff --git a/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-inner-target.html.ini b/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-inner-target.html.ini
new file mode 100644
index 0000000000..c74a86c3ec
--- /dev/null
+++ b/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-inner-target.html.ini
@@ -0,0 +1,7 @@
+[prefer-inner-target.html]
+  expected: TIMEOUT
+  [snap container selects innermost area as snap target]
+    expected: TIMEOUT
+
+  [snap container follows selected snap target after layout change (the pre-existing snap target should not be overriden because of the innermost area)]
+    expected: NOTRUN
diff --git a/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-targeted-element-main-frame.html.ini b/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-targeted-element-main-frame.html.ini
new file mode 100644
index 0000000000..872b9382b3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-targeted-element-main-frame.html.ini
@@ -0,0 +1,27 @@
+[prefer-targeted-element-main-frame.html]
+  [targeted box1 is selected snap target.]
+    expected: FAIL
+
+  [targeted box2 is selected snap target.]
+    expected: FAIL
+
+  [targeted box3 is selected snap target.]
+    expected: FAIL
+
+  [targeted box4 is selected snap target.]
+    expected: FAIL
+
+  [targeted box5 is selected snap target.]
+    expected: FAIL
+
+  [targeted box6 is selected snap target.]
+    expected: FAIL
+
+  [targeted box7 is selected snap target.]
+    expected: FAIL
+
+  [targeted box8 is selected snap target.]
+    expected: FAIL
+
+  [targeted box9 is selected snap target.]
+    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-targeted-element-positioned.html.ini b/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-targeted-element-positioned.html.ini
new file mode 100644
index 0000000000..0185d28325
--- /dev/null
+++ b/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-targeted-element-positioned.html.ini
@@ -0,0 +1,16 @@
+[prefer-targeted-element-positioned.html]
+  expected: [ERROR, OK]
+  [prefer-targeted-element-positioned]
+    expected: FAIL
+
+  [prefer-targeted-element-positioned 1]
+    expected: FAIL
+
+  [prefer-targeted-element-positioned 2]
+    expected: FAIL
+
+  [prefer-targeted-element-positioned 3]
+    expected: FAIL
+
+  [prefer-targeted-element-positioned 4]
+    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-targeted-element.html.ini b/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-targeted-element.html.ini
new file mode 100644
index 0000000000..660f5f3081
--- /dev/null
+++ b/testing/web-platform/meta/css/css-scroll-snap/snap-after-relayout/multiple-aligned-targets/prefer-targeted-element.html.ini
@@ -0,0 +1,27 @@
+[prefer-targeted-element.html]
+  [scroller selects targeted area box1 among multiple aligned areas.]
+    expected: FAIL
+
+  [scroller selects targeted area box2 among multiple aligned areas.]
+    expected: FAIL
+
+  [scroller selects targeted area box3 among multiple aligned areas.]
+    expected: FAIL
+
+  [scroller selects targeted area box4 among multiple aligned areas.]
+    expected: FAIL
+
+  [scroller selects targeted area box5 among multiple aligned areas.]
+    expected: FAIL
+
+  [scroller selects targeted area box6 among multiple aligned areas.]
+    expected: FAIL
+
+  [scroller selects targeted area box7 among multiple aligned areas.]
+    expected: FAIL
+
+  [scroller selects targeted area box8 among multiple aligned areas.]
+    expected: FAIL
+
+  [scroller selects targeted area box9 among multiple aligned areas.]
+    expected: FAIL