Bug 1301671 - Roll back non-nullable check for getAttachedShaders in tests. a=gchang
authorJeff Gilbert (:jgilbert) <jgilbert@mozilla.com>
Wed, 16 Nov 2016 19:42:57 -0800
changeset 352947 eb32710bb76a77aaf7951e8d6d3c990e4c92904b
parent 352946 57792070436ea7a032ca062a4deb326278287aa0
child 352948 3bcabc44afd09ffe1b19df9bb1fa5625aabc0376
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgchang
bugs1301671
milestone52.0a2
Bug 1301671 - Roll back non-nullable check for getAttachedShaders in tests. a=gchang MozReview-Commit-ID: 7rijDHSi2JW
dom/canvas/test/webgl-conf/checkout/js/tests/gl-object-get-calls.js
--- a/dom/canvas/test/webgl-conf/checkout/js/tests/gl-object-get-calls.js
+++ b/dom/canvas/test/webgl-conf/checkout/js/tests/gl-object-get-calls.js
@@ -310,18 +310,18 @@ var standardFrag = wtu.loadStandardFragm
 var standardProgram = gl.createProgram();
 gl.attachShader(standardProgram, standardVert);
 gl.attachShader(standardProgram, standardFrag);
 gl.linkProgram(standardProgram);
 var shaders = gl.getAttachedShaders(standardProgram);
 shouldBe('shaders.length', '2');
 shouldBeTrue('shaders[0] == standardVert && shaders[1] == standardFrag || shaders[1] == standardVert && shaders[0] == standardFrag');
 wtu.glErrorShouldBe(gl, gl.NO_ERROR);
-shouldThrow('gl.getAttachedShaders(null)');
-wtu.glErrorShouldBe(gl, gl.NO_ERROR);
+gl.getAttachedShaders(null);
+wtu.glErrorShouldBe(gl, gl.INVALID_VALUE);
 shouldThrow('gl.getAttachedShaders(standardVert)');
 wtu.glErrorShouldBe(gl, gl.NO_ERROR);
 
 debug("");
 debug("Test getProgramParameter");
 shouldBe('gl.getProgramParameter(standardProgram, gl.DELETE_STATUS)', 'false');
 shouldBe('gl.getProgramParameter(standardProgram, gl.LINK_STATUS)', 'true');
 shouldBe('typeof gl.getProgramParameter(standardProgram, gl.VALIDATE_STATUS)', '"boolean"');