From a90f034976853f6826fdef80b098a4744599c28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1ty=C3=A1s=20Mustoha?= Date: Wed, 22 Apr 2020 12:25:36 +0200 Subject: [PATCH] Fix InvalidateSubFramebuffer error handling The WebGL2 InvalidateSubFramebuffer function should generate INVALID_VALUE when width or height is negative. --- components/script/dom/webgl2renderingcontext.rs | 2 +- .../conformance2/renderbuffers/invalidate-framebuffer.html.ini | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/components/script/dom/webgl2renderingcontext.rs b/components/script/dom/webgl2renderingcontext.rs index 8e967fbcb86..4bb102bff12 100644 --- a/components/script/dom/webgl2renderingcontext.rs +++ b/components/script/dom/webgl2renderingcontext.rs @@ -3966,7 +3966,7 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext { } if width < 0 || height < 0 { - return; + return self.base.webgl_error(InvalidValue); } self.base diff --git a/tests/wpt/webgl/meta/conformance2/renderbuffers/invalidate-framebuffer.html.ini b/tests/wpt/webgl/meta/conformance2/renderbuffers/invalidate-framebuffer.html.ini index d31804f6f0f..74a111f34ed 100644 --- a/tests/wpt/webgl/meta/conformance2/renderbuffers/invalidate-framebuffer.html.ini +++ b/tests/wpt/webgl/meta/conformance2/renderbuffers/invalidate-framebuffer.html.ini @@ -6,6 +6,3 @@ [WebGL test #17: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] expected: FAIL - [WebGL test #11: getError expected: INVALID_VALUE. Was NO_ERROR : calling invalidateSubFramebuffer should generate INVALID_VALUE if width < 0 or height < 0.] - expected: FAIL -