Merging upstream version 125.0.1.

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

4 files changed, 155 insertions, 0 deletions

diff --git a/testing/web-platform/meta/css/css-color/parsing/color-computed-color-mix-function.html.ini b/testing/web-platform/meta/css/css-color/parsing/color-computed-color-mix-function.html.ini
new file mode 100644
index 0000000000..97e04a8181
--- /dev/null
+++ b/testing/web-platform/meta/css/css-color/parsing/color-computed-color-mix-function.html.ini
@@ -0,0 +1,6 @@
+[color-computed-color-mix-function.html]
+  [Property color value 'color-mix(in lch, white, blue)']
+    expected: FAIL
+
+  [Property color value 'color-mix(in lch, white 10%, blue)']
+    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-color/parsing/color-computed-relative-color.html.ini b/testing/web-platform/meta/css/css-color/parsing/color-computed-relative-color.html.ini
index 129062dcec..92564f07ca 100644
--- a/testing/web-platform/meta/css/css-color/parsing/color-computed-relative-color.html.ini
+++ b/testing/web-platform/meta/css/css-color/parsing/color-computed-relative-color.html.ini
@@ -2839,3 +2839,99 @@
 
   [Property color value 'color(from color(srgb 0.25 0.5 0.75) xyz-d65 x y z)']
     expected: FAIL
+
+  [Property color value 'rgb(from color-mix(in srgb, red, red) r g b / alpha)']
+    expected: FAIL
+
+  [Property color value 'hsl(from color-mix(in srgb, red, red) h s l / alpha)']
+    expected: FAIL
+
+  [Property color value 'hwb(from color-mix(in srgb, red, red) h w b / alpha)']
+    expected: FAIL
+
+  [Property color value 'lab(from color-mix(in lab, lab(25 20 50), lab(25 20 50)) l a b / alpha)']
+    expected: FAIL
+
+  [Property color value 'oklab(from color-mix(in oklab, oklab(0.25 0.2 0.5), oklab(0.25 0.2 0.5)) l a b / alpha)']
+    expected: FAIL
+
+  [Property color value 'lch(from color-mix(in lch, lch(70 45 30), lch(70 45 30)) l c h / alpha)']
+    expected: FAIL
+
+  [Property color value 'oklch(from color-mix(in oklch, oklch(0.7 0.45 30), oklch(0.7 0.45 30)) l c h / alpha)']
+    expected: FAIL
+
+  [Property color value 'color(from color-mix(in xyz, color(srgb 0.7 0.5 0.3), color(srgb 0.7 0.5 0.3)) srgb r g b / alpha)']
+    expected: FAIL
+
+  [Property color value 'color(from color-mix(in xyz, color(srgb-linear 0.7 0.5 0.3), color(srgb-linear 0.7 0.5 0.3)) srgb-linear r g b / alpha)']
+    expected: FAIL
+
+  [Property color value 'color(from color-mix(in xyz, color(a98-rgb 0.7 0.5 0.3), color(a98-rgb 0.7 0.5 0.3)) a98-rgb r g b / alpha)']
+    expected: FAIL
+
+  [Property color value 'color(from color-mix(in xyz, color(rec2020 0.7 0.5 0.3), color(rec2020 0.7 0.5 0.3)) rec2020 r g b / alpha)']
+    expected: FAIL
+
+  [Property color value 'color(from color-mix(in xyz, color(prophoto-rgb 0.7 0.5 0.3), color(prophoto-rgb 0.7 0.5 0.3)) prophoto-rgb r g b / alpha)']
+    expected: FAIL
+
+  [Property color value 'color(from color-mix(in xyz, color(display-p3 0.7 0.5 0.3), color(display-p3 0.7 0.5 0.3)) display-p3 r g b / alpha)']
+    expected: FAIL
+
+  [Property color value 'rgb(from rebeccapurple calc((r / 255) * 100%) calc((g / 255) * 100%) calc((b / 255) * 100%) / calc(alpha * 100%))']
+    expected: FAIL
+
+  [Property color value 'hsl(from rebeccapurple calc((h / 360) * 360deg) calc((s / 100) * 100%) calc((l / 100) * 100%) / calc(alpha * 100%))']
+    expected: FAIL
+
+  [Property color value 'hwb(from rebeccapurple calc((h / 360) * 360deg) calc((w / 100) * 100%) calc((b / 100) * 100%) / calc(alpha * 100%))']
+    expected: FAIL
+
+  [Property color value 'lab(from lab(25 20 50) calc((l / 100) * 100%) calc((a / 125) * 100%) calc((b / 125) * 100%) / calc(alpha * 100%))']
+    expected: FAIL
+
+  [Property color value 'oklab(from oklab(0.25 0.2 0.5) calc(l * 100%) calc((a / 0.4) * 100%) calc((b / 0.4) * 100%) / calc(alpha * 100%))']
+    expected: FAIL
+
+  [Property color value 'lch(from lch(0.7 45 30) calc((l / 100) * 100%) calc((c / 150) * 100%) calc((h / 360) * 360deg) / calc(alpha * 100%))']
+    expected: FAIL
+
+  [Property color value 'oklch(from oklch(0.7 0.45 30) calc(l * 100%) calc((c / 0.4) * 100%) calc((h / 360) * 360deg) / calc(alpha * 100%))']
+    expected: FAIL
+
+  [Property color value 'color(from color(srgb 0.7 0.5 0.3) srgb calc(r * 100%) calc(g * 100%) calc(b * 100%) / calc(alpha * 100%))']
+    expected: FAIL
+
+  [Property color value 'color(from color(srgb-linear 0.7 0.5 0.3) srgb-linear calc(r * 100%) calc(g * 100%) calc(b * 100%) / calc(alpha * 100%))']
+    expected: FAIL
+
+  [Property color value 'color(from color(a98-rgb 0.7 0.5 0.3) a98-rgb calc(r * 100%) calc(g * 100%) calc(b * 100%) / calc(alpha * 100%))']
+    expected: FAIL
+
+  [Property color value 'color(from color(rec2020 0.7 0.5 0.3) rec2020 calc(r * 100%) calc(g * 100%) calc(b * 100%) / calc(alpha * 100%))']
+    expected: FAIL
+
+  [Property color value 'color(from color(prophoto-rgb 0.7 0.5 0.3) prophoto-rgb calc(r * 100%) calc(g * 100%) calc(b * 100%) / calc(alpha * 100%))']
+    expected: FAIL
+
+  [Property color value 'color(from color(display-p3 0.7 0.5 0.3) display-p3 calc(r * 100%) calc(g * 100%) calc(b * 100%) / calc(alpha * 100%))']
+    expected: FAIL
+
+  [Property color value 'color(from color(xyz 7 -20.5 100) xyz calc(x * 100%) calc(y * 100%) calc(z * 100%) / calc(alpha * 100%))']
+    expected: FAIL
+
+  [Property color value 'color(from color-mix(in xyz, color(xyz 0.7 0.5 0.3), color(xyz 0.7 0.5 0.3)) xyz x y z / alpha)']
+    expected: FAIL
+
+  [Property color value 'color(from color(xyz-d50 7 -20.5 100) xyz-d50 calc(x * 100%) calc(y * 100%) calc(z * 100%) / calc(alpha * 100%))']
+    expected: FAIL
+
+  [Property color value 'color(from color-mix(in xyz, color(xyz-d50 0.7 0.5 0.3), color(xyz-d50 0.7 0.5 0.3)) xyz-d50 x y z / alpha)']
+    expected: FAIL
+
+  [Property color value 'color(from color(xyz-d65 7 -20.5 100) xyz-d65 calc(x * 100%) calc(y * 100%) calc(z * 100%) / calc(alpha * 100%))']
+    expected: FAIL
+
+  [Property color value 'color(from color-mix(in xyz, color(xyz-d65 0.7 0.5 0.3), color(xyz-d65 0.7 0.5 0.3)) xyz-d65 x y z / alpha)']
+    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-color/parsing/color-valid-relative-color.html.ini b/testing/web-platform/meta/css/css-color/parsing/color-valid-relative-color.html.ini
index 8b98c2057a..df000ed033 100644
--- a/testing/web-platform/meta/css/css-color/parsing/color-valid-relative-color.html.ini
+++ b/testing/web-platform/meta/css/css-color/parsing/color-valid-relative-color.html.ini
@@ -2767,3 +2767,51 @@
 
   [e.style['color'\] = "oklch(from oklch(0.7 0.2 300) l c calc(h * 2.5))" should set the property value]
     expected: FAIL
