This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch geckoview-96.0.3-11.0-1 in repository tor-browser.
commit 1eefd630510378de8c154f1496a584db80cbe6c8 Author: Nicolas Silva nsilva@mozilla.com AuthorDate: Fri Mar 4 16:12:04 2022 +0000
Bug 1758070 - Null out mContext during shutdown. r=emilio, a=tritter
Differential Revision: https://phabricator.services.mozilla.com/D140336 --- dom/webgpu/ipc/WebGPUParent.cpp | 1 + dom/webgpu/ipc/WebGPUParent.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/dom/webgpu/ipc/WebGPUParent.cpp b/dom/webgpu/ipc/WebGPUParent.cpp index 8ccb6c99fd606..8cfd71ddc9196 100644 --- a/dom/webgpu/ipc/WebGPUParent.cpp +++ b/dom/webgpu/ipc/WebGPUParent.cpp @@ -734,6 +734,7 @@ ipc::IPCResult WebGPUParent::RecvShutdown() { mCanvasMap.clear(); ffi::wgpu_server_poll_all_devices(mContext, true); ffi::wgpu_server_delete(const_castffi::WGPUGlobal*(mContext)); + mContext = nullptr; return IPC_OK(); }
diff --git a/dom/webgpu/ipc/WebGPUParent.h b/dom/webgpu/ipc/WebGPUParent.h index ec69a8588717e..e43e6e22d321d 100644 --- a/dom/webgpu/ipc/WebGPUParent.h +++ b/dom/webgpu/ipc/WebGPUParent.h @@ -94,7 +94,7 @@ class WebGPUParent final : public PWebGPUParent { void MaintainDevices(); bool ForwardError(RawId aDeviceID, ErrorBuffer& aError);
- const ffi::WGPUGlobal* const mContext; + const ffi::WGPUGlobal* mContext; base::RepeatingTimer<WebGPUParent> mTimer; /// Shmem associated with a mappable buffer has to be owned by one of the /// processes. We keep it here for every mappable buffer while the buffer is