diff options
author | bors-servo <servo-ops@mozilla.com> | 2020-03-27 09:55:12 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-27 09:55:12 -0400 |
commit | a927f1ad8a9ce211618139b2a69c8ce3b739438b (patch) | |
tree | 1d0a346e63dd63a95938e80e355ce1434b442f6d /components/script/dom/webglrenderingcontext.rs | |
parent | 16251cd8dbb3ee5d943b214aa6573d32f08bf93b (diff) | |
parent | 3a3397fbce728c79aa5edf469a1a7763c3efcbde (diff) | |
download | servo-a927f1ad8a9ce211618139b2a69c8ce3b739438b.tar.gz servo-a927f1ad8a9ce211618139b2a69c8ce3b739438b.zip |
Auto merge of #25998 - jdm:vao-drop, r=nox
Avoid a panic when closing webgl pages using VAOs
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #25891
- [x] These changes do not require tests because GC behaviour at shutdown is nondeterministic and difficult to test
Diffstat (limited to 'components/script/dom/webglrenderingcontext.rs')
-rw-r--r-- | components/script/dom/webglrenderingcontext.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index dab9cf6dcf1..983dc3a1633 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -1312,7 +1312,7 @@ impl WebGLRenderingContext { self.send_command(WebGLCommand::BindBuffer(target, buffer.map(|b| b.id()))); if let Some(old) = slot.get() { - old.decrement_attached_counter(); + old.decrement_attached_counter(false); } slot.set(buffer); @@ -2560,7 +2560,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { .map_or(false, |b| buffer == &*b) { self.bound_buffer_array.set(None); - buffer.decrement_attached_counter(); + buffer.decrement_attached_counter(false); } buffer.mark_for_deletion(false); } |