From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- .../element/fill-and-stroke-styles/2d.gradient.colormix.html.ini | 3 +++ ...canvasFilterObject.componentTransfer.discrete.tentative.html.ini | 2 -- ...er.canvasFilterObject.componentTransfer.gamma.tentative.html.ini | 2 -- ...canvasFilterObject.componentTransfer.identity.tentative.html.ini | 2 -- ...r.canvasFilterObject.componentTransfer.linear.tentative.html.ini | 2 -- ...er.canvasFilterObject.componentTransfer.table.tentative.html.ini | 2 -- .../manual/imagebitmap/createImageBitmap-origin.sub.html.ini | 6 ++++-- 7 files changed, 7 insertions(+), 12 deletions(-) create mode 100644 testing/web-platform/meta/html/canvas/element/fill-and-stroke-styles/2d.gradient.colormix.html.ini (limited to 'testing/web-platform/meta/html/canvas/element') diff --git a/testing/web-platform/meta/html/canvas/element/fill-and-stroke-styles/2d.gradient.colormix.html.ini b/testing/web-platform/meta/html/canvas/element/fill-and-stroke-styles/2d.gradient.colormix.html.ini new file mode 100644 index 0000000000..07e50c1e95 --- /dev/null +++ b/testing/web-platform/meta/html/canvas/element/fill-and-stroke-styles/2d.gradient.colormix.html.ini @@ -0,0 +1,3 @@ +[2d.gradient.colormix.html] + [color-mix works as CanvasGradient color input] + expected: FAIL diff --git a/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html.ini b/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html.ini index 09a94fafac..d22d6442af 100644 --- a/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html.ini +++ b/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html.ini @@ -2,5 +2,3 @@ expected: if (os == "android") and fission: [OK, TIMEOUT] FAIL - [Test pixels on CanvasFilter() componentTransfer with discrete type] - expected: FAIL diff --git a/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html.ini b/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html.ini index d64dcb0cda..42a0af5275 100644 --- a/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html.ini +++ b/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html.ini @@ -2,5 +2,3 @@ expected: if (os == "android") and fission: [OK, TIMEOUT] FAIL - [Test pixels on CanvasFilter() componentTransfer with gamma type] - expected: FAIL diff --git a/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html.ini b/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html.ini index 35ef3f8f2e..bea03e1ac8 100644 --- a/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html.ini +++ b/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html.ini @@ -2,5 +2,3 @@ expected: if (os == "android") and fission: [OK, TIMEOUT] FAIL - [Test pixels on CanvasFilter() componentTransfer with identity type] - expected: FAIL diff --git a/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html.ini b/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html.ini index 0e39053d30..7adef00ffd 100644 --- a/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html.ini +++ b/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html.ini @@ -2,5 +2,3 @@ expected: if (os == "android") and fission: [OK, TIMEOUT] FAIL - [Test pixels on CanvasFilter() componentTransfer with linear type] - expected: FAIL diff --git a/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html.ini b/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html.ini index 5007e975c0..b1111d9a13 100644 --- a/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html.ini +++ b/testing/web-platform/meta/html/canvas/element/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html.ini @@ -2,5 +2,3 @@ expected: if (os == "android") and fission: [OK, TIMEOUT] FAIL - [Test pixels on CanvasFilter() componentTransfer with table type] - expected: FAIL diff --git a/testing/web-platform/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-origin.sub.html.ini b/testing/web-platform/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-origin.sub.html.ini index dd22219fb3..9210651cc3 100644 --- a/testing/web-platform/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-origin.sub.html.ini +++ b/testing/web-platform/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-origin.sub.html.ini @@ -2,12 +2,14 @@ expected: [OK, TIMEOUT] [redirected to cross-origin HTMLVideoElement: origin unclear 2dContext.drawImage] expected: - if (processor == "x86") and debug: [PASS, FAIL, NOTRUN] + if (os == "win") and debug and (processor == "x86_64"): [FAIL, PASS, NOTRUN] + if (os == "win") and debug and (processor == "x86"): [PASS, FAIL, NOTRUN] [PASS, NOTRUN] [redirected to cross-origin HTMLVideoElement: origin unclear bitmaprenderer.transferFromImageBitmap] expected: - if (processor == "x86") and debug: [PASS, FAIL, TIMEOUT, NOTRUN] + if (os == "win") and debug and (processor == "x86_64"): [FAIL, PASS, TIMEOUT, NOTRUN] + if (os == "win") and debug and (processor == "x86"): [PASS, FAIL, TIMEOUT, NOTRUN] [PASS, TIMEOUT, NOTRUN] [unclean HTMLCanvasElement: origin unclear bitmaprenderer.transferFromImageBitmap] -- cgit v1.2.3