blockingly shut-down webrender when exiting webgl_thread

servo · Jun 17, 2020 · 5989674 · 5989674
1 parent 581ade5
commit 5989674
Show file tree

Hide file tree

Showing 40 changed files with 47 additions and 49 deletions.
diff --git a/components/canvas/webgl_thread.rs b/components/canvas/webgl_thread.rs
@@ -333,6 +333,14 @@ impl WebGLThread {
                         Ok(msg) => {
                             let exit = self.handle_msg(msg, &webgl_chan);
                             if exit {
+                                // Call remove_context functions in order to correctly delete WebRender image keys.
+                                let context_ids: Vec<WebGLContextId> = self.contexts.keys().map(|id| *id).collect();
+                                for id in context_ids {
+                                    self.remove_webgl_context(id);
+                                }
+
+                                // Block on shutting-down WebRender.
+                                self.webrender_api.shut_down(true);
                                 return;
                             }
                         }
@@ -1101,16 +1109,6 @@ impl WebGLThread {
     }
 }
 
-impl Drop for WebGLThread {
-    fn drop(&mut self) {
-        // Call remove_context functions in order to correctly delete WebRender image keys.
-        let context_ids: Vec<WebGLContextId> = self.contexts.keys().map(|id| *id).collect();
-        for id in context_ids {
-            self.remove_webgl_context(id);
-        }
-    }
-}
-
 /// Helper struct to store cached WebGLContext information.
 struct WebGLContextInfo {
     /// Currently used WebRender image key.

diff --git a/tests/wpt/webgl/meta/conformance2/renderbuffers/framebuffer-object-attachment.html.ini b/tests/wpt/webgl/meta/conformance2/renderbuffers/framebuffer-object-attachment.html.ini
@@ -1,6 +1,6 @@
 [framebuffer-object-attachment.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
   [WebGL test #45: getError expected: NO_ERROR. Was INVALID_ENUM : ]
     expected: FAIL
 

diff --git a/tests/wpt/webgl/meta/conformance2/renderbuffers/invalidate-framebuffer.html.ini b/tests/wpt/webgl/meta/conformance2/renderbuffers/invalidate-framebuffer.html.ini
@@ -2,7 +2,7 @@
   bug: https://github.com/servo/servo/issues/20529
   expected:
     if os == "linux": ERROR
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
   [WebGL test #17: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance2/renderbuffers/readbuffer.html.ini b/tests/wpt/webgl/meta/conformance2/renderbuffers/readbuffer.html.ini
@@ -1,2 +1,2 @@
 [readbuffer.html]
-  expected: TIMEOUT
+  expected: CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/rendering/read-draw-when-missing-image.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/read-draw-when-missing-image.html.ini
@@ -1,2 +1,2 @@
 [read-draw-when-missing-image.html]
-  expected: TIMEOUT
+  expected: CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/state/gl-object-get-calls.html.ini b/tests/wpt/webgl/meta/conformance2/state/gl-object-get-calls.html.ini
@@ -1,7 +1,7 @@
 [gl-object-get-calls.html]
   bug: https://github.com/servo/servo/issues/26128
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
 
   [WebGL test #201: gl.getTexParameter(gl.TEXTURE_2D, gl.TEXTURE_WRAP_R) should be 33071 (of type number). Was null (of type object).]
     expected: FAIL

diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r11f_g11f_b10f-rgb-float.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r11f_g11f_b10f-rgb-float.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-r11f_g11f_b10f-rgb-float.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/...nformance2/textures/image/tex-2d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html.ini b/...nformance2/textures/image/tex-2d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r16f-red-float.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r16f-red-float.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-r16f-red-float.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r32f-red-float.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r32f-red-float.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-r32f-red-float.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r8-red-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r8-red-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-r8-red-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/...wpt/webgl/meta/conformance2/textures/image/tex-2d-r8ui-red_integer-unsigned_byte.html.ini b/...wpt/webgl/meta/conformance2/textures/image/tex-2d-r8ui-red_integer-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-r8ui-red_integer-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg16f-rg-float.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg16f-rg-float.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rg16f-rg-float.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg32f-rg-float.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg32f-rg-float.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rg32f-rg-float.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg8-rg-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg8-rg-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rg8-rg-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/...wpt/webgl/meta/conformance2/textures/image/tex-2d-rg8ui-rg_integer-unsigned_byte.html.ini b/...wpt/webgl/meta/conformance2/textures/image/tex-2d-rg8ui-rg_integer-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rg8ui-rg_integer-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/...eta/conformance2/textures/image/tex-2d-rgb10_a2-rgba-unsigned_int_2_10_10_10_rev.html.ini b/...eta/conformance2/textures/image/tex-2d-rgb10_a2-rgba-unsigned_int_2_10_10_10_rev.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb10_a2-rgba-unsigned_int_2_10_10_10_rev.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb16f-rgb-float.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb16f-rgb-float.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb16f-rgb-float.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb565-rgb-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb565-rgb-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb565-rgb-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/...pt/webgl/meta/conformance2/textures/image/tex-2d-rgb565-rgb-unsigned_short_5_6_5.html.ini b/...pt/webgl/meta/conformance2/textures/image/tex-2d-rgb565-rgb-unsigned_short_5_6_5.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb565-rgb-unsigned_short_5_6_5.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb5_a1-rgba-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb5_a1-rgba-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb5_a1-rgba-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/...ebgl/meta/conformance2/textures/image/tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html.ini b/...ebgl/meta/conformance2/textures/image/tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb8-rgb-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb8-rgb-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb8-rgb-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/...t/webgl/meta/conformance2/textures/image/tex-2d-rgb8ui-rgb_integer-unsigned_byte.html.ini b/...t/webgl/meta/conformance2/textures/image/tex-2d-rgb8ui-rgb_integer-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb8ui-rgb_integer-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb9_e5-rgb-float.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb9_e5-rgb-float.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb9_e5-rgb-float.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba16f-rgba-float.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba16f-rgba-float.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgba16f-rgba-float.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba4-rgba-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba4-rgba-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgba4-rgba-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/.../webgl/meta/conformance2/textures/image/tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html.ini b/.../webgl/meta/conformance2/textures/image/tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/...webgl/meta/conformance2/textures/image/tex-2d-rgba8ui-rgba_integer-unsigned_byte.html.ini b/...webgl/meta/conformance2/textures/image/tex-2d-rgba8ui-rgba_integer-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgba8ui-rgba_integer-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-srgb8-rgb-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-srgb8-rgb-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-srgb8-rgb-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/...pt/webgl/meta/conformance2/textures/image/tex-2d-srgb8_alpha8-rgba-unsigned_byte.html.ini b/...pt/webgl/meta/conformance2/textures/image/tex-2d-srgb8_alpha8-rgba-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-srgb8_alpha8-rgba-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/misc/copy-texture-image-same-texture.html.ini b/tests/wpt/webgl/meta/conformance2/textures/misc/copy-texture-image-same-texture.html.ini
@@ -1,2 +1,2 @@
 [copy-texture-image-same-texture.html]
-  expected: TIMEOUT
+  expected: CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/misc/copy-texture-image.html.ini b/tests/wpt/webgl/meta/conformance2/textures/misc/copy-texture-image.html.ini
@@ -1,2 +1,2 @@
 [copy-texture-image.html]
-  expected: TIMEOUT
+  expected: CRASH
diff --git a/.../webgl/meta/conformance2/textures/misc/tex-image-with-bad-args-from-dom-elements.html.ini b/.../webgl/meta/conformance2/textures/misc/tex-image-with-bad-args-from-dom-elements.html.ini
@@ -1,4 +1,4 @@
 [tex-image-with-bad-args-from-dom-elements.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-bad-args.html.ini b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-bad-args.html.ini
@@ -1,5 +1,5 @@
 [tex-image-with-bad-args.html]
-  expected: TIMEOUT
+  expected: CRASH
   [WebGL test #5: getError expected: INVALID_OPERATION. Was INVALID_ENUM : TexImage2D taking LUMINANCE_ALPHA/LUMINANCE_ALPHA/HALF_FLOAT]
     expected: FAIL
 

diff --git a/...s/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-different-data-source.html.ini b/...s/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-different-data-source.html.ini
@@ -1,4 +1,4 @@
 [tex-image-with-different-data-source.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/...a/conformance2/textures/misc/tex-unpack-params-with-flip-y-and-premultiply-alpha.html.ini b/...a/conformance2/textures/misc/tex-unpack-params-with-flip-y-and-premultiply-alpha.html.ini
@@ -1,4 +1,4 @@
 [tex-unpack-params-with-flip-y-and-premultiply-alpha.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/misc/texture-npot.html.ini b/tests/wpt/webgl/meta/conformance2/textures/misc/texture-npot.html.ini
@@ -1,2 +1,2 @@
 [texture-npot.html]
-  expected: TIMEOUT
+  expected: CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/transform_feedback/switching-objects.html.ini b/tests/wpt/webgl/meta/conformance2/transform_feedback/switching-objects.html.ini
@@ -1,2 +1,2 @@
 [switching-objects.html]
-  expected: TIMEOUT
+  expected: CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/uniforms/incompatible-texture-type-for-sampler.html.ini b/tests/wpt/webgl/meta/conformance2/uniforms/incompatible-texture-type-for-sampler.html.ini
@@ -1,2 +1,2 @@
 [incompatible-texture-type-for-sampler.html]
-  expected: TIMEOUT
+  expected: CRASH