Use smart pointers in Modules/WebGPU

https://bugs.webkit.org/show_bug.cgi?id=270378 rdar://123810573 Reviewed by Mike Wyrzykowski. * Source/WebCore/Modules/WebGPU/GPUBindGroupDescriptor.h: (): Deleted. * Source/WebCore/Modules/WebGPU/GPUBindGroupLayout.h: * Source/WebCore/Modules/WebGPU/GPUBuffer.cpp: (WebCore::makeArrayBuffer): (WebCore::GPUBuffer::unmap): * Source/WebCore/Modules/WebGPU/GPUBuffer.h: * Source/WebCore/Modules/WebGPU/GPUBufferBinding.h: * Source/WebCore/Modules/WebGPU/GPUCanvasConfiguration.h: * Source/WebCore/Modules/WebGPU/GPUComputePassTimestampWrites.h: * Source/WebCore/Modules/WebGPU/GPUImageCopyBuffer.h: (): Deleted. * Source/WebCore/Modules/WebGPU/GPUImageCopyTexture.h: * Source/WebCore/Modules/WebGPU/GPUPresentationContext.cpp: (WebCore::GPUPresentationContext::configure): * Source/WebCore/Modules/WebGPU/GPUProgrammableStage.h: (): Deleted. * Source/WebCore/Modules/WebGPU/GPUQuerySet.h: * Source/WebCore/Modules/WebGPU/GPURenderPassColorAttachment.h: * Source/WebCore/Modules/WebGPU/GPURenderPassDepthStencilAttachment.h: * Source/WebCore/Modules/WebGPU/GPURenderPassDescriptor.h: (): Deleted. * Source/WebCore/Modules/WebGPU/GPURenderPassTimestampWrites.h: * Source/WebCore/Modules/WebGPU/GPUShaderModule.h: * Source/WebCore/Modules/WebGPU/GPUTexture.h: * Source/WebCore/Modules/WebGPU/GPUTextureView.h: * Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUComputePassTimestampWrites.h: * Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUPipelineDescriptorBase.h: (): Deleted. * Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUPipelineLayout.h: * Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUQuerySet.h: * Source/WebCore/Modules/WebGPU/InternalAPI/WebGPURenderPassColorAttachment.h: * Source/WebCore/Modules/WebGPU/InternalAPI/WebGPURenderPassDescriptor.h: (): Deleted. * Source/WebCore/Modules/WebGPU/InternalAPI/WebGPURenderPassTimestampWrites.h: * Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUTextureView.h: Canonical link: https://commits.webkit.org/275584@main
WebKit · Mar 2, 2024 · 067f08a · 067f08a
1 parent 43475b5
commit 067f08a
Show file tree

Hide file tree

Showing 49 changed files with 82 additions and 43 deletions.
diff --git a/Source/WebCore/Modules/WebGPU/GPUBindGroupDescriptor.h b/Source/WebCore/Modules/WebGPU/GPUBindGroupDescriptor.h
@@ -46,7 +46,7 @@ struct GPUBindGroupDescriptor : public GPUObjectDescriptorBase {
         };
     }
 
-    GPUBindGroupLayout* layout { nullptr };
+    WeakPtr<GPUBindGroupLayout> layout;
     Vector<GPUBindGroupEntry> entries;
 };
 

diff --git a/Source/WebCore/Modules/WebGPU/GPUBindGroupLayout.h b/Source/WebCore/Modules/WebGPU/GPUBindGroupLayout.h
@@ -28,11 +28,12 @@
 #include "WebGPUBindGroupLayout.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
