From 8f5c37c0b5011fa526f2b932bf7abb0bca8a7fd0 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Mon, 29 Jul 2019 10:05:48 -0400
Subject: Don't panic if WebGL thread can't be reached during finalization.

---
 components/script/dom/webglrenderbuffer.rs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'components/script/dom/webglrenderbuffer.rs')

diff --git a/components/script/dom/webglrenderbuffer.rs b/components/script/dom/webglrenderbuffer.rs
index 459b76466e3..f210b579e88 100644
--- a/components/script/dom/webglrenderbuffer.rs
+++ b/components/script/dom/webglrenderbuffer.rs
@@ -89,7 +89,7 @@ impl WebGLRenderbuffer {
             .send_command(WebGLCommand::BindRenderbuffer(target, Some(self.id)));
     }
 
-    pub fn delete(&self) {
+    pub fn delete(&self, fallible: bool) {
         if !self.is_deleted.get() {
             self.is_deleted.set(true);
 
@@ -106,9 +106,13 @@ impl WebGLRenderbuffer {
                 fb.detach_renderbuffer(self);
             }
 
-            self.upcast::<WebGLObject>()
-                .context()
-                .send_command(WebGLCommand::DeleteRenderbuffer(self.id));
+            let context = self.upcast::<WebGLObject>().context();
+            let cmd = WebGLCommand::DeleteRenderbuffer(self.id);
+            if fallible {
+                context.send_command_ignored(cmd);
+            } else {
+                context.send_command(cmd);
+            }
         }
     }
 
@@ -199,6 +203,6 @@ impl WebGLRenderbuffer {
 
 impl Drop for WebGLRenderbuffer {
     fn drop(&mut self) {
-        self.delete();
+        self.delete(true);
     }
 }
-- 
cgit v1.2.3