Bug 1301671 - Roll back non-nullable check for getAttachedShaders in tests.
authorJeff Gilbert (:jgilbert) <jgilbert@mozilla.com>
Wed, 16 Nov 2016 19:42:57 -0800
changeset 896435 d8a2741ec211d153f174dc5c0686762ebe2a8a2f
parent 896434 776fd54ff6d29c45d7ee890a57204770fec99144
child 896436 3891a7e1ba76804e173e112a6f024ff7254e3444
push id155501
push userashiue@mozilla.com
push dateFri, 18 Nov 2016 03:26:06 +0000
treeherdertry@c775a1cfc96e [default view] [failures only]
bugs1301671
milestone53.0a1
Bug 1301671 - Roll back non-nullable check for getAttachedShaders in tests. 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"');