WebGPU: always send exit message to script before exiting (#30989)

* webgpu: always send exit message to script before exiting * Update expectations --------- Co-authored-by: sagudev <16504129+sagudev@users.noreply.github.com>
servo · Jan 3, 2024 · f44ff83 · f44ff83
1 parent 65cbc95
commit f44ff83
Show file tree

Hide file tree

Showing 2 changed files with 334 additions and 10 deletions.
diff --git a/components/webgpu/lib.rs b/components/webgpu/lib.rs
@@ -831,13 +831,10 @@ impl<'a> WGPU<'a> {
                         gfx_select!(texture => global.texture_drop(texture, true));
                     },
                     WebGPURequest::Exit(sender) => {
-                        if let Err(e) = self.script_sender.send(WebGPUMsg::Exit) {
-                            warn!("Failed to send WebGPUMsg::Exit to script ({})", e);
-                        }
                         if let Err(e) = sender.send(()) {
                             warn!("Failed to send response to WebGPURequest::Exit ({})", e)
                         }
-                        return;
+                        break;
                     },
                     WebGPURequest::FreeCommandBuffer(command_buffer_id) => {
                         self.error_command_encoders
@@ -888,7 +885,7 @@ impl<'a> WGPU<'a> {
                                     e
                                 )
                                 }
-                                return;
+                                break;
                             },
                         };
                         let adapter = WebGPUAdapter(adapter_id);
@@ -943,7 +940,7 @@ impl<'a> WGPU<'a> {
                                     w
                                 )
                                 }
-                                return;
+                                break;
                             },
                         };
                         let device = WebGPUDevice(id);
@@ -1249,6 +1246,9 @@ impl<'a> WGPU<'a> {
                 }
             }
         }
+        if let Err(e) = self.script_sender.send(WebGPUMsg::Exit) {
+            warn!("Failed to send WebGPUMsg::Exit to script ({})", e);
+        }
     }
 
     fn send_result<U, T: std::fmt::Debug>(