Implement proper origin checks for WebGL textures (fixes #21522)

2025-08-07 14:35:33 +01:00 · 2018-09-17 17:56:56 +02:00 · 2018-09-17 17:56:56 +02:00 · 8c100b23b1
commit 8c100b23b1
parent e745050f3a
13 changed files with 129 additions and 99 deletions
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-canvas-element/security.dataURI.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-canvas-element/security.dataURI.html.ini
@ -1,5 +0,0 @@
-[security.dataURI.html]
-  type: testharness
-  [data: URIs do not count as different-origin, and do not taint the canvas]
-    expected: FAIL
-
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.html.ini
@ -1,5 +0,0 @@
-[toDataURL.jpeg.primarycolours.html]
-  type: testharness
-  [toDataURL with JPEG handles simple colours correctly]
-    expected: FAIL
-
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.html.ini
@ -1,5 +0,0 @@
-[toDataURL.png.complexcolours.html]
-  type: testharness
-  [toDataURL with PNG handles non-primary and non-solid colours correctly]
-    expected: FAIL
-
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.html.ini
@ -1,5 +0,0 @@
-[toDataURL.png.primarycolours.html]
-  type: testharness
-  [toDataURL with PNG handles simple colours correctly]
-    expected: FAIL
-
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/data-url.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/data-url.html.ini
@ -1,5 +0,0 @@
-[data-url.html]
-  type: testharness
-  [data URL image]
-    expected: FAIL
-
--- a/tests/wpt/webgl/meta/conformance/canvas/to-data-url-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/canvas/to-data-url-test.html.ini
@ -1,3 +1,91 @@
 [to-data-url-test.html]
-  bug: https://github.com/servo/servo/issues/21132
-  expected: ERROR
+  [WebGL test #12: should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #18: should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #1: should be 255,0,0,255\nat (0, 8) expected: 255,0,0,255 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #4: should be 255,0,0,255\nat (0, 8) expected: 255,0,0,255 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #34: should be 255,0,0,255\nat (0, 256) expected: 255,0,0,255 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #24: should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #31: should be 255,0,0,255\nat (0, 256) expected: 255,0,0,255 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #10: should be 255,0,0,255\nat (0, 8) expected: 255,0,0,255 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #25: should be 255,0,0,255\nat (0, 128) expected: 255,0,0,255 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #40: should be 255,0,0,255\nat (0, 256) expected: 255,0,0,255 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #19: should be 255,0,0,255\nat (0, 128) expected: 255,0,0,255 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #9: should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #3: should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #43: should be 255,0,0,255\nat (0, 257) expected: 255,0,0,255 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #15: should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #16: should be 255,0,0,255\nat (0, 128) expected: 255,0,0,255 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #21: should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #33: should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #0: should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #30: should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #22: should be 255,0,0,255\nat (0, 128) expected: 255,0,0,255 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #39: should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #28: should be 255,0,0,255\nat (0, 129) expected: 255,0,0,255 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #7: should be 255,0,0,255\nat (0, 8) expected: 255,0,0,255 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #36: should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #42: should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #27: should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #13: should be 255,0,0,255\nat (0, 9) expected: 255,0,0,255 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #37: should be 255,0,0,255\nat (0, 256) expected: 255,0,0,255 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #6: should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
+    expected: FAIL
+
--- a/tests/wpt/webgl/meta/conformance/more/functions/readPixelsBadArgs.html.ini
+++ b/tests/wpt/webgl/meta/conformance/more/functions/readPixelsBadArgs.html.ini
@ -1,8 +0,0 @@
-[readPixelsBadArgs.html]
-  bug: https://github.com/servo/servo/issues/21522
-  [WebGL test #1: testReadPixelsSOPIMG]
-    expected: FAIL
-
-  [WebGL test #2: testReadPixelsSOPCanvas]
-    expected: FAIL
-
--- a/tests/wpt/webgl/meta/conformance/more/functions/texImage2DHTML.html.ini
+++ b/tests/wpt/webgl/meta/conformance/more/functions/texImage2DHTML.html.ini
@ -1,5 +0,0 @@
-[texImage2DHTML.html]
-  bug: https://github.com/servo/servo/issues/21522
-  [WebGL test #1: testTexImage2DNonSOP]
-    expected: FAIL
-
--- a/tests/wpt/webgl/meta/conformance/more/functions/texSubImage2DHTML.html.ini
+++ b/tests/wpt/webgl/meta/conformance/more/functions/texSubImage2DHTML.html.ini
@ -1,5 +0,0 @@
-[texSubImage2DHTML.html]
-  bug: https://github.com/servo/servo/issues/21522
-  [WebGL test #1: testTexImage2DNonSOP]
-    expected: FAIL
-
--- a/tests/wpt/webgl/meta/conformance/textures/misc/origin-clean-conformance.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/misc/origin-clean-conformance.html.ini
@ -1,13 +0,0 @@
-[origin-clean-conformance.html]
-  [WebGL test #3: texSubImage2D with cross-origin image should throw exception.]
-    expected: FAIL
-
-  [WebGL test #8: texSubImage2D with NON origin clean canvas should throw exception.]
-    expected: FAIL
-
-  [WebGL test #2: texImage2D with cross-origin image should throw exception.]
-    expected: FAIL
-
-  [WebGL test #7: texImage2D with NON origin clean canvas should throw exception.]
-    expected: FAIL
-