+#include <wtf/WeakPtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
-class GPUBindGroupLayout : public RefCounted<GPUBindGroupLayout> {
+class GPUBindGroupLayout : public RefCounted<GPUBindGroupLayout>, public CanMakeWeakPtr<GPUBindGroupLayout> {
 public:
     static Ref<GPUBindGroupLayout> create(Ref<WebGPU::BindGroupLayout>&& backing)
     {

diff --git a/Source/WebCore/Modules/WebGPU/GPUBuffer.cpp b/Source/WebCore/Modules/WebGPU/GPUBuffer.cpp
@@ -102,7 +102,8 @@ static auto makeArrayBuffer(auto source, auto byteLength, auto& cachedArrayBuffe
     auto arrayBuffer = ArrayBuffer::create(source, byteLength);
     cachedArrayBuffer = arrayBuffer.ptr();
     cachedArrayBuffer->pin();
-    device.addBufferToUnmap(buffer);
+    if (device)
+        device->addBufferToUnmap(buffer);
     return arrayBuffer;
 }
 
@@ -185,7 +186,8 @@ ExceptionOr<Ref<JSC::ArrayBuffer>> GPUBuffer::getMappedRange(std::optional<GPUSi
 void GPUBuffer::unmap(ScriptExecutionContext& scriptExecutionContext)
 {
     internalUnmap(scriptExecutionContext);
-    m_device.removeBufferToUnmap(*this);
+    if (m_device)
+        m_device->removeBufferToUnmap(*this);
 }
 
 void GPUBuffer::internalUnmap(ScriptExecutionContext& scriptExecutionContext)

diff --git a/Source/WebCore/Modules/WebGPU/GPUBuffer.h b/Source/WebCore/Modules/WebGPU/GPUBuffer.h
@@ -79,14 +79,14 @@ class GPUBuffer : public RefCounted<GPUBuffer>, public CanMakeWeakPtr<GPUBuffer>
 
     Ref<WebGPU::Buffer> m_backing;
     WebGPU::Buffer::MappedRange m_mappedRange;
-    JSC::ArrayBuffer* m_arrayBuffer { nullptr };
+    RefPtr<JSC::ArrayBuffer> m_arrayBuffer;
     size_t m_bufferSize { 0 };
     size_t m_mappedRangeOffset { 0 };
     size_t m_mappedRangeSize { 0 };
     const GPUBufferUsageFlags m_usage { 0 };
     GPUBufferMapState m_mapState { GPUBufferMapState::Unmapped };
     std::optional<MapAsyncPromise> m_pendingMapPromise;
-    GPUDevice& m_device;
+    WeakPtr<GPUDevice, WeakPtrImplWithEventTargetData> m_device;
     using MappedRanges = WTF::RangeSet<WTF::Range<size_t>>;
     MappedRanges m_mappedRanges;
     HashSet<size_t, DefaultHash<size_t>, WTF::UnsignedWithZeroKeyHashTraits<size_t>> m_mappedPoints;

diff --git a/Source/WebCore/Modules/WebGPU/GPUBufferBinding.h b/Source/WebCore/Modules/WebGPU/GPUBufferBinding.h
@@ -44,7 +44,7 @@ struct GPUBufferBinding {
         };
     }
 
-    GPUBuffer* buffer { nullptr };
+    WeakPtr<GPUBuffer> buffer;
     GPUSize64 offset { 0 };
     std::optional<GPUSize64> size;
 };

diff --git a/Source/WebCore/Modules/WebGPU/GPUCanvasConfiguration.h b/Source/WebCore/Modules/WebGPU/GPUCanvasConfiguration.h
@@ -51,7 +51,7 @@ struct GPUCanvasConfiguration {
         };
     }
 
-    GPUDevice* device { nullptr };
+    WeakPtr<GPUDevice, WeakPtrImplWithEventTargetData> device;
     GPUTextureFormat format { GPUTextureFormat::R8unorm };
     GPUTextureUsageFlags usage { GPUTextureUsage::RENDER_ATTACHMENT };
     Vector<GPUTextureFormat> viewFormats;

diff --git a/Source/WebCore/Modules/WebGPU/GPUComputePassTimestampWrites.h b/Source/WebCore/Modules/WebGPU/GPUComputePassTimestampWrites.h
@@ -43,7 +43,7 @@ struct GPUComputePassTimestampWrites {
         };
     }
 
-    GPUQuerySet* querySet { nullptr };
+    WeakPtr<GPUQuerySet> querySet;
     GPUSize32 beginningOfPassWriteIndex { UINT32_MAX };
     GPUSize32 endOfPassWriteIndex { UINT32_MAX };
 };

diff --git a/Source/WebCore/Modules/WebGPU/GPUImageCopyBuffer.h b/Source/WebCore/Modules/WebGPU/GPUImageCopyBuffer.h
@@ -46,7 +46,7 @@ struct GPUImageCopyBuffer : public GPUImageDataLayout {
         };
     }
 
-    GPUBuffer* buffer { nullptr };
+    WeakPtr<GPUBuffer> buffer;
 };
 
 }
diff --git a/Source/WebCore/Modules/WebGPU/GPUImageCopyTexture.h b/Source/WebCore/Modules/WebGPU/GPUImageCopyTexture.h
@@ -47,7 +47,7 @@ struct GPUImageCopyTexture {
         };
     }
 
-    GPUTexture* texture { nullptr };
+    WeakPtr<GPUTexture> texture;
     GPUIntegerCoordinate mipLevel { 0 };
     std::optional<GPUOrigin3D> origin;
     GPUTextureAspect aspect { GPUTextureAspect::All };

diff --git a/Source/WebCore/Modules/WebGPU/GPUPresentationContext.cpp b/Source/WebCore/Modules/WebGPU/GPUPresentationContext.cpp
@@ -35,7 +35,7 @@ namespace WebCore {
 
 void GPUPresentationContext::configure(const GPUCanvasConfiguration& canvasConfiguration, GPUIntegerCoordinate width, GPUIntegerCoordinate height)
 {
-    m_device = canvasConfiguration.device;
+    m_device = canvasConfiguration.device.get();
     m_backing->configure(canvasConfiguration.convertToBacking());
     m_textureDescriptor = GPUTextureDescriptor {
         { "canvas backing"_s },

diff --git a/Source/WebCore/Modules/WebGPU/GPUProgrammableStage.h b/Source/WebCore/Modules/WebGPU/GPUProgrammableStage.h
@@ -30,6 +30,7 @@
 #include <wtf/KeyValuePair.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
+#include <wtf/WeakPtr.h>
 
 namespace WebCore {
 
@@ -46,7 +47,7 @@ struct GPUProgrammableStage {
         };
     }
 
-    GPUShaderModule* module { nullptr };
+    WeakPtr<GPUShaderModule> module;
     std::optional<String> entryPoint;
     Vector<KeyValuePair<String, GPUPipelineConstantValue>> constants;
 };

diff --git a/Source/WebCore/Modules/WebGPU/GPUQuerySet.h b/Source/WebCore/Modules/WebGPU/GPUQuerySet.h
@@ -30,11 +30,12 @@
 #include "WebGPUQuerySet.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
+#include <wtf/WeakPtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
-class GPUQuerySet : public RefCounted<GPUQuerySet> {
+class GPUQuerySet : public RefCounted<GPUQuerySet>, public CanMakeWeakPtr<GPUQuerySet> {
 public:
     static Ref<GPUQuerySet> create(Ref<WebGPU::QuerySet>&& backing, const GPUQuerySetDescriptor& descriptor)
     {

diff --git a/Source/WebCore/Modules/WebGPU/GPURenderPassColorAttachment.h b/Source/WebCore/Modules/WebGPU/GPURenderPassColorAttachment.h
@@ -51,9 +51,9 @@ struct GPURenderPassColorAttachment {
         };
     }
 
-    GPUTextureView* view { nullptr };
+    WeakPtr<GPUTextureView> view;
     std::optional<GPUIntegerCoordinate> depthSlice;
-    GPUTextureView* resolveTarget { nullptr };
+    WeakPtr<GPUTextureView> resolveTarget;
 
     std::optional<GPUColor> clearValue;
     GPULoadOp loadOp { GPULoadOp::Load };

diff --git a/Source/WebCore/Modules/WebGPU/GPURenderPassDepthStencilAttachment.h b/Source/WebCore/Modules/WebGPU/GPURenderPassDepthStencilAttachment.h
@@ -52,7 +52,7 @@ struct GPURenderPassDepthStencilAttachment {
         };
     }
 
-    GPUTextureView* view { nullptr };
+    WeakPtr<GPUTextureView> view;
 
     std::optional<float> depthClearValue;
     std::optional<GPULoadOp> depthLoadOp;

diff --git a/Source/WebCore/Modules/WebGPU/GPURenderPassDescriptor.h b/Source/WebCore/Modules/WebGPU/GPURenderPassDescriptor.h
@@ -56,7 +56,7 @@ struct GPURenderPassDescriptor : public GPUObjectDescriptorBase {
 
     Vector<std::optional<GPURenderPassColorAttachment>> colorAttachments;
     std::optional<GPURenderPassDepthStencilAttachment> depthStencilAttachment;
-    GPUQuerySet* occlusionQuerySet { nullptr };
+    WeakPtr<GPUQuerySet> occlusionQuerySet;
     GPURenderPassTimestampWrites timestampWrites;
     std::optional<GPUSize64> maxDrawCount;
 };

diff --git a/Source/WebCore/Modules/WebGPU/GPURenderPassTimestampWrites.h b/Source/WebCore/Modules/WebGPU/GPURenderPassTimestampWrites.h
@@ -43,7 +43,7 @@ struct GPURenderPassTimestampWrites {
         };
     }
 
-    GPUQuerySet* querySet { nullptr };
+    WeakPtr<GPUQuerySet> querySet;
     GPUSize32 beginningOfPassWriteIndex { UINT32_MAX };
     GPUSize32 endOfPassWriteIndex { UINT32_MAX };
 };

diff --git a/Source/WebCore/Modules/WebGPU/GPUShaderModule.h b/Source/WebCore/Modules/WebGPU/GPUShaderModule.h
@@ -31,13 +31,14 @@
 #include "WebGPUShaderModule.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
+#include <wtf/WeakPtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
 class DeferredPromise;
 
-class GPUShaderModule : public RefCounted<GPUShaderModule> {
+class GPUShaderModule : public RefCounted<GPUShaderModule>, public CanMakeWeakPtr<GPUShaderModule> {
 public:
     static Ref<GPUShaderModule> create(Ref<WebGPU::ShaderModule>&& backing)
     {

diff --git a/Source/WebCore/Modules/WebGPU/GPUTexture.h b/Source/WebCore/Modules/WebGPU/GPUTexture.h
@@ -33,6 +33,7 @@
 #include <optional>
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
+#include <wtf/WeakPtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
@@ -43,7 +44,7 @@ class GPUTextureView;
 struct GPUTextureDescriptor;
 struct GPUTextureViewDescriptor;
 
-class GPUTexture : public RefCounted<GPUTexture> {
+class GPUTexture : public RefCounted<GPUTexture>, public CanMakeWeakPtr<GPUTexture> {
 public:
     static Ref<GPUTexture> create(Ref<WebGPU::Texture>&& backing, const GPUTextureDescriptor& descriptor, const GPUDevice& device)
     {

diff --git a/Source/WebCore/Modules/WebGPU/GPUTextureView.h b/Source/WebCore/Modules/WebGPU/GPUTextureView.h
@@ -28,11 +28,12 @@
 #include "WebGPUTextureView.h"
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
+#include <wtf/WeakPtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
-class GPUTextureView : public RefCounted<GPUTextureView> {
+class GPUTextureView : public RefCounted<GPUTextureView>, public CanMakeWeakPtr<GPUTextureView> {
 public:
     static Ref<GPUTextureView> create(Ref<WebGPU::TextureView>&& backing)
     {

diff --git a/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUBindGroupDescriptor.h b/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUBindGroupDescriptor.h
@@ -28,13 +28,14 @@
 #include "WebGPUBindGroupEntry.h"
 #include "WebGPUObjectDescriptorBase.h"
 #include <wtf/Vector.h>
+#include <wtf/WeakRef.h>
 
 namespace WebCore::WebGPU {
 
 class BindGroupLayout;
 
 struct BindGroupDescriptor : public ObjectDescriptorBase {
-    BindGroupLayout& layout;
+    WeakRef<BindGroupLayout> layout;
     Vector<BindGroupEntry> entries;
 };
 

diff --git a/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUBindGroupLayout.h b/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUBindGroupLayout.h
@@ -28,11 +28,12 @@
 #include <wtf/DebugHeap.h>
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
+#include <wtf/WeakPtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore::WebGPU {
 
-class BindGroupLayout : public RefCounted<BindGroupLayout> {
+class BindGroupLayout : public RefCounted<BindGroupLayout>, public CanMakeWeakPtr<BindGroupLayout> {
 public:
     virtual ~BindGroupLayout() = default;
 

diff --git a/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUBuffer.h b/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUBuffer.h
@@ -32,11 +32,12 @@
 #include <wtf/CompletionHandler.h>
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
+#include <wtf/WeakPtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore::WebGPU {
 
-class Buffer : public RefCounted<Buffer> {
+class Buffer : public RefCounted<Buffer>, public CanMakeWeakPtr<Buffer> {
 public:
     virtual ~Buffer() = default;
 

diff --git a/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUBufferBinding.h b/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUBufferBinding.h
@@ -28,13 +28,14 @@
 #include "WebGPUIntegralTypes.h"
 #include <optional>
 #include <wtf/Ref.h>
+#include <wtf/WeakRef.h>
 
 namespace WebCore::WebGPU {
 
 class Buffer;
 
 struct BufferBinding {
-    Buffer& buffer;
+    WeakRef<Buffer> buffer;
     Size64 offset { 0 };
     std::optional<Size64> size;
 };

diff --git a/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUCanvasConfiguration.h b/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUCanvasConfiguration.h
@@ -30,13 +30,14 @@
 #include "WebGPUTextureFormat.h"
 #include "WebGPUTextureUsage.h"
 #include <wtf/Vector.h>
+#include <wtf/WeakRef.h>
 
 namespace WebCore::WebGPU {
 
 class Device;
 
 struct CanvasConfiguration {
-    Device& device;
+    WeakRef<Device> device;
     TextureFormat format { TextureFormat::R8unorm };
     TextureUsageFlags usage { TextureUsage::RenderAttachment };
     Vector<TextureFormat> viewFormats;

diff --git a/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUComputePassTimestampWrites.h b/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUComputePassTimestampWrites.h
@@ -28,13 +28,14 @@
 #include "WebGPUIntegralTypes.h"
 #include <wtf/Ref.h>
 #include <wtf/Vector.h>
+#include <wtf/WeakPtr.h>
 
 namespace WebCore::WebGPU {
 
 class QuerySet;
 
 struct ComputePassTimestampWrites {
-    QuerySet* querySet { nullptr };
+    WeakPtr<QuerySet> querySet;
     Size32 beginningOfPassWriteIndex { 0 };
     Size32 endOfPassWriteIndex { 0 };
 };

diff --git a/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUDevice.h b/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUDevice.h
@@ -36,6 +36,7 @@
 #include <wtf/CompletionHandler.h>
 #include <wtf/HashSet.h>
 #include <wtf/Ref.h>
+#include <wtf/WeakPtr.h>
 #include <wtf/text/WTFString.h>
 
 #if HAVE(IOSURFACE)
@@ -76,7 +77,7 @@ class Surface;
 class Texture;
 struct TextureDescriptor;
 
-class Device : public RefCounted<Device> {
+class Device : public RefCounted<Device>, public CanMakeWeakPtr<Device> {
 public:
     virtual ~Device() = default;
 

diff --git a/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUImageCopyBuffer.h b/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUImageCopyBuffer.h
@@ -27,13 +27,14 @@
 
 #include "WebGPUImageDataLayout.h"
 #include <wtf/Ref.h>
+#include <wtf/WeakRef.h>
 
 namespace WebCore::WebGPU {
 
 class Buffer;
 
 struct ImageCopyBuffer : public ImageDataLayout {
-    Buffer& buffer;
+    WeakRef<Buffer> buffer;
 };
 
 } // namespace WebCore::WebGPU
diff --git a/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUImageCopyTexture.h b/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUImageCopyTexture.h
@@ -30,13 +30,14 @@
 #include "WebGPUTextureAspect.h"
 #include <optional>
 #include <wtf/Ref.h>
+#include <wtf/WeakRef.h>
 
 namespace WebCore::WebGPU {
 
 class Texture;
 
 struct ImageCopyTexture {
-    Texture& texture;
+    WeakRef<Texture> texture;
     IntegerCoordinate mipLevel { 0 };
     std::optional<Origin3D> origin;
     TextureAspect aspect { TextureAspect::All };

diff --git a/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUPipelineDescriptorBase.h b/Source/WebCore/Modules/WebGPU/InternalAPI/WebGPUPipelineDescriptorBase.h
@@ -26,13 +26,14 @@
 #pragma once
 
 #include "WebGPUObjectDescriptorBase.h"
+#include <wtf/WeakPtr.h>
 
 namespace WebCore::WebGPU {
 
 class PipelineLayout;
 
 struct PipelineDescriptorBase : public ObjectDescriptorBase {
-    PipelineLayout* layout { nullptr };
+    WeakPtr<PipelineLayout> layout;
 };
 
 } // namespace WebCore::WebGPU