webgpu: destroy GPUTexture without erroring (#33534)

* destroy GPUTexture without erroring (errors can be safely ignored)

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

* Update expectations

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

---------

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

components/script/dom/gputexture.rs

@@ -2,7 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use std::cell::Cell;
 use std::string::String;
 
 use dom_struct::dom_struct;
@@ -40,7 +39,6 @@ pub struct GPUTexture {
     dimension: GPUTextureDimension,
     format: GPUTextureFormat,
     texture_usage: u32,
-    destroyed: Cell<bool>,
 }
 
 impl GPUTexture {
@@ -69,7 +67,6 @@ impl GPUTexture {
             dimension,
             format,
             texture_usage,
-            destroyed: Cell::new(false),
         }
     }
 
@@ -107,9 +104,6 @@ impl GPUTexture {
 
 impl Drop for GPUTexture {
     fn drop(&mut self) {
-        if self.destroyed.get() {
-            return;
-        }
         if let Err(e) = self
             .channel
             .0
@@ -250,19 +244,16 @@ impl GPUTextureMethods for GPUTexture {
 
     /// <https://gpuweb.github.io/gpuweb/#dom-gputexture-destroy>
     fn Destroy(&self) {
-        if self.destroyed.get() {
+        if let Err(e) = self
-            return;
+            .channel
-        }
+            .0
-        if let Err(e) = self.channel.0.send(WebGPURequest::DestroyTexture {
+            .send(WebGPURequest::DestroyTexture(self.texture.0))
-            device_id: self.device.id().0,
+        {
-            texture_id: self.texture.0,
-        }) {
             warn!(
                 "Failed to send WebGPURequest::DestroyTexture({:?}) ({})",
                 self.texture.0, e
             );
         };
-        self.destroyed.set(true);
     }
 
     /// <https://gpuweb.github.io/gpuweb/#dom-gputexture-width>

components/webgpu/ipc_messages/recv.rs

@@ -151,10 +151,7 @@ pub enum WebGPURequest {
     },
     DestroyBuffer(id::BufferId),
     DestroyDevice(id::DeviceId),
-    DestroyTexture {
+    DestroyTexture(id::TextureId),
-        device_id: id::DeviceId,
-        texture_id: id::TextureId,
-    },
     DestroySwapChain {
         context_id: WebGPUContextId,
         image_key: ImageKey,

components/webgpu/wgpu_thread.rs

@@ -567,13 +567,9 @@ impl WGPU {
                     } => {
                         self.destroy_swapchain(context_id, image_key);
                     },
-                    WebGPURequest::DestroyTexture {
+                    WebGPURequest::DestroyTexture(texture_id) => {
-                        device_id,
-                        texture_id,
-                    } => {
                         let global = &self.global;
-                        let result = global.texture_destroy(texture_id);
+                        let _ = global.texture_destroy(texture_id);
-                        self.maybe_dispatch_wgpu_error(device_id, result.err());
                     },
                     WebGPURequest::Exit(sender) => {
                         if let Err(e) = sender.send(()) {