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/webglprogram.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/webglprogram.rs')
-rw-r--r-- | components/script/dom/webglprogram.rs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/components/script/dom/webglprogram.rs b/components/script/dom/webglprogram.rs index 0dcee20e341..bf198e5382c 100644 --- a/components/script/dom/webglprogram.rs +++ b/components/script/dom/webglprogram.rs @@ -77,14 +77,18 @@ impl WebGLProgram { } /// glDeleteProgram - pub fn mark_for_deletion(&self) { + pub fn mark_for_deletion(&self, fallible: bool) { if self.marked_for_deletion.get() { return; } self.marked_for_deletion.set(true); - self.upcast::<WebGLObject>() - .context() - .send_command(WebGLCommand::DeleteProgram(self.id)); + let cmd = WebGLCommand::DeleteProgram(self.id); + let context = self.upcast::<WebGLObject>().context(); + if fallible { + context.send_command_ignored(cmd); + } else { + context.send_command(cmd); + } if self.is_deleted() { self.detach_shaders(); } @@ -443,7 +447,7 @@ impl WebGLProgram { impl Drop for WebGLProgram { fn drop(&mut self) { self.in_use(false); - self.mark_for_deletion(); + self.mark_for_deletion(true); } } |