Implement missing WebGLShader checks

Methods compileShader and getShaderParameter should emit an error when
the shader has been deleted.

components/script/dom/webglrenderingcontext.rs

@@ -1966,7 +1966,10 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9
     fn CompileShader(&self, shader: &WebGLShader) {
+        handle_potential_webgl_error!(
+            self,
             shader.compile(self.webgl_version, self.glsl_version, &self.extension_manager)
+        )
     }
 
     // TODO(emilio): Probably in the future we should keep track of the

components/script/dom/webglshader.rs

@@ -3,8 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://www.khronos.org/registry/webgl/specs/latest/1.0/webgl.idl
-use canvas_traits::webgl::{WebGLSLVersion, WebGLVersion};
-use canvas_traits::webgl::{webgl_channel, WebGLCommand, WebGLMsgSender, WebGLParameter, WebGLResult, WebGLShaderId};
+use canvas_traits::webgl::{WebGLCommand, WebGLError, WebGLMsgSender};
+use canvas_traits::webgl::{WebGLParameter, WebGLResult, WebGLSLVersion};
+use canvas_traits::webgl::{WebGLShaderId, WebGLVersion, webgl_channel};
 use dom::bindings::cell::DomRefCell;
 use dom::bindings::codegen::Bindings::WebGLShaderBinding;
 use dom::bindings::reflector::reflect_dom_object;
@@ -98,13 +99,21 @@ impl WebGLShader {
         &self,
         webgl_version: WebGLVersion,
         glsl_version: WebGLSLVersion,
-        ext: &WebGLExtensions
-    ) {
+        ext: &WebGLExtensions,
+    ) -> WebGLResult<()> {
+        if self.is_deleted.get() && !self.is_attached() {
+            return Err(WebGLError::InvalidValue);
+        }
         if self.compilation_status.get() != ShaderCompilationStatus::NotCompiled {
             debug!("Compiling already compiled shader {}", self.id);
         }
 
-        if let Some(ref source) = *self.source.borrow() {
+        let source = self.source.borrow();
+        let source = match source.as_ref() {
+            Some(source) => source,
+            None => return Ok(()),
+        };
+
         let mut params = BuiltInResources::default();
         params.FragmentPrecisionHigh = 1;
         params.OES_standard_derivatives = ext.is_enabled::<OESStandardDerivatives>() as i32;
@@ -160,12 +169,13 @@ impl WebGLShader {
         }
 
         *self.info_log.borrow_mut() = Some(validator.info_log());
+
         // TODO(emilio): More data (like uniform data) should be collected
         // here to properly validate uniforms.
         //
         // This requires a more complex interface with ANGLE, using C++
         // bindings and being extremely cautious about destructing things.
-        }
+        Ok(())
     }
 
     /// Mark this shader as deleted (if it wasn't previously)
@@ -202,6 +212,9 @@ impl WebGLShader {
 
     /// glGetParameter
     pub fn parameter(&self, param_id: u32) -> WebGLResult<WebGLParameter> {
+        if self.is_deleted.get() && !self.is_attached() {
+            return Err(WebGLError::InvalidValue);
+        }
         let (sender, receiver) = webgl_channel().unwrap();
         self.renderer.send(WebGLCommand::GetShaderParameter(self.id, param_id, sender)).unwrap();
         receiver.recv().unwrap()

tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/programs/program-test.html.ini

@@ -1,2 +1,19 @@
 [program-test.html]
-  expected: CRASH
+  [WebGL test #53: getError expected: INVALID_OPERATION. Was NO_ERROR : drawing with a null program should generate INVALID_OPERATION]
+    expected: FAIL
+
+  [WebGL test #58: linking should fail with in-use formerly good program, with new bad shader attached]
+    expected: FAIL
+
+  [WebGL test #64: getError expected: NO_ERROR. Was INVALID_OPERATION : delete the current program shouldn't change the current rendering state]
+    expected: FAIL
+
+  [WebGL test #65: getError expected: NO_ERROR. Was INVALID_OPERATION : The current program shouldn't be deleted]
+    expected: FAIL
+
+  [WebGL test #69: an attached shader shouldn't be deleted]
+    expected: FAIL
+
+  [WebGL test #70: getError expected: INVALID_VALUE. Was INVALID_OPERATION : a delete-marked program should be deleted once it's no longer the current program]
+    expected: FAIL
+