+
+  [e.style['color'\] = "rgb(from color-mix(in srgb, red, red) r g b / alpha)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hsl(from color-mix(in srgb, red, red) h s l / alpha)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hwb(from color-mix(in srgb, red, red) h w b / alpha)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "lab(from color-mix(in lab, lab(25 20 50), lab(25 20 50)) l a b / alpha)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "oklab(from color-mix(in oklab, oklab(0.25 0.2 0.5), oklab(0.25 0.2 0.5)) l a b / alpha)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "lch(from color-mix(in lch, lch(70 45 30), lch(70 45 30)) l c h / alpha)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "oklch(from color-mix(in oklch, oklch(0.7 0.45 30), oklch(0.7 0.45 30)) l c h / alpha)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from color-mix(in xyz, color(srgb 0.7 0.5 0.3), color(srgb 0.7 0.5 0.3)) srgb r g b / alpha)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from color-mix(in xyz, color(srgb-linear 0.7 0.5 0.3), color(srgb-linear 0.7 0.5 0.3)) srgb-linear r g b / alpha)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from color-mix(in xyz, color(a98-rgb 0.7 0.5 0.3), color(a98-rgb 0.7 0.5 0.3)) a98-rgb r g b / alpha)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from color-mix(in xyz, color(rec2020 0.7 0.5 0.3), color(rec2020 0.7 0.5 0.3)) rec2020 r g b / alpha)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from color-mix(in xyz, color(prophoto-rgb 0.7 0.5 0.3), color(prophoto-rgb 0.7 0.5 0.3)) prophoto-rgb r g b / alpha)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from color-mix(in xyz, color(display-p3 0.7 0.5 0.3), color(display-p3 0.7 0.5 0.3)) display-p3 r g b / alpha)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from color-mix(in xyz, color(xyz 0.7 0.5 0.3), color(xyz 0.7 0.5 0.3)) xyz x y z / alpha)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from color-mix(in xyz, color(xyz-d50 0.7 0.5 0.3), color(xyz-d50 0.7 0.5 0.3)) xyz-d50 x y z / alpha)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from color-mix(in xyz, color(xyz-d65 0.7 0.5 0.3), color(xyz-d65 0.7 0.5 0.3)) xyz-d65 x y z / alpha)" should set the property value]
+    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-color/system-color-support.html.ini b/testing/web-platform/meta/css/css-color/system-color-support.html.ini
new file mode 100644
index 0000000000..085fb907dd
--- /dev/null
+++ b/testing/web-platform/meta/css/css-color/system-color-support.html.ini
@@ -0,0 +1,5 @@
+[system-color-support.html]
+  [System color Highlight works]
+    expected:
+      if os == "linux": FAIL
+      if os == "android": FAIL