Auto merge of #21284 - servo:webgl, r=emilio

Various fixes for the lifecycle of WebGL objects  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21284)
author: bors-servo <lbergstrom+bors@mozilla.com> 2018-07-31 05:14:24 -0400
committer: GitHub <noreply@github.com> 2018-07-31 05:14:24 -0400
commit: 6e7f7fc8eba432ca5f34c55f668fd7968263f52d (patch)
tree: 2fbd1119f009e202abdcf0cd830f1cc08bd639ad
parent: b8b691d0630674c9f907cba4845d8bd76b8ceb79 (diff)
parent: 34d1195af305bd2c1015a84fab9d71ee8cd0155c (diff)
download: servo-6e7f7fc8eba432ca5f34c55f668fd7968263f52d.tar.gz
servo-6e7f7fc8eba432ca5f34c55f668fd7968263f52d.zip
63 files changed, 196 insertions, 629 deletions
diff --git a/components/canvas/webgl_thread.rs b/components/canvas/webgl_thread.rs
index 294afbcf226..c311868e923 100644
--- a/components/canvas/webgl_thread.rs
+++ b/components/canvas/webgl_thread.rs
@@ -932,20 +932,6 @@ impl WebGLImpl {
                 }
                 sender.send(value[0]).unwrap()
             }
-            WebGLCommand::GetShaderParameterBool(shader, param, ref sender) => {
-                let mut value = [0];
-                unsafe {
-                    ctx.gl().get_shader_iv(shader.get(), param as u32, &mut value);
-                }
-                sender.send(value[0] != 0).unwrap()
-            }
-            WebGLCommand::GetShaderParameterInt(shader, param, ref sender) => {
-                let mut value = [0];
-                unsafe {
-                    ctx.gl().get_shader_iv(shader.get(), param as u32, &mut value);
-                }
-                sender.send(value[0]).unwrap()
-            }
             WebGLCommand::GetCurrentVertexAttrib(index, ref sender) => {
                 let mut value = [0.; 4];
                 unsafe {
diff --git a/components/canvas_traits/webgl.rs b/components/canvas_traits/webgl.rs
index 0b88fcfec99..007f381354d 100644
--- a/components/canvas_traits/webgl.rs
+++ b/components/canvas_traits/webgl.rs
@@ -273,8 +273,6 @@ pub enum WebGLCommand {
     GetParameterFloat4(ParameterFloat4, WebGLSender<[f32; 4]>),
     GetProgramValidateStatus(WebGLProgramId, WebGLSender<bool>),
     GetProgramActiveUniforms(WebGLProgramId, WebGLSender<i32>),
-    GetShaderParameterBool(WebGLShaderId, ShaderParameterBool, WebGLSender<bool>),
-    GetShaderParameterInt(WebGLShaderId, ShaderParameterInt, WebGLSender<i32>),
     GetCurrentVertexAttrib(u32, WebGLSender<[f32; 4]>),
     GetTexParameterFloat(u32, TexParameterFloat, WebGLSender<f32>),
     GetTexParameterInt(u32, TexParameterInt, WebGLSender<i32>),
@@ -584,18 +582,6 @@ parameters! {
 }
 
 parameters! {
-    ShaderParameter {
-        Bool(ShaderParameterBool {
-            DeleteStatus = gl::DELETE_STATUS,
-            CompileStatus = gl::COMPILE_STATUS,
-        }),
-        Int(ShaderParameterInt {
-            ShaderType = gl::SHADER_TYPE,
-        }),
-    }
-}
-
-parameters! {
     TexParameter {
         Float(TexParameterFloat {
             TextureMaxAnisotropyExt = gl::TEXTURE_MAX_ANISOTROPY_EXT,
diff --git a/components/script/dom/webglprogram.rs b/components/script/dom/webglprogram.rs
index 075672c8107..4fb1147e042 100644
--- a/components/script/dom/webglprogram.rs
+++ b/components/script/dom/webglprogram.rs
@@ -25,7 +25,8 @@ use std::cell::{Cell, Ref};
 pub struct WebGLProgram {
     webgl_object: WebGLObject,
     id: WebGLProgramId,
-    is_deleted: Cell<bool>,
+    is_in_use: Cell<bool>,
+    marked_for_deletion: Cell<bool>,
     link_called: Cell<bool>,
     linked: Cell<bool>,
     link_generation: Cell<u64>,
@@ -40,9 +41,10 @@ impl WebGLProgram {
         Self {
             webgl_object: WebGLObject::new_inherited(context),
             id: id,
-            is_deleted: Cell::new(false),
-            link_called: Cell::new(false),
-            linked: Cell::new(false),
+            is_in_use: Default::default(),
+            marked_for_deletion: Default::default(),
+            link_called: Default::default(),
+            linked: Default::default(),
             link_generation: Default::default(),
             fragment_shader: Default::default(),
             vertex_shader: Default::default(),
@@ -73,25 +75,51 @@ impl WebGLProgram {
     }
 
     /// glDeleteProgram
-    pub fn delete(&self) {
-        if !self.is_deleted.get() {
-            self.is_deleted.set(true);
-            self.upcast::<WebGLObject>()
-                .context()
-                .send_command(WebGLCommand::DeleteProgram(self.id));
-
-            if let Some(shader) = self.fragment_shader.get() {
-                shader.decrement_attached_counter();
-            }
+    pub fn mark_for_deletion(&self) {
+        if self.marked_for_deletion.get() {
+            return;
+        }
+        self.marked_for_deletion.set(true);
+        self.upcast::<WebGLObject>()
+            .context()
+            .send_command(WebGLCommand::DeleteProgram(self.id));
+        if self.is_deleted() {
+            self.detach_shaders();
+        }
+    }
 
-            if let Some(shader) = self.vertex_shader.get() {
-                shader.decrement_attached_counter();
-            }
+    pub fn in_use(&self, value: bool) {
+        if self.is_in_use.get() == value {
+            return;
+        }
+        self.is_in_use.set(value);
+        if self.is_deleted() {
+            self.detach_shaders();
         }
     }
 
+    fn detach_shaders(&self) {
+        assert!(self.is_deleted());
+        if let Some(shader) = self.fragment_shader.get() {
+            shader.decrement_attached_counter();
+            self.fragment_shader.set(None);
+        }
+        if let Some(shader) = self.vertex_shader.get() {
+            shader.decrement_attached_counter();
+            self.vertex_shader.set(None);
+        }
+    }
+
+    pub fn is_in_use(&self) -> bool {
+        self.is_in_use.get()
+    }
+
+    pub fn is_marked_for_deletion(&self) -> bool {
+        self.marked_for_deletion.get()
+    }
+
     pub fn is_deleted(&self) -> bool {
-        self.is_deleted.get()
+        self.marked_for_deletion.get() && !self.is_in_use.get()
     }
 
     pub fn is_linked(&self) -> bool {
@@ -99,10 +127,7 @@ impl WebGLProgram {
     }
 
     /// glLinkProgram
-    pub fn link(&self) -> WebGLResult<()>  {
-        if self.is_deleted() {
-            return Err(WebGLError::InvalidOperation);
-        }
+    pub fn link(&self) -> WebGLResult<()> {
         self.linked.set(false);
         self.link_generation.set(self.link_generation.get().checked_add(1).unwrap());
         *self.active_attribs.borrow_mut() = Box::new([]);
@@ -192,8 +217,6 @@ impl WebGLProgram {
             }
         };
 
-        // TODO(emilio): Differentiate between same shader already assigned and other previous
-        // shader.
         if shader_slot.get().is_some() {
             return Err(WebGLError::InvalidOperation);
         }
@@ -216,10 +239,7 @@ impl WebGLProgram {
         let shader_slot = match shader.gl_type() {
             constants::FRAGMENT_SHADER => &self.fragment_shader,
             constants::VERTEX_SHADER => &self.vertex_shader,
-            _ => {
-                error!("detachShader: Unexpected shader type");
-                return Err(WebGLError::InvalidValue);
-            }
+            _ => return Err(WebGLError::InvalidValue),
         };
 
         match shader_slot.get() {
@@ -391,7 +411,7 @@ impl WebGLProgram {
     }
 
     pub fn attached_shaders(&self) -> WebGLResult<Vec<DomRoot<WebGLShader>>> {
-        if self.is_deleted.get() {
+        if self.marked_for_deletion.get() {
             return Err(WebGLError::InvalidValue);
         }
         Ok(match (self.vertex_shader.get(), self.fragment_shader.get()) {
@@ -410,7 +430,8 @@ impl WebGLProgram {
 
 impl Drop for WebGLProgram {
     fn drop(&mut self) {
-        self.delete();
+        self.in_use(false);
+        self.mark_for_deletion();
     }
 }
 
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 78dde389f04..ec0d5238555 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -5,8 +5,7 @@
 use byteorder::{NativeEndian, ReadBytesExt, WriteBytesExt};
 use canvas_traits::canvas::{byte_swap, multiply_u8_pixel};
 use canvas_traits::webgl::{ActiveAttribInfo, DOMToTextureCommand, Parameter};
-use canvas_traits::webgl::{ShaderParameter, TexParameter, WebGLCommand};
-use canvas_traits::webgl::{WebGLContextShareMode, WebGLError};
+use canvas_traits::webgl::{TexParameter, WebGLCommand, WebGLContextShareMode, WebGLError};
 use canvas_traits::webgl::{WebGLFramebufferBindingRequest, WebGLMsg, WebGLMsgSender};
 use canvas_traits::webgl::{WebGLProgramId, WebGLResult, WebGLSLVersion, WebGLSender};
 use canvas_traits::webgl::{WebGLVersion, WebVRCommand, webgl_channel};
@@ -2354,11 +2353,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     fn DeleteProgram(&self, program: Option<&WebGLProgram>) {
         if let Some(program) = program {
             handle_potential_webgl_error!(self, self.validate_ownership(program), return);
-            // FIXME: We should call glUseProgram(0), but
-            // WebGLCommand::UseProgram() doesn't take an Option
-            // currently.  This is also a problem for useProgram(null)
-            handle_object_deletion!(self, self.current_program, program, None);
-            program.delete()
+            program.mark_for_deletion()
         }
     }
 
@@ -2366,7 +2361,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     fn DeleteShader(&self, shader: Option<&WebGLShader>) {
         if let Some(shader) = shader {
             handle_potential_webgl_error!(self, self.validate_ownership(shader), return);
-            shader.delete()
+            shader.mark_for_deletion()
         }
     }
 
@@ -2700,8 +2695,12 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9
     unsafe fn GetProgramParameter(&self, _: *mut JSContext, program: &WebGLProgram, param: u32) -> JSVal {
         handle_potential_webgl_error!(self, self.validate_ownership(program), return NullValue());
+        if program.is_deleted() {
+            self.webgl_error(InvalidOperation);
+            return NullValue();
+        }
         match param {
-            constants::DELETE_STATUS => BooleanValue(program.is_deleted()),
+            constants::DELETE_STATUS => BooleanValue(program.is_marked_for_deletion()),
             constants::LINK_STATUS => BooleanValue(program.is_linked()),
             constants::VALIDATE_STATUS => {
                 // FIXME(nox): This could be cached on the DOM side when we call validateProgram
@@ -2733,20 +2732,17 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9
     unsafe fn GetShaderParameter(&self, _: *mut JSContext, shader: &WebGLShader, param: u32) -> JSVal {
         handle_potential_webgl_error!(self, self.validate_ownership(shader), return NullValue());
-        if shader.is_deleted() && !shader.is_attached() {
+        if shader.is_deleted() {
             self.webgl_error(InvalidValue);
             return NullValue();
         }
-        match handle_potential_webgl_error!(self, ShaderParameter::from_u32(param), return NullValue()) {
-            ShaderParameter::Bool(param) => {
-                let (sender, receiver) = webgl_channel().unwrap();
-                self.send_command(WebGLCommand::GetShaderParameterBool(shader.id(), param, sender));
-                BooleanValue(receiver.recv().unwrap())
-            }
-            ShaderParameter::Int(param) => {
-                let (sender, receiver) = webgl_channel().unwrap();
-                self.send_command(WebGLCommand::GetShaderParameterInt(shader.id(), param, sender));
-                Int32Value(receiver.recv().unwrap())
+        match param {
+            constants::DELETE_STATUS => BooleanValue(shader.is_marked_for_deletion()),
+            constants::COMPILE_STATUS => BooleanValue(shader.successfully_compiled()),
+            constants::SHADER_TYPE => UInt32Value(shader.gl_type()),
+            _ => {
+                self.webgl_error(InvalidEnum);
+                NullValue()
             }
         }
     }
@@ -2878,7 +2874,9 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5
     fn IsBuffer(&self, buffer: Option<&WebGLBuffer>) -> bool {
-        buffer.map_or(false, |buf| buf.target().is_some() && !buf.is_deleted())
+        buffer.map_or(false, |buf| {
+            self.validate_ownership(buf).is_ok() && buf.target().is_some() && !buf.is_deleted()
+        })
     }
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3
@@ -2888,27 +2886,33 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.6
     fn IsFramebuffer(&self, frame_buffer: Option<&WebGLFramebuffer>) -> bool {
-        frame_buffer.map_or(false, |buf| buf.target().is_some() && !buf.is_deleted())
+        frame_buffer.map_or(false, |buf| {
+            self.validate_ownership(buf).is_ok() && buf.target().is_some() && !buf.is_deleted()
+        })
     }
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9
     fn IsProgram(&self, program: Option<&WebGLProgram>) -> bool {
-        program.map_or(false, |p| !p.is_deleted())
+        program.map_or(false, |p| self.validate_ownership(p).is_ok() && !p.is_deleted())
     }
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.7
     fn IsRenderbuffer(&self, render_buffer: Option<&WebGLRenderbuffer>) -> bool {
-        render_buffer.map_or(false, |buf| buf.ever_bound() && !buf.is_deleted())
+        render_buffer.map_or(false, |buf| {
+            self.validate_ownership(buf).is_ok() && buf.ever_bound() && !buf.is_deleted()
+        })
     }
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9
     fn IsShader(&self, shader: Option<&WebGLShader>) -> bool {
-        shader.map_or(false, |s| !s.is_deleted() || s.is_attached())
+        shader.map_or(false, |s| self.validate_ownership(s).is_ok() && !s.is_deleted())
     }
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.8
     fn IsTexture(&self, texture: Option<&WebGLTexture>) -> bool {
-        texture.map_or(false, |tex| tex.target().is_some() && !tex.is_deleted())
+        texture.map_or(false, |tex| {
+            self.validate_ownership(tex).is_ok() && tex.target().is_some() && !tex.is_deleted()
+        })
     }
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3
@@ -3166,6 +3170,9 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9
     fn LinkProgram(&self, program: &WebGLProgram) {
         handle_potential_webgl_error!(self, self.validate_ownership(program), return);
+        if program.is_deleted() {
+            return self.webgl_error(InvalidValue);
+        }
         handle_potential_webgl_error!(self, program.link());
     }
 
@@ -3721,6 +3728,14 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
             if program.is_deleted() || !program.is_linked() {
                 return self.webgl_error(InvalidOperation);
             }
+            if program.is_in_use() {
+                return;
+            }
+            program.in_use(true);
+        }
+        match self.current_program.get() {
+            Some(ref current) if program != Some(&**current) => current.in_use(false),
+            _ => {}
         }
         self.send_command(WebGLCommand::UseProgram(program.map(|p| p.id())));
         self.current_program.set(program);
diff --git a/components/script/dom/webglshader.rs b/components/script/dom/webglshader.rs
index bac2f65d1e1..c3ca74fde1f 100644
--- a/components/script/dom/webglshader.rs
+++ b/components/script/dom/webglshader.rs
@@ -38,7 +38,7 @@ pub struct WebGLShader {
     gl_type: u32,
     source: DomRefCell<DOMString>,
     info_log: DomRefCell<DOMString>,
-    is_deleted: Cell<bool>,
+    marked_for_deletion: Cell<bool>,
     attached_counter: Cell<u32>,
     compilation_status: Cell<ShaderCompilationStatus>,
 }
@@ -58,7 +58,7 @@ impl WebGLShader {
             gl_type: shader_type,
             source: Default::default(),
             info_log: Default::default(),
-            is_deleted: Cell::new(false),
+            marked_for_deletion: Cell::new(false),
             attached_counter: Cell::new(0),
             compilation_status: Cell::new(ShaderCompilationStatus::NotCompiled),
         }
@@ -101,7 +101,7 @@ impl WebGLShader {
         limits: &GLLimits,
         ext: &WebGLExtensions,
     ) -> WebGLResult<()> {
-        if self.is_deleted.get() && !self.is_attached() {
+        if self.marked_for_deletion.get() && !self.is_attached() {
             return Err(WebGLError::InvalidValue);
         }
         if self.compilation_status.get() != ShaderCompilationStatus::NotCompiled {
@@ -177,28 +177,27 @@ impl WebGLShader {
 
         *self.info_log.borrow_mut() = validator.info_log().into();
 
-        // 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)
     /// and delete it as if calling glDeleteShader.
     /// Currently does not check if shader is attached
-    pub fn delete(&self) {
-        if !self.is_deleted.get() {
-            self.is_deleted.set(true);
+    pub fn mark_for_deletion(&self) {
+        if !self.marked_for_deletion.get() {
+            self.marked_for_deletion.set(true);
             self.upcast::<WebGLObject>()
                 .context()
                 .send_command(WebGLCommand::DeleteShader(self.id));
         }
     }
 
+    pub fn is_marked_for_deletion(&self) -> bool {
+        self.marked_for_deletion.get()
+    }
+
     pub fn is_deleted(&self) -> bool {
-        self.is_deleted.get()
+        self.marked_for_deletion.get() && !self.is_attached()
     }
 
     pub fn is_attached(&self) -> bool {
@@ -236,7 +235,6 @@ impl WebGLShader {
 
 impl Drop for WebGLShader {
     fn drop(&mut self) {
-        assert_eq!(self.attached_counter.get(), 0);
-        self.delete();
+        self.mark_for_deletion();
     }
 }
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 1204c6d188f..b1e2ab29322 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -39663,19 +39663,25 @@
    "webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html": [
     [
      "/_mozilla/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webgl/conformance-1.0.3/conformance/context/context-creation.html": [
     [
      "/_mozilla/webgl/conformance-1.0.3/conformance/context/context-creation.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html": [
     [
      "/_mozilla/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webgl/conformance-1.0.3/conformance/context/context-hidden-alpha.html": [
@@ -41919,7 +41925,9 @@
    "webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html": [
     [
      "/_mozilla/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webgl/conformance-1.0.3/conformance/ogles/GL/all/all_001_to_004.html": [
@@ -41943,7 +41951,9 @@
    "webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html": [
     [
      "/_mozilla/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webgl/conformance-1.0.3/conformance/ogles/GL/atan/atan_001_to_008.html": [
@@ -42399,7 +42409,9 @@
    "webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html": [
     [
      "/_mozilla/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_009_to_012.html": [
@@ -42939,7 +42951,9 @@
    "webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html": [
     [
      "/_mozilla/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webgl/conformance-1.0.3/conformance/rendering/more-than-65536-indices.html": [
@@ -71412,15 +71426,15 @@
    "testharness"
   ],
   "webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html": [
-   "6e329116409fae60838c3d4e63f84999b06cf1b5",
+   "1e2f82c2d11385b6549af174e4bcfe3399bdfbf4",
    "testharness"
   ],
   "webgl/conformance-1.0.3/conformance/context/context-creation.html": [
-   "2a6ebdcb04a602ae7b73a7a0385533f72c89c212",
+   "3443e38ef598fea1d78a5eb1c7ee63daf4de23e0",
    "testharness"
   ],
   "webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html": [
-   "9eac94ca3bc359985efc1ac0e7e7c37ec2599278",
+   "c1300e9bcb26729faf65393d83541cb01fc08205",
    "testharness"
   ],
   "webgl/conformance-1.0.3/conformance/context/context-hidden-alpha.html": [
@@ -73112,7 +73126,7 @@
    "support"
   ],
   "webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html": [
-   "85555ba68d88a743a41b691e864f5e2305c03bc3",
+   "2d9c0b4a7a750b9e12c0e17bf4492da1d5f0768f",
    "testharness"
   ],
   "webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_float_frag_xvary.frag": [
@@ -73280,7 +73294,7 @@
    "support"
   ],
   "webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html": [
-   "5ddd8eac037ae86a0f82aaebcd05f1702b4598ce",
+   "5ee97ea5fe44026d9ff65c37f3b56cb322fa2441",
    "testharness"
   ],
   "webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_float_frag_xvary.frag": [
@@ -76444,7 +76458,7 @@
    "support"
   ],
   "webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html": [
-   "cadfc9c0ab49a1de7ee8ef91c49c20da40b405b4",
+   "2434d881b2ba6c153c45d5862da70e760dae4e44",
    "testharness"
   ],
   "webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_009_to_012.html": [
@@ -79868,7 +79882,7 @@
    "testharness"
   ],
   "webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html": [
-   "8741d2e2bfb2da2adecfd0067bc0df4eebdb369e",
+   "3ce5f470ddef3d5b56dba9b58ffc5096496b747a",
    "testharness"
   ],
   "webgl/conformance-1.0.3/conformance/rendering/more-than-65536-indices.html": [
@@ -99164,7 +99178,7 @@
    "support"
   ],
   "webgl/tools/timeout.patch": [
-   "88da623430c6ab2c3738433604a5077a24a7a7a0",
+   "ab9852e736bf43a9b7dbe312012ca09396a8626b",
    "support"
   ],
   "webgl/tools/unit.patch": [
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/buffer-offscreen-test.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/buffer-offscreen-test.html.ini
index a6953f5c130..3f0f3fd2bdf 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/buffer-offscreen-test.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/buffer-offscreen-test.html.ini
@@ -1,4 +1,5 @@
 [buffer-offscreen-test.html]
+  bug: https://github.com/servo/servo/issues/21132
   type: testharness
   [WebGL test #5: at (0, 0) expected: 0,0,0,0 was 255,0,0,255]
     expected: FAIL
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/buffer-preserve-test.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/buffer-preserve-test.html.ini
index bc9baa5e766..f62c123292a 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/buffer-preserve-test.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/buffer-preserve-test.html.ini
@@ -1,4 +1,5 @@
 [buffer-preserve-test.html]
+  bug: https://github.com/servo/servo/issues/21132
   type: testharness
   [WebGL test #3: at (0, 0) expected: 0,0,0,0 was 255,0,0,255]
     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
deleted file mode 100644
index d1a71e871ac..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/drawingbuffer-hd-dpi-test.html.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[drawingbuffer-hd-dpi-test.html]
-  type: testharness
-  [WebGL test #12: at 0, 0 expected 0,0,0,255(black) was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #29: at 0, 0 expected 0,0,0,255(black) was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #46: at 0, 0 expected 0,0,0,255(black) was 0,255,0,255]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/texture-bindings-unaffected-on-resize.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/texture-bindings-unaffected-on-resize.html.ini
deleted file mode 100644
index a85898afcba..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/texture-bindings-unaffected-on-resize.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[texture-bindings-unaffected-on-resize.html]
-  type: testharness
-  [WebGL test #3: at (0, 0) expected: 0,255,0,255 was 0,0,0,255]
-    expected: FAIL
-
-  [WebGL test #5: at (0, 0) expected: 0,255,0,255 was 0,0,0,255]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/viewport-unchanged-upon-resize.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/viewport-unchanged-upon-resize.html.ini
index c981b9989e3..ca9dd90cc48 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/viewport-unchanged-upon-resize.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/viewport-unchanged-upon-resize.html.ini
@@ -1,14 +1,5 @@
 [viewport-unchanged-upon-resize.html]
   type: testharness
-  [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
-    expected: FAIL
-
-  [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
-    expected: FAIL
-
-  [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
-    expected: FAIL
-
   [WebGL test #3: at (6, 6) expected: 0,0,255,255 was 255,0,0,255]
     expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-attribute-preserve-drawing-buffer.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-attribute-preserve-drawing-buffer.html.ini
index 3c499fa1374..18cb75d37cc 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-attribute-preserve-drawing-buffer.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-attribute-preserve-drawing-buffer.html.ini
@@ -1,4 +1,5 @@
 [context-attribute-preserve-drawing-buffer.html]
+  bug: https://github.com/servo/servo/issues/21132
   type: testharness
   expected: ERROR
   [Overall test]
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-attributes-alpha-depth-stencil-antialias.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-attributes-alpha-depth-stencil-antialias.html.ini
index 93d9b197860..7752255f254 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-attributes-alpha-depth-stencil-antialias.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-attributes-alpha-depth-stencil-antialias.html.ini
@@ -1,4 +1,5 @@
 [context-attributes-alpha-depth-stencil-antialias.html]
+  bug: https://github.com/servo/servo/issues/21285
   type: testharness
   [WebGL test #96: redChannels[0\] != 255 && redChannels[0\] != 0 should be true. Was false.]
     expected: FAIL
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html.ini
deleted file mode 100644
index fbdc89a8f0d..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[context-creation-and-destruction.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation.html.ini
deleted file mode 100644
index 393e42df192..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[context-creation.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html.ini
deleted file mode 100644
index b2918fac56f..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[context-eviction-with-garbage-collection.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-lost.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-lost.html.ini
index ca162c1a651..0b2ab4ba9fb 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-lost.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-lost.html.ini
@@ -1,4 +1,5 @@
 [context-lost.html]
+  bug: https://github.com/servo/servo/issues/15266
   type: testharness
   [WebGL test #0: gl.isContextLost() should be false. Threw exception TypeError: gl.isContextLost is not a function]
     expected: FAIL
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/methods.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/methods.html.ini
index 44c46a26ede..3869ed06101 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/methods.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/methods.html.ini
@@ -1,4 +1,5 @@
 [methods.html]
+  bug: https://github.com/servo/servo/issues/15266
   [WebGL test #0: Property either does not exist or is not a function: isContextLost]
     expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/premultiplyalpha-test.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/premultiplyalpha-test.html.ini
index 3960c11d991..bbb8ef50003 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/premultiplyalpha-test.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/premultiplyalpha-test.html.ini
@@ -1,4 +1,5 @@
 [premultiplyalpha-test.html]
+  bug: https://github.com/servo/servo/issues/21132
   type: testharness
   expected: ERROR
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/glsl-long-variable-names.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/glsl-long-variable-names.html.ini
deleted file mode 100644
index acd2abb0aea..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/glsl-long-variable-names.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[glsl-long-variable-names.html]
-  type: testharness
-  disabled: flaky
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-varying-packing-restrictions.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-varying-packing-restrictions.html.ini
index 8d1f20d06c7..34ac3c0182c 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-varying-packing-restrictions.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-varying-packing-restrictions.html.ini
@@ -1,4 +1,5 @@
 [shader-varying-packing-restrictions.html]
+  bug: https://github.com/servo/servo/issues/20601
   [WebGL test #2: [unexpected link status\] shaders with varying array of float with 33 elements (one past maximum) accessing last element should fail]
     expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-define-line-continuation.frag.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-define-line-continuation.frag.html.ini
index 265cd287185..82784a41789 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-define-line-continuation.frag.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-define-line-continuation.frag.html.ini
@@ -1,4 +1,5 @@
 [shader-with-define-line-continuation.frag.html]
+  bug: https://github.com/servo/servo/issues/20601
   type: testharness
   [WebGL test #0: [unexpected link status\] fragment shader that uses line continuation macro should fail]
     expected: FAIL
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-global-variable-precision-mismatch.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-global-variable-precision-mismatch.html.ini
index 83a7b7d1052..ff4fa64687c 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-global-variable-precision-mismatch.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-global-variable-precision-mismatch.html.ini
@@ -1,4 +1,5 @@
 [shader-with-global-variable-precision-mismatch.html]
+  bug: https://github.com/servo/servo/issues/20601
   type: testharness
   [WebGL test #0: [unexpected link status\] mismatching precision for uniforms causes link error (as expected)]
     expected: FAIL
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-ivec3-return-value.frag.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-ivec3-return-value.frag.html.ini
deleted file mode 100644
index 10a3c10f046..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-ivec3-return-value.frag.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[shader-with-ivec3-return-value.frag.html]
-  type: testharness
-  [WebGL test #0: [unexpected fragment shader compile status\] (expected: true) Shader with ivec3 return value from function call should succeed]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-long-line.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-long-line.html.ini
deleted file mode 100644
index 70a8c89cdf4..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-long-line.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[shader-with-long-line.html]
-  type: testharness
-  [WebGL test #0: [unexpected vertex shader compile status\] (expected: true) shader that uses long lines should succeed]
-    expected: FAIL
-
-  [WebGL test #1: [link failed\] shader that uses long lines should succeed]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-too-many-uniforms.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-too-many-uniforms.html.ini
deleted file mode 100644
index c1102f44f37..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-too-many-uniforms.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[shader-with-too-many-uniforms.html]
-  type: testharness
-  [WebGL test #0: [link failed\] shader using all uniforms in vertex shader should succeed]
-    expected: FAIL
-
-  [WebGL test #1: [unexpected link status\] shader using too many uniforms in vertex shader should fail]
-    expected: FAIL
-
-  [WebGL test #2: [link failed\] shader using all uniforms in fragment shader should succeed]
-    expected: FAIL
-
-  [WebGL test #3: [unexpected link status\] shader using too many uniforms in fragment shader should fail]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-invariance.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-invariance.html.ini
index a53ccbab81b..81c5672ab91 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-invariance.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-invariance.html.ini
@@ -1,4 +1,5 @@
 [shaders-with-invariance.html]
+  bug: https://github.com/servo/servo/issues/20601
   type: testharness
   [WebGL test #0: [unexpected fragment shader compile status\] (expected: true) vertex shader with variant varying and fragment shader with invariant varying must fail]
     expected: FAIL
@@ -12,7 +13,7 @@
   [WebGL test #2: [unexpected fragment shader compile status\] (expected: true) vertex shader with variant varying and fragment shader with invariant (global setting) varying must fail]
     expected: FAIL
 
-  [WebGL test #9: [unexpected fragment shader compile status\] (expected: true) vertex shader with invariant varying and fragment shader with invariant (global setting) varying must succeed]
+  [WebGL test #9: [unexpected link status\] vertex shader with invariant varying and fragment shader with invariant (global setting) varying must succeed]
     expected: FAIL
 
   [WebGL test #11: [unexpected link status\] vertex shader with variant gl_Position and fragment shader with invariant gl_FragCoord must fail]
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-mis-matching-varyings.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-mis-matching-varyings.html.ini
deleted file mode 100644
index 6f64db53765..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-mis-matching-varyings.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[shaders-with-mis-matching-varyings.html]
-  type: testharness
-  [WebGL test #0: [unexpected vertex shader compile status\] (expected: true) vertex shader with varying float and fragment shader with varying vec2 with the same name should fail to link]
-    expected: FAIL
-
-  [WebGL test #2: [unexpected fragment shader compile status\] (expected: true) vertex shader with varying float and fragment shader with varying vec3 with the same name should fail to link]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-name-conflicts.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-name-conflicts.html.ini
deleted file mode 100644
index b0e52c7c56b..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-name-conflicts.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[shaders-with-name-conflicts.html]
-  type: testharness
-  [WebGL test #0: [unexpected link status\] shaders with conflicting uniform/attribute names should fail]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-uniform-structs.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-uniform-structs.html.ini
index 5e47ddeadae..48290ecd18b 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-uniform-structs.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-uniform-structs.html.ini
@@ -1,4 +1,5 @@
 [shaders-with-uniform-structs.html]
+  bug: https://github.com/servo/servo/issues/20601
   type: testharness
   [WebGL test #5: [unexpected link status\] Structures must have the same type definitions (including precision) to be considered the same type.]
     expected: FAIL
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-varyings.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-varyings.html.ini
index 7b3bb364a8a..0563bd133c0 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-varyings.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shaders-with-varyings.html.ini
@@ -1,4 +1,5 @@
 [shaders-with-varyings.html]
+  bug: https://github.com/servo/servo/issues/20601
   type: testharness
   [WebGL test #3: [unexpected link status\] vertex shader with unused varying and fragment shader with used varying must succeed]
     expected: FAIL
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/variables/glsl-built-ins.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/variables/glsl-built-ins.html.ini
deleted file mode 100644
index 8f0cb65f85a..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/variables/glsl-built-ins.html.ini
+++ /dev/null
@@ -1,43 +0,0 @@
-[glsl-built-ins.html]
-  [WebGL test #1: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #2: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #4: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #5: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #7: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #8: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #10: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #11: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #13: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #14: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #16: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #17: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #19: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #20: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/invalid-passed-params.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/invalid-passed-params.html.ini
index b5e607a5871..56d552a95b2 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/invalid-passed-params.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/invalid-passed-params.html.ini
@@ -1,4 +1,5 @@
 [invalid-passed-params.html]
+  bug: https://github.com/servo/servo/issues/21287
   type: testharness
   [WebGL test #44: context.getError() should be 1281. Was 0.]
     expected: FAIL
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/object-deletion-behaviour.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/object-deletion-behaviour.html.ini
deleted file mode 100644
index cc61b8d3fdd..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/object-deletion-behaviour.html.ini
+++ /dev/null
@@ -1,101 +0,0 @@
-[object-deletion-behaviour.html]
-  type: testharness
-  [WebGL test #17: gl.isProgram(program) should be true. Was false.]
-    expected: FAIL
-
-  [WebGL test #30: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) should be [object WebGLTexture\]. Threw exception TypeError: gl.getFramebufferAttachmentParameter is not a function]
-    expected: FAIL
-
-  [WebGL test #31: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE) should be 5890. Threw exception TypeError: gl.getFramebufferAttachmentParameter is not a function]
-    expected: FAIL
-
-  [WebGL test #33: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE) should be 0. Threw exception TypeError: gl.getFramebufferAttachmentParameter is not a function]
-    expected: FAIL
-
-  [WebGL test #34: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) threw exception TypeError: gl.getFramebufferAttachmentParameter is not a function]
-    expected: FAIL
-
-  [WebGL test #37: getError expected: NO_ERROR. Was INVALID_OPERATION : after evaluating: gl.bindTexture(gl.TEXTURE_2D, tex)]
-    expected: FAIL
-
-  [WebGL test #45: getError expected: NO_ERROR. Was INVALID_OPERATION : after evaluating: gl.bindTexture(gl.TEXTURE_CUBE_MAP, texCubeMap)]
-    expected: FAIL
-
-  [WebGL test #70: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) should be [object WebGLRenderbuffer\]. Threw exception TypeError: gl.getFramebufferAttachmentParameter is not a function]
-    expected: FAIL
-
-  [WebGL test #72: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE) should be 0. Threw exception TypeError: gl.getFramebufferAttachmentParameter is not a function]
-    expected: FAIL
-
-  [WebGL test #73: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) threw exception TypeError: gl.getFramebufferAttachmentParameter is not a function]
-    expected: FAIL
-
-  [WebGL test #51: getError expected: NO_ERROR. Was INVALID_OPERATION : after evaluating: gl.bindTexture(gl.TEXTURE_2D, t)]
-    expected: FAIL
-
-  [WebGL test #114: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) should be [object WebGLRenderbuffer\]. Threw exception TypeError: gl.getFramebufferAttachmentParameter is not a function]
-    expected: FAIL
-
-  [WebGL test #115: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.STENCIL_ATTACHMENT, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) should be [object WebGLRenderbuffer\]. Threw exception TypeError: gl.getFramebufferAttachmentParameter is not a function]
-    expected: FAIL
-
-  [WebGL test #118: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE) should be 0. Threw exception TypeError: gl.getFramebufferAttachmentParameter is not a function]
-    expected: FAIL
-
-  [WebGL test #119: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.STENCIL_ATTACHMENT, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE) should be 0. Threw exception TypeError: gl.getFramebufferAttachmentParameter is not a function]
-    expected: FAIL
-
-  [WebGL test #121: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) should be [object WebGLRenderbuffer\]. Threw exception TypeError: gl.getFramebufferAttachmentParameter is not a function]
-    expected: FAIL
-
-  [WebGL test #168: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) should be [object WebGLRenderbuffer\]. Threw exception TypeError: gl.getFramebufferAttachmentParameter is not a function]
-    expected: FAIL
-
-  [WebGL test #170: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) threw exception TypeError: gl.getFramebufferAttachmentParameter is not a function]
-    expected: FAIL
-
-  [WebGL test #171: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE) threw exception TypeError: gl.getFramebufferAttachmentParameter is not a function]
-    expected: FAIL
-
-  [WebGL test #196: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) should be [object WebGLTexture\]. Threw exception TypeError: gl.getFramebufferAttachmentParameter is not a function]
-    expected: FAIL
-
-  [WebGL test #198: gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) threw exception TypeError: gl.getFramebufferAttachmentParameter is not a function]
-    expected: FAIL
-
-  [WebGL test #210: gl.getParameter(gl.ARRAY_BUFFER_BINDING) should be null. Was [object WebGLBuffer\].]
-    expected: FAIL
-
-  [WebGL test #219: gl.getParameter(gl.ARRAY_BUFFER_BINDING) should be null. Was [object WebGLBuffer\].]
-    expected: FAIL
-
-  [WebGL test #227: gl.getParameter(gl.ELEMENT_ARRAY_BUFFER_BINDING) should be null. Was [object WebGLBuffer\].]
-    expected: FAIL
-
-  [WebGL test #244: gl.getVertexAttrib(1, gl.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING) should be [object WebGLBuffer\]. Was null.]
-    expected: FAIL
-
-  [WebGL test #245: gl.getVertexAttrib(2, gl.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING) should be [object WebGLBuffer\]. Was null.]
-    expected: FAIL
-
-  [WebGL test #246: gl.getVertexAttrib(3, gl.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING) should be [object WebGLBuffer\]. Was null.]
-    expected: FAIL
-
-  [WebGL test #247: getError expected: NO_ERROR. Was INVALID_ENUM : after evaluating: gl.deleteBuffer(b2);]
-    expected: FAIL
-
-  [WebGL test #248: gl.getVertexAttrib(1, gl.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING) should be [object WebGLBuffer\]. Was null.]
-    expected: FAIL
-
-  [WebGL test #251: getError expected: NO_ERROR. Was INVALID_ENUM : after evaluating: gl.deleteBuffer(b1);]
-    expected: FAIL
-
-  [WebGL test #253: getError expected: NO_ERROR. Was INVALID_ENUM : after evaluating: gl.bindFramebuffer(gl.FRAMEBUFFER, fbo)]
-    expected: FAIL
-
-  [WebGL test #258: getError expected: NO_ERROR. Was INVALID_OPERATION : after evaluating: gl.bindFramebuffer(gl.FRAMEBUFFER, fbo)]
-    expected: FAIL
-
-  [WebGL test #233: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.bufferData(gl.ARRAY_BUFFER, 1, gl.STATIC_DRAW)]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/type-conversion-test.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/type-conversion-test.html.ini
index b2775ef732b..ee430a66dcd 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/type-conversion-test.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/type-conversion-test.html.ini
@@ -1,4 +1,5 @@
 [type-conversion-test.html]
+  bug: https://github.com/servo/servo/issues/20513
   type: testharness
   [WebGL test #340: context.bufferData(context.ARRAY_BUFFER, argument, context.STATIC_DRAW) should be undefined. Threw exception TypeError: Not an ArrayBufferView]
     expected: FAIL
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/uninitialized-test.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/uninitialized-test.html.ini
index dfecd0e7fea..e2c703fa830 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/uninitialized-test.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/uninitialized-test.html.ini
@@ -1,6 +1,3 @@
 [uninitialized-test.html]
   type: testharness
   disabled: https://github.com/servo/servo/issues/13710
-  [WebGL test #1: 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/misc/webgl-specific.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/webgl-specific.html.ini
index d12ebf49573..b7ef8d94ad1 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/webgl-specific.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/misc/webgl-specific.html.ini
@@ -1,20 +1,26 @@
 [webgl-specific.html]
   type: testharness
   [WebGL test #21: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawArrays(gl.TRIANGLES, 0, 0)]
+    bug: https://github.com/servo/servo/issues/20555
     expected: FAIL
 
   [WebGL test #27: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawArrays(gl.TRIANGLES, 0, 0)]
+    bug: https://github.com/servo/servo/issues/20555
     expected: FAIL
 
   [WebGL test #31: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawArrays(gl.TRIANGLES, 0, 0)]
+    bug: https://github.com/servo/servo/issues/20555
     expected: FAIL
 
   [WebGL test #39: gl.getParameter(gl.UNPACK_COLORSPACE_CONVERSION_WEBGL) should be 37444 (of type number). Was null (of type object).]
+    bug: https://github.com/servo/servo/issues/20552
     expected: FAIL
 
   [WebGL test #40: gl.getParameter(gl.UNPACK_COLORSPACE_CONVERSION_WEBGL) should be 0 (of type number). Was null (of type object).]
+    bug: https://github.com/servo/servo/issues/20552
     expected: FAIL
 
   [WebGL test #41: getError expected: NO_ERROR. Was INVALID_ENUM : set/get UNPACK_COLORSPACE_CONVERSION_WEBGL should generate no error]
+    bug: https://github.com/servo/servo/issues/20552
     expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html.ini
deleted file mode 100644
index 86a561af11b..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[acos_001_to_006.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html.ini
deleted file mode 100644
index 2cd9fa6c511..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[asin_001_to_006.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log/log_001_to_008.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log/log_001_to_008.html.ini
deleted file mode 100644
index 0bcf8268f38..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log/log_001_to_008.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[log_001_to_008.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html.ini
deleted file mode 100644
index 579708b48b2..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[log2_001_to_008.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/programs/program-test.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/programs/program-test.html.ini
deleted file mode 100644
index 164f0e3c2a2..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/programs/program-test.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[program-test.html]
-  [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
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/renderbuffers/feedback-loop.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/renderbuffers/feedback-loop.html.ini
index 9d117696378..38e546a86c2 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/renderbuffers/feedback-loop.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/renderbuffers/feedback-loop.html.ini
@@ -1,4 +1,5 @@
 [feedback-loop.html]
+  bug: https://github.com/servo/servo/issues/21288
   type: testharness
   [WebGL test #3: getError expected: INVALID_OPERATION. Was NO_ERROR : after draw with invalid feedback loop]
     expected: FAIL
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/framebuffer-switch.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/framebuffer-switch.html.ini
index b0baea6f6b0..caf83d8f27c 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/framebuffer-switch.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/framebuffer-switch.html.ini
@@ -1,9 +1,6 @@
 [framebuffer-switch.html]
   type: testharness
   expected: ERROR
-  [WebGL framebuffer switching conformance test.]
-    expected: FAIL
-
   [Overall test]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/framebuffer-texture-switch.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/framebuffer-texture-switch.html.ini
index af5245bcb8e..225cad06f3b 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/framebuffer-texture-switch.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/framebuffer-texture-switch.html.ini
@@ -1,9 +1,6 @@
 [framebuffer-texture-switch.html]
   type: testharness
   expected: ERROR
-  [WebGL framebuffer texture attachment switching conformance test.]
-    expected: FAIL
-
   [Overall test]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-canvas-dimensions.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-canvas-dimensions.html.ini
deleted file mode 100644
index 73a2e36675d..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-canvas-dimensions.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[gl-scissor-canvas-dimensions.html]
-  type: testharness
-  [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
-    expected: FAIL
-
-  [WebGL test #5: at (16, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-test.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-test.html.ini
deleted file mode 100644
index c8fb9910cd1..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-test.html.ini
+++ /dev/null
@@ -1,104 +0,0 @@
-[gl-scissor-test.html]
-  type: testharness
-  [WebGL test #50: at (0, 0) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #53: at (1, 1) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #56: at (2, 2) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #59: at (3, 3) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #62: at (4, 4) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #65: at (5, 5) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #68: at (6, 6) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #71: at (7, 7) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #74: at (8, 8) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #77: at (9, 9) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #80: at (10, 10) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #83: at (11, 11) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #86: at (12, 12) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #89: at (13, 13) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #92: at (14, 14) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #95: at (15, 15) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #97: getError expected: NO_ERROR. Was INVALID_ENUM : there should be no errors]
-    expected: FAIL
-
-  [WebGL test #148: at (0, 0) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #151: at (1, 1) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #154: at (2, 2) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #157: at (3, 3) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #160: at (4, 4) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #163: at (5, 5) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #166: at (6, 6) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #169: at (7, 7) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #172: at (8, 8) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #175: at (9, 9) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #178: at (10, 10) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #181: at (11, 11) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #184: at (12, 12) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #187: at (13, 13) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #190: at (14, 14) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #193: at (15, 15) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #195: getError expected: NO_ERROR. Was INVALID_ENUM : there should be no errors]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/gl-viewport-test.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/gl-viewport-test.html.ini
deleted file mode 100644
index b308d7d4b82..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/gl-viewport-test.html.ini
+++ /dev/null
@@ -1,80 +0,0 @@
-[gl-viewport-test.html]
-  type: testharness
-  [WebGL test #1: at (16, 32) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #6: at (8, 8) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #11: at (4, 16) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #16: at (32, 64) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #41: at (32, 96) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #46: at (24, 72) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #51: at (36, 48) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #56: at (48, 96) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #61: at (0, 32) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #66: at (8, 0) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #71: at (0, 16) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #76: at (32, 0) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #81: getError expected: NO_ERROR. Was INVALID_ENUM : there should be no errors]
-    expected: FAIL
-
-  [WebGL test #83: at (16, 32) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #88: at (8, 8) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #93: at (4, 16) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #98: at (32, 64) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #123: at (32, 96) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #128: at (24, 72) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #133: at (36, 48) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #138: at (48, 96) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #143: at (0, 32) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #148: at (8, 0) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #153: at (0, 16) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #158: at (32, 0) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #163: getError expected: NO_ERROR. Was INVALID_ENUM : there should be no errors]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html.ini
deleted file mode 100644
index a37a8723e08..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[many-draw-calls.html]
-  type: testharness
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/multisample-corruption.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/multisample-corruption.html.ini
index a4802bc416d..9daae1eb19c 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/multisample-corruption.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/multisample-corruption.html.ini
@@ -1,4 +1,5 @@
 [multisample-corruption.html]
+  bug: https://github.com/servo/servo/issues/21132
   type: testharness
   expected: ERROR
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/compressed-tex-image.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/compressed-tex-image.html.ini
deleted file mode 100644
index 2bc7d9e4776..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/compressed-tex-image.html.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[compressed-tex-image.html]
-  type: testharness
-  [WebGL test #7: getError expected: NO_ERROR. Was INVALID_ENUM : after evaluating: formats = gl.getParameter(gl.COMPRESSED_TEXTURE_FORMATS)]
-    expected: FAIL
-
-  [WebGL test #8: formats should be non-null. Was null]
-    expected: FAIL
-
-  [WebGL test #9: formats.length should be 0. Threw exception TypeError: formats is null]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/origin-clean-conformance.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/origin-clean-conformance.html.ini
index 11c196c35b6..0390f6f22cd 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/origin-clean-conformance.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/origin-clean-conformance.html.ini
@@ -1,3 +1,14 @@
 [origin-clean-conformance.html]
   type: testharness
-  disabled: https://github.com/servo/servo/issues/13341
+  [WebGL test #2: texImage2D with cross-origin image should throw exception.]
+    expected: FAIL
+
+  [WebGL test #3: texSubImage2D with cross-origin image should throw exception.]
+    expected: FAIL
+
+  [WebGL test #7: texImage2D with NON origin clean canvas should throw exception.]
+    expected: FAIL
+
+  [WebGL test #8: texSubImage2D with NON origin clean canvas should throw exception.]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data-rgb565.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data-rgb565.html.ini
deleted file mode 100644
index 479a6654f1f..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-image-data-rgb565.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[tex-image-and-sub-image-2d-with-image-data-rgb565.html]
-  type: testharness
-  [WebGL test #4: at (0, 0) expected: 0,0,0,255 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #7: at (0, 1) expected: 0,0,0,255 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #12: at (0, 0) expected: 0,0,0,255 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #15: at (0, 1) expected: 0,0,0,255 was 0,255,0,255]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/tex-image-webgl.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/tex-image-webgl.html.ini
index 5f5c59cb100..1242ad05bad 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/tex-image-webgl.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/tex-image-webgl.html.ini
@@ -1,20 +1,8 @@
 [tex-image-webgl.html]
   type: testharness
-  [WebGL test #2: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
-    expected: FAIL
-
-  [WebGL test #2: at (1, 0) expected: 255,0,0,255 was 255,255,0,255]
-    expected: FAIL
-
-  [WebGL test #3: at (1, 0) expected: 0,255,0,255 was 255,0,255,255]
+  [WebGL test #2: at (0, 0) expected: 255,0,0,255 was 0,0,0,255]
     expected: FAIL
 
   [WebGL test #3: at (0, 0) expected: 0,255,0,255 was 0,0,0,255]
     expected: FAIL
 
-  [WebGL test #4: at (0, 0) expected: 0,0,255,255 was 0,0,0,255]
-    expected: FAIL
-
-  [WebGL test #2: at (0, 0) expected: 255,0,0,255 was 0,0,0,255]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/texture-copying-feedback-loops.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/texture-copying-feedback-loops.html.ini
index 541316f2297..bcbe5e893e6 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/texture-copying-feedback-loops.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/textures/texture-copying-feedback-loops.html.ini
@@ -1,4 +1,5 @@
 [texture-copying-feedback-loops.html]
+  bug: https://github.com/servo/servo/issues/21288
   type: testharness
   [WebGL test #3: getError expected: INVALID_OPERATION. Was NO_ERROR : after copyTexImage2D to same texture same level, invalid feedback loop]
     expected: FAIL
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html
index 47099e57bd7..ac9f21ab3a0 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html
@@ -29,7 +29,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-<meta name="timeout" value="content">
+<meta name="timeout" content="long">
 <title>Test that contexts are freed and garbage collected reasonably</title>
 <link rel="stylesheet" href="../../resources/js-test-style.css"/>
 <script src=/resources/testharness.js></script>
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation.html
index 703bcfa8dca..c7e4bcefb73 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation.html
@@ -29,7 +29,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-<meta name="timeout" value="content">
+<meta name="timeout" content="long">
 <title>Test that you can create large numbers of WebGL contexts.</title>
 <link rel="stylesheet" href="../../resources/js-test-style.css"/>
 <script src=/resources/testharness.js></script>
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html
index b52e3a9e9f7..d7d04151b06 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html
@@ -29,7 +29,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-<meta name="timeout" value="content">
+<meta name="timeout" content="long">
 <title>Test that context eviction and garbage collection do not interfere with each other</title>
 <link rel="stylesheet" href="../../resources/js-test-style.css"/>
 <script src=/resources/testharness.js></script>
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html
index 71c89906388..2fd7d79b89d 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html
@@ -28,7 +28,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-<meta name="timeout" value="content">
+<meta name="timeout" content="long">
 <title>WebGL GLSL conformance test: acos_001_to_006.html</title>
 <link rel="stylesheet" href="../../../../resources/js-test-style.css" />
 <link rel="stylesheet" href="../../../resources/ogles-tests.css" />
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html
index 79afd9f4303..9a7bb04daf4 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html
@@ -28,7 +28,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-<meta name="timeout" value="content">
+<meta name="timeout" content="long">
 <title>WebGL GLSL conformance test: asin_001_to_006.html</title>
 <link rel="stylesheet" href="../../../../resources/js-test-style.css" />
 <link rel="stylesheet" href="../../../resources/ogles-tests.css" />
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html
index 539cb332140..3b1669c3370 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html
@@ -28,7 +28,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-<meta name="timeout" value="content">
+<meta name="timeout" content="long">
 <title>WebGL GLSL conformance test: log2_001_to_008.html</title>
 <link rel="stylesheet" href="../../../../resources/js-test-style.css" />
 <link rel="stylesheet" href="../../../resources/ogles-tests.css" />
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html
index c1542f4fa9f..b3ee786e0b2 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html
@@ -29,6 +29,7 @@
 <html>
 <head>
 <meta charset="utf-8">
+<meta name="timeout" content="long">
 <link rel="stylesheet" href="../../resources/js-test-style.css"/>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
diff --git a/tests/wpt/mozilla/tests/webgl/tools/timeout.patch b/tests/wpt/mozilla/tests/webgl/tools/timeout.patch
index da53aa632f7..7c20e5daba6 100644
--- a/tests/wpt/mozilla/tests/webgl/tools/timeout.patch
+++ b/tests/wpt/mozilla/tests/webgl/tools/timeout.patch
@@ -30,7 +30,7 @@ index a02dd2d14c..47099e57bd 100644
  <html>
  <head>
  <meta charset="utf-8">
-+<meta name="timeout" value="content">
++<meta name="timeout" content="long">
  <title>Test that contexts are freed and garbage collected reasonably</title>
  <link rel="stylesheet" href="../../resources/js-test-style.css"/>
  <script src=/resources/testharness.js></script>
@@ -42,7 +42,7 @@ index 04b138daf4..703bcfa8dc 100644
  <html>
  <head>
  <meta charset="utf-8">
-+<meta name="timeout" value="content">
++<meta name="timeout" content="long">
  <title>Test that you can create large numbers of WebGL contexts.</title>
  <link rel="stylesheet" href="../../resources/js-test-style.css"/>
  <script src=/resources/testharness.js></script>
@@ -54,7 +54,7 @@ index 3989c7679a..b52e3a9e9f 100644
  <html>
  <head>
  <meta charset="utf-8">
-+<meta name="timeout" value="content">
++<meta name="timeout" content="long">
  <title>Test that context eviction and garbage collection do not interfere with each other</title>
  <link rel="stylesheet" href="../../resources/js-test-style.css"/>
  <script src=/resources/testharness.js></script>
@@ -66,7 +66,7 @@ index 99de4e0a79..71c8990638 100644
  <html>
  <head>
  <meta charset="utf-8">
-+<meta name="timeout" value="content">
++<meta name="timeout" content="long">
  <title>WebGL GLSL conformance test: acos_001_to_006.html</title>
  <link rel="stylesheet" href="../../../../resources/js-test-style.css" />
  <link rel="stylesheet" href="../../../resources/ogles-tests.css" />
@@ -78,7 +78,7 @@ index 5af87433aa..79afd9f430 100644
  <html>
  <head>
  <meta charset="utf-8">
-+<meta name="timeout" value="content">
++<meta name="timeout" content="long">
  <title>WebGL GLSL conformance test: asin_001_to_006.html</title>
  <link rel="stylesheet" href="../../../../resources/js-test-style.css" />
  <link rel="stylesheet" href="../../../resources/ogles-tests.css" />
@@ -90,7 +90,7 @@ index 5552a4f82e..539cb33214 100644
  <html>
  <head>
  <meta charset="utf-8">
-+<meta name="timeout" value="content">
++<meta name="timeout" content="long">
  <title>WebGL GLSL conformance test: log2_001_to_008.html</title>
  <link rel="stylesheet" href="../../../../resources/js-test-style.css" />
  <link rel="stylesheet" href="../../../resources/ogles-tests.css" />
@@ -106,3 +106,15 @@ index 2758b320ff..4d85c3a53a 100644
  <title>WebGL out of bounds uniform array access.</title>
  <link rel="stylesheet" href="../../resources/js-test-style.css"/>
  <script src=/resources/testharness.js></script>
+diff --git i/conformance/rendering/many-draw-calls.html w/conformance/rendering/many-draw-calls.html
+index c1542f4fa9..b3ee786e0b 100644
+--- i/conformance/rendering/many-draw-calls.html
++++ w/conformance/rendering/many-draw-calls.html
+@@ -29,6 +29,7 @@
+ <html>
+ <head>
+ <meta charset="utf-8">
++<meta name="timeout" content="long">
+ <link rel="stylesheet" href="../../resources/js-test-style.css"/>
+ <script src=/resources/testharness.js></script>
+ <script src=/resources/testharnessreport.js></script>
+\ No newline at end of file
author	bors-servo <lbergstrom+bors@mozilla.com>	2018-07-31 05:14:24 -0400
committer	GitHub <noreply@github.com>	2018-07-31 05:14:24 -0400
commit	6e7f7fc8eba432ca5f34c55f668fd7968263f52d (patch)
tree	2fbd1119f009e202abdcf0cd830f1cc08bd639ad
parent	b8b691d0630674c9f907cba4845d8bd76b8ceb79 (diff)
parent	34d1195af305bd2c1015a84fab9d71ee8cd0155c (diff)
download	servo-6e7f7fc8eba432ca5f34c55f668fd7968263f52d.tar.gz servo-6e7f7fc8eba432ca5f34c55f668fd7968263f52d.zip