From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:35:49 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 dom/webgpu/TextureView.cpp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'dom/webgpu/TextureView.cpp')

diff --git a/dom/webgpu/TextureView.cpp b/dom/webgpu/TextureView.cpp
index c36818e9ea..4964de4b7f 100644
--- a/dom/webgpu/TextureView.cpp
+++ b/dom/webgpu/TextureView.cpp
@@ -27,13 +27,21 @@ CanvasContext* TextureView::GetTargetContext() const {
 }  // namespace webgpu
 
 void TextureView::Cleanup() {
-  if (mValid && mParent && mParent->GetParentDevice()) {
-    mValid = false;
-    auto bridge = mParent->GetParentDevice()->GetBridge();
-    if (bridge && bridge->IsOpen()) {
-      bridge->SendTextureViewDrop(mId);
-    }
+  if (!mValid || !mParent || !mParent->GetDevice()) {
+    return;
   }
+  mValid = false;
+
+  auto bridge = mParent->GetDevice()->GetBridge();
+  if (!bridge) {
+    return;
+  }
+
+  if (bridge->CanSend()) {
+    bridge->SendTextureViewDrop(mId);
+  }
+
+  wgpu_client_free_texture_view_id(bridge->GetClient(), mId);
 }
 
 }  // namespace mozilla::webgpu
-- 
cgit v1.2.3