diff options
3 files changed, 6 insertions, 55 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index e9ef8f0384c..cb4dd83fbfd 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -1269,6 +1269,9 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { match parameter { constants::ARRAY_BUFFER_BINDING => return object_binding_to_js_or_null!(cx, &self.bound_buffer_array), + constants::CURRENT_PROGRAM => { + return object_binding_to_js_or_null!(cx, &self.current_program); + } constants::ELEMENT_ARRAY_BUFFER_BINDING => return object_binding_to_js_or_null!(cx, &self.bound_buffer_element_array), constants::FRAMEBUFFER_BINDING => diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/buffers/element-array-buffer-delete-recreate.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/buffers/element-array-buffer-delete-recreate.html.ini deleted file mode 100644 index 06f1ebdc402..00000000000 --- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/buffers/element-array-buffer-delete-recreate.html.ini +++ /dev/null @@ -1,12 +0,0 @@ -[element-array-buffer-delete-recreate.html] - type: testharness - expected: ERROR - [WebGL test #0: getError expected: NO_ERROR. Was INVALID_ENUM : no errors from draw] - expected: FAIL - - [WebGL test #1: at (0, 0) expected: 0,255,0,255 was 0,0,0,0] - expected: FAIL - - [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] - expected: FAIL - diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/drawingbuffer-hd-dpi-test.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/drawingbuffer-hd-dpi-test.html.ini index 112c7ff3f16..d1a71e871ac 100644 --- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/drawingbuffer-hd-dpi-test.html.ini +++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/drawingbuffer-hd-dpi-test.html.ini @@ -1,51 +1,11 @@ [drawingbuffer-hd-dpi-test.html] type: testharness - expected: ERROR - [WebGL test #5: at (28, 12) expected: 0,255,0,255 was 0,0,0,0] + [WebGL test #12: at 0, 0 expected 0,0,0,255(black) was 0,255,0,255] expected: FAIL - [WebGL test #8: gl.getError() should be 0. Was 1280.] + [WebGL test #29: at 0, 0 expected 0,0,0,255(black) was 0,255,0,255] expected: FAIL - [WebGL test #12: at 0, 0 expected 0,0,0,255(black) was 0,0,0,0] - expected: FAIL - - [WebGL test #13: at (12, 28) expected: 0,255,0,255 was 0,0,0,0] - expected: FAIL - - [WebGL test #16: gl.getError() should be 0. Was 1280.] - expected: FAIL - - [WebGL test #22: at (124, 60) expected: 0,255,0,255 was 0,0,0,0] - expected: FAIL - - [WebGL test #25: gl.getError() should be 0. Was 1280.] - expected: FAIL - - [WebGL test #29: at 0, 0 expected 0,0,0,255(black) was 0,0,0,0] - expected: FAIL - - [WebGL test #30: at (60, 124) expected: 0,255,0,255 was 0,0,0,0] - expected: FAIL - - [WebGL test #33: gl.getError() should be 0. Was 1280.] - expected: FAIL - - [WebGL test #39: at (252, 508) expected: 0,255,0,255 was 0,0,0,0] - expected: FAIL - - [WebGL test #42: gl.getError() should be 0. Was 1280.] - expected: FAIL - - [WebGL test #46: at 0, 0 expected 0,0,0,255(black) was 0,0,0,0] - expected: FAIL - - [WebGL test #47: at (508, 252) expected: 0,255,0,255 was 0,0,0,0] - expected: FAIL - - [WebGL test #50: gl.getError() should be 0. Was 1280.] - expected: FAIL - - [WebGL test #5: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] + [WebGL test #46: at 0, 0 expected 0,0,0,255(black) was 0,255,0,255] expected: FAIL |