diff options
author | Josh Matthews <josh@joshmatthews.net> | 2019-07-29 10:05:48 -0400 |
---|---|---|
committer | Josh Matthews <josh@joshmatthews.net> | 2019-07-29 10:09:24 -0400 |
commit | 8f5c37c0b5011fa526f2b932bf7abb0bca8a7fd0 (patch) | |
tree | 50609b21c4f98bd0b89677d783a3aefbb765ce9e /components/script/dom/webglrenderbuffer.rs | |
parent | eb4f2d150af353ecbae3eacb23b32b4ac0970ce8 (diff) | |
download | servo-8f5c37c0b5011fa526f2b932bf7abb0bca8a7fd0.tar.gz servo-8f5c37c0b5011fa526f2b932bf7abb0bca8a7fd0.zip |
Don't panic if WebGL thread can't be reached during finalization.
Diffstat (limited to 'components/script/dom/webglrenderbuffer.rs')
-rw-r--r-- | components/script/dom/webglrenderbuffer.rs | 14 |
1 files changed, 9 insertions, 5 deletions
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); } } |