Merging upstream version 126.0.

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

16 files changed, 17 insertions, 22 deletions

diff --git a/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-animation-svg-zoom.html.ini b/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-animation-svg-zoom.html.ini
new file mode 100644
index 0000000000..5c5a126b3e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-animation-svg-zoom.html.ini
@@ -0,0 +1 @@
+prefs: [layout.css.zoom.enabled:true]
diff --git a/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-animation-zoom.html.ini b/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-animation-zoom.html.ini
new file mode 100644
index 0000000000..5c5a126b3e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-animation-zoom.html.ini
@@ -0,0 +1 @@
+prefs: [layout.css.zoom.enabled:true]
diff --git a/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-path-interpolation-with-zoom.html.ini b/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-path-interpolation-with-zoom.html.ini
index bb6efb7efc..5c5a126b3e 100644
--- a/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-path-interpolation-with-zoom.html.ini
+++ b/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-path-interpolation-with-zoom.html.ini
@@ -1,2 +1 @@
-[clip-path-path-interpolation-with-zoom.html]
-  expected: FAIL
+prefs: [layout.css.zoom.enabled:true]
diff --git a/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-shape-interpolation-001.html.ini b/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-shape-interpolation-001.html.ini
deleted file mode 100644
index 87f511da91..0000000000
--- a/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-shape-interpolation-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[clip-path-shape-interpolation-001.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-shape-interpolation-002.html.ini b/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-shape-interpolation-002.html.ini
deleted file mode 100644
index 7bdee6ab1a..0000000000
--- a/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-shape-interpolation-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[clip-path-shape-interpolation-002.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-shape-interpolation-003.html.ini b/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-shape-interpolation-003.html.ini
new file mode 100644
index 0000000000..f81dfcb4e9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-shape-interpolation-003.html.ini
@@ -0,0 +1,4 @@
+[clip-path-shape-interpolation-003.html]
+  expected:
+    if (os == "mac") and not debug: [PASS, FAIL]
+    if (os == "android") and not debug: [PASS, FAIL]
diff --git a/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-shape-interpolation-004.html.ini b/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-shape-interpolation-004.html.ini
new file mode 100644
index 0000000000..e6bb0cd448
--- /dev/null
+++ b/testing/web-platform/meta/css/css-masking/clip-path/animations/clip-path-shape-interpolation-004.html.ini
@@ -0,0 +1,4 @@
+[clip-path-shape-interpolation-004.html]
+  expected:
+    if (os == "mac") and not debug: [PASS, FAIL]
+    if (os == "android") and not debug: [PASS, FAIL]
diff --git a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-path-with-zoom-hittest.html.ini b/testing/web-platform/meta/css/css-masking/clip-path/clip-path-path-with-zoom-hittest.html.ini
index 29d75b5da4..5c5a126b3e 100644
--- a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-path-with-zoom-hittest.html.ini
+++ b/testing/web-platform/meta/css/css-masking/clip-path/clip-path-path-with-zoom-hittest.html.ini
@@ -1,4 +1 @@
-[clip-path-path-with-zoom-hittest.html]
-  [clip-path: path() hit-test takes zoom into account]
-    expected: FAIL
-
+prefs: [layout.css.zoom.enabled:true]
diff --git a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-path-with-zoom.html.ini b/testing/web-platform/meta/css/css-masking/clip-path/clip-path-path-with-zoom.html.ini
index 7dcf6f59fa..5c5a126b3e 100644
--- a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-path-with-zoom.html.ini
+++ b/testing/web-platform/meta/css/css-masking/clip-path/clip-path-path-with-zoom.html.ini
@@ -1,2 +1 @@
-[clip-path-path-with-zoom.html]
-  expected: FAIL
+prefs: [layout.css.zoom.enabled:true]
diff --git a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-scaled-video.html.ini b/testing/web-platform/meta/css/css-masking/clip-path/clip-path-scaled-video.html.ini
new file mode 100644
index 0000000000..7fb6afaa8b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-masking/clip-path/clip-path-scaled-video.html.ini
@@ -0,0 +1,3 @@
+[clip-path-scaled-video.html]
+  expected:
+    if (os == "android") and not debug: [PASS, ERROR]
diff --git a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-shape-001.html.ini b/testing/web-platform/meta/css/css-masking/clip-path/clip-path-shape-001.html.ini
deleted file mode 100644
index 9f78224710..0000000000
--- a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-shape-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[clip-path-shape-001.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-shape-002-units.html.ini b/testing/web-platform/meta/css/css-masking/clip-path/clip-path-shape-002-units.html.ini
deleted file mode 100644
index 318b6fe94c..0000000000
--- a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-shape-002-units.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[clip-path-shape-002-units.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-shape-002.html.ini b/testing/web-platform/meta/css/css-masking/clip-path/clip-path-shape-002.html.ini
deleted file mode 100644
index 7cc6c50642..0000000000
--- a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-shape-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[clip-path-shape-002.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-shape-003.html.ini b/testing/web-platform/meta/css/css-masking/clip-path/clip-path-shape-003.html.ini
deleted file mode 100644
index a6024a02e9..0000000000
--- a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-shape-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[clip-path-shape-003.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-shape-004.html.ini b/testing/web-platform/meta/css/css-masking/clip-path/clip-path-shape-004.html.ini
deleted file mode 100644
index 1fb9548298..0000000000
--- a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-shape-004.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[clip-path-shape-004.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-url-reference-svg-foreignobject-zoomed.html.ini b/testing/web-platform/meta/css/css-masking/clip-path/clip-path-url-reference-svg-foreignobject-zoomed.html.ini
index 3a9b62da60..92e74155f0 100644
--- a/testing/web-platform/meta/css/css-masking/clip-path/clip-path-url-reference-svg-foreignobject-zoomed.html.ini
+++ b/testing/web-platform/meta/css/css-masking/clip-path/clip-path-url-reference-svg-foreignobject-zoomed.html.ini
@@ -1,2 +1,3 @@
+prefs: [layout.css.zoom.enabled:true]
 [clip-path-url-reference-svg-foreignobject-zoomed.html]
   expected: FAIL