diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-10-16 08:16:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-16 08:16:28 -0400 |
| commit | a77ad4288ceda844d99e47fc89e0cd05bd01bd85 (patch) | |
| tree | 09c18547e976e8c9e76ccf3f036b44be99887f48 | |
| parent | 4625160f0af794e2675e8a81389c44dfa291c3d5 (diff) | |
| parent | c010ae88cdba0a4b654413733b2a07e2a685d409 (diff) | |
| download | servo-a77ad4288ceda844d99e47fc89e0cd05bd01bd85.tar.gz servo-a77ad4288ceda844d99e47fc89e0cd05bd01bd85.zip | |
Auto merge of #21959 - servo:webgl, r=jdm
Fix a couple of Drop implementations for WebGL objects
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21959)
<!-- Reviewable:end -->
| -rw-r--r-- | components/script/dom/webglbuffer.rs | 1 | ||||
| -rw-r--r-- | components/script/dom/webglrenderbuffer.rs | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/components/script/dom/webglbuffer.rs b/components/script/dom/webglbuffer.rs index eca72566ea4..6aa0e04dd3f 100644 --- a/components/script/dom/webglbuffer.rs +++ b/components/script/dom/webglbuffer.rs @@ -161,6 +161,5 @@ impl WebGLBuffer { impl Drop for WebGLBuffer { fn drop(&mut self) { self.mark_for_deletion(); - assert!(self.is_deleted()); } } diff --git a/components/script/dom/webglrenderbuffer.rs b/components/script/dom/webglrenderbuffer.rs index 9165284257c..edfed388c39 100644 --- a/components/script/dom/webglrenderbuffer.rs +++ b/components/script/dom/webglrenderbuffer.rs @@ -163,3 +163,9 @@ impl WebGLRenderbuffer { Ok(()) } } + +impl Drop for WebGLRenderbuffer { + fn drop(&mut self) { + self.delete(); + } +} |