[webkit-changes] [WebKit/WebKit] b89163: [WebGPU] Unify Surface and SwapChain into a single...

Myles C. Maxfield noreply at github.com
Fri Jan 27 13:41:08 PST 2023 

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: b89163ea8850da68b52252c5d62c003000ad817c
      https://github.com/WebKit/WebKit/commit/b89163ea8850da68b52252c5d62c003000ad817c
  Author: Myles C. Maxfield <mmaxfield at apple.com>
  Date:   2023-01-27 (Fri, 27 Jan 2023)

  Changed paths:
    M Source/WebCore/Modules/WebGPU/GPU.cpp
    M Source/WebCore/Modules/WebGPU/GPU.h
    M Source/WebCore/Modules/WebGPU/GPUDevice.cpp
    M Source/WebCore/Modules/WebGPU/GPUDevice.h
    A Source/WebCore/Modules/WebGPU/GPUPresentationConfiguration.h
    A Source/WebCore/Modules/WebGPU/GPUPresentationContext.cpp
    A Source/WebCore/Modules/WebGPU/GPUPresentationContext.h
    A Source/WebCore/Modules/WebGPU/GPUPresentationContextDescriptor.h
    R Source/WebCore/Modules/WebGPU/GPUSurface.cpp
    R Source/WebCore/Modules/WebGPU/GPUSurface.h
    R Source/WebCore/Modules/WebGPU/GPUSurfaceDescriptor.h
    R Source/WebCore/Modules/WebGPU/GPUSwapChain.cpp
    R Source/WebCore/Modules/WebGPU/GPUSwapChain.h
    R Source/WebCore/Modules/WebGPU/GPUSwapChainDescriptor.h
    M Source/WebCore/Modules/credentialmanagement/BasicCredential.cpp
    M Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp
    M Source/WebCore/Modules/highlight/AppHighlightStorage.h
    M Source/WebCore/Modules/webaudio/BiquadFilterNode.cpp
    M Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
    M Source/WebCore/PAL/pal/CMakeLists.txt
    M Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUConvertToBackingContext.h
    M Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.cpp
    M Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.h
    M Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDowncastConvertToBackingContext.cpp
    M Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDowncastConvertToBackingContext.h
    M Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUImpl.cpp
    M Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUImpl.h
    A Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUPresentationContextImpl.cpp
    A Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUPresentationContextImpl.h
    R Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUSurfaceImpl.cpp
    R Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUSurfaceImpl.h
    R Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUSwapChainImpl.cpp
    R Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUSwapChainImpl.h
    M Source/WebCore/PAL/pal/graphics/WebGPU/WebGPU.h
    M Source/WebCore/PAL/pal/graphics/WebGPU/WebGPUDevice.h
    A Source/WebCore/PAL/pal/graphics/WebGPU/WebGPUPresentationConfiguration.h
    A Source/WebCore/PAL/pal/graphics/WebGPU/WebGPUPresentationContext.h
    A Source/WebCore/PAL/pal/graphics/WebGPU/WebGPUPresentationContextDescriptor.h
    R Source/WebCore/PAL/pal/graphics/WebGPU/WebGPUSurface.h
    R Source/WebCore/PAL/pal/graphics/WebGPU/WebGPUSurfaceDescriptor.h
    R Source/WebCore/PAL/pal/graphics/WebGPU/WebGPUSwapChain.h
    R Source/WebCore/PAL/pal/graphics/WebGPU/WebGPUSwapChainDescriptor.h
    M Source/WebCore/Sources.txt
    M Source/WebCore/WebCore.xcodeproj/project.pbxproj
    M Source/WebCore/html/canvas/GPUCanvasContextCocoa.cpp
    M Source/WebCore/html/canvas/GPUCanvasContextCocoa.h
    M Source/WebKit/CMakeLists.txt
    M Source/WebKit/DerivedSources-input.xcfilelist
    M Source/WebKit/DerivedSources-output.xcfilelist
    M Source/WebKit/DerivedSources.make
    M Source/WebKit/GPUProcess/graphics/WebGPU/RemoteDevice.cpp
    M Source/WebKit/GPUProcess/graphics/WebGPU/RemoteDevice.h
    M Source/WebKit/GPUProcess/graphics/WebGPU/RemoteDevice.messages.in
    M Source/WebKit/GPUProcess/graphics/WebGPU/RemoteGPU.cpp
    M Source/WebKit/GPUProcess/graphics/WebGPU/RemoteGPU.h
    M Source/WebKit/GPUProcess/graphics/WebGPU/RemoteGPU.messages.in
    A Source/WebKit/GPUProcess/graphics/WebGPU/RemotePresentationContext.cpp
    A Source/WebKit/GPUProcess/graphics/WebGPU/RemotePresentationContext.h
    A Source/WebKit/GPUProcess/graphics/WebGPU/RemotePresentationContext.messages.in
    R Source/WebKit/GPUProcess/graphics/WebGPU/RemoteSurface.cpp
    R Source/WebKit/GPUProcess/graphics/WebGPU/RemoteSurface.h
    R Source/WebKit/GPUProcess/graphics/WebGPU/RemoteSurface.messages.in
    R Source/WebKit/GPUProcess/graphics/WebGPU/RemoteSwapChain.cpp
    R Source/WebKit/GPUProcess/graphics/WebGPU/RemoteSwapChain.h
    R Source/WebKit/GPUProcess/graphics/WebGPU/RemoteSwapChain.messages.in
    M Source/WebKit/GPUProcess/graphics/WebGPU/WebGPUObjectHeap.cpp
    M Source/WebKit/GPUProcess/graphics/WebGPU/WebGPUObjectHeap.h
    M Source/WebKit/Scripts/webkit/messages.py
    M Source/WebKit/Shared/WebGPU/WebGPUConvertFromBackingContext.h
    M Source/WebKit/Shared/WebGPU/WebGPUConvertToBackingContext.h
    A Source/WebKit/Shared/WebGPU/WebGPUPresentationConfiguration.cpp
    A Source/WebKit/Shared/WebGPU/WebGPUPresentationConfiguration.h
    A Source/WebKit/Shared/WebGPU/WebGPUPresentationConfiguration.serialization.in
    A Source/WebKit/Shared/WebGPU/WebGPUPresentationContextDescriptor.cpp
    A Source/WebKit/Shared/WebGPU/WebGPUPresentationContextDescriptor.h
    A Source/WebKit/Shared/WebGPU/WebGPUPresentationContextDescriptor.serialization.in
    R Source/WebKit/Shared/WebGPU/WebGPUSurfaceDescriptor.cpp
    R Source/WebKit/Shared/WebGPU/WebGPUSurfaceDescriptor.h
    R Source/WebKit/Shared/WebGPU/WebGPUSurfaceDescriptor.serialization.in
    R Source/WebKit/Shared/WebGPU/WebGPUSwapChainDescriptor.cpp
    R Source/WebKit/Shared/WebGPU/WebGPUSwapChainDescriptor.h
    R Source/WebKit/Shared/WebGPU/WebGPUSwapChainDescriptor.serialization.in
    M Source/WebKit/Sources.txt
    M Source/WebKit/WebKit.xcodeproj/project.pbxproj
    M Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteDeviceProxy.cpp
    M Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteDeviceProxy.h
    M Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteGPUProxy.cpp
    M Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteGPUProxy.h
    A Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemotePresentationContextProxy.cpp
    A Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemotePresentationContextProxy.h
    R Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteSurfaceProxy.cpp
    R Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteSurfaceProxy.h
    R Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteSwapChainProxy.cpp
    R Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteSwapChainProxy.h
    M Source/WebKit/WebProcess/GPU/graphics/WebGPU/WebGPUDowncastConvertToBackingContext.cpp
    M Source/WebKit/WebProcess/GPU/graphics/WebGPU/WebGPUDowncastConvertToBackingContext.h

  Log Message:
  -----------
  [WebGPU] Unify Surface and SwapChain into a single class
https://bugs.webkit.org/show_bug.cgi?id=251248
rdar://104729119

Reviewed by Dean Jackson.

The WebGPU spec has unified GPUCanvasContext and GPUSwapChain into a single type, so that's
what this patch does. However, I want to leave the door open for us to be able to implement
browser features that have nothing to do with canvas using WebGPU, so I named this unified
class PresentationContext instead of CanvasContext. This matches the same unification that
I did in https://commits.webkit.org/258984@main.

The previous model was:
- You create a Surface using a descriptor
- With the surface you could create a Swap Chain, using a descriptor
- The Swap Chain could be destroyed

The new model is:
- You create a PresentationContext using a descriptor (this part is almost unchanged)
- You configure the PresentationContext using a configuration. The configuration takes the
      place of the previous second descriptor.
- You can unconfigure the PresentationContext.

This patch doesn't modify WebGPU.h, and there's a pretty straightforward mapping between
the two models in pal/graphics/WebGPU/Impl.

* Source/WebCore/Modules/WebGPU/GPU.cpp:
(WebCore::GPU::createPresentationContext):
(WebCore::GPU::createSurface): Deleted.
* Source/WebCore/Modules/WebGPU/GPU.h:
* Source/WebCore/Modules/WebGPU/GPUDevice.cpp:
(WebCore::GPUDevice::createSurfaceTexture):
(WebCore::GPUDevice::createSwapChain): Deleted.
* Source/WebCore/Modules/WebGPU/GPUDevice.h:
* Source/WebCore/Modules/WebGPU/GPUPresentationConfiguration.h: Renamed from Source/WebCore/Modules/WebGPU/GPUSwapChainDescriptor.h.
(WebCore::GPUPresentationConfiguration::convertToBacking const):
* Source/WebCore/Modules/WebGPU/GPUPresentationContext.cpp: Renamed from Source/WebCore/Modules/WebGPU/GPUSwapChain.cpp.
(WebCore::GPUPresentationContext::configure):
(WebCore::GPUPresentationContext::unconfigure):
(WebCore::GPUPresentationContext::getCurrentTexture):
(WebCore::GPUPresentationContext::prepareForDisplay):
* Source/WebCore/Modules/WebGPU/GPUPresentationContext.h: Renamed from Source/WebCore/Modules/WebGPU/GPUSwapChain.h.
(WebCore::GPUPresentationContext::create):
(WebCore::GPUPresentationContext::backing):
(WebCore::GPUPresentationContext::backing const):
(WebCore::GPUPresentationContext::GPUPresentationContext):
* Source/WebCore/Modules/WebGPU/GPUPresentationContextDescriptor.h: Renamed from Source/WebCore/Modules/WebGPU/GPUSurfaceDescriptor.h.
(WebCore::GPUPresentationContextDescriptor::convertToBacking const):
* Source/WebCore/Modules/WebGPU/GPUSurface.cpp: Removed.
* Source/WebCore/Modules/WebGPU/GPUSurface.h: Removed.
* Source/WebCore/Modules/credentialmanagement/BasicCredential.cpp:
* Source/WebCore/Modules/highlight/AppHighlightStorage.h:
* Source/WebCore/Modules/webaudio/BiquadFilterNode.cpp:
* Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj:
* Source/WebCore/PAL/pal/CMakeLists.txt:
* Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUConvertToBackingContext.h:
* Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.cpp:
(PAL::WebGPU::DeviceImpl::createSurfaceTexture):
(PAL::WebGPU::DeviceImpl::createSwapChain): Deleted.
* Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDeviceImpl.h:
* Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDowncastConvertToBackingContext.cpp:
(PAL::WebGPU::DowncastConvertToBackingContext::convertToBacking):
* Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUDowncastConvertToBackingContext.h:
* Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUImpl.cpp:
(PAL::WebGPU::GPUImpl::createPresentationContext):
(PAL::WebGPU::GPUImpl::createSurface): Deleted.
* Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUImpl.h:
* Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUPresentationContextImpl.cpp: Added.
(PAL::WebGPU::PresentationContextImpl::PresentationContextImpl):
(PAL::WebGPU::PresentationContextImpl::~PresentationContextImpl):
(PAL::WebGPU::PresentationContextImpl::drawingBuffer const):
(PAL::WebGPU::PresentationContextImpl::configure):
(PAL::WebGPU::PresentationContextImpl::unconfigure):
(PAL::WebGPU::PresentationContextImpl::getCurrentTexture):
(PAL::WebGPU::PresentationContextImpl::prepareForDisplay):
* Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUPresentationContextImpl.h: Renamed from Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUSurfaceImpl.h.
* Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUSurfaceImpl.cpp: Removed.
* Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUSwapChainImpl.cpp: Removed.
* Source/WebCore/PAL/pal/graphics/WebGPU/Impl/WebGPUSwapChainImpl.h: Removed.
* Source/WebCore/PAL/pal/graphics/WebGPU/WebGPU.h:
* Source/WebCore/PAL/pal/graphics/WebGPU/WebGPUDevice.h:
* Source/WebCore/PAL/pal/graphics/WebGPU/WebGPUPresentationConfiguration.h: Renamed from Source/WebCore/PAL/pal/graphics/WebGPU/WebGPUSwapChainDescriptor.h.
* Source/WebCore/PAL/pal/graphics/WebGPU/WebGPUPresentationContext.h: Renamed from Source/WebCore/PAL/pal/graphics/WebGPU/WebGPUSwapChain.h.
* Source/WebCore/PAL/pal/graphics/WebGPU/WebGPUPresentationContextDescriptor.h: Renamed from Source/WebCore/PAL/pal/graphics/WebGPU/WebGPUSurfaceDescriptor.h.
* Source/WebCore/PAL/pal/graphics/WebGPU/WebGPUSurface.h: Removed.
* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/html/canvas/GPUCanvasContextCocoa.cpp:
(WebCore::GPUCanvasContextCocoa::reshape):
(WebCore::GPUCanvasContextCocoa::createPresentationContextIfNeeded):
(WebCore::GPUCanvasContextCocoa::getCurrentTexture):
(WebCore::GPUCanvasContextCocoa::prepareForDisplay):
(WebCore::GPUCanvasContextCocoa::createSwapChainIfNeeded): Deleted.
* Source/WebCore/html/canvas/GPUCanvasContextCocoa.h:
* Source/WebKit/CMakeLists.txt:
* Source/WebKit/DerivedSources-input.xcfilelist:
* Source/WebKit/DerivedSources-output.xcfilelist:
* Source/WebKit/DerivedSources.make:
* Source/WebKit/GPUProcess/graphics/WebGPU/RemoteDevice.cpp:
(WebKit::RemoteDevice::createSurfaceTexture):
(WebKit::RemoteDevice::createSwapChain): Deleted.
* Source/WebKit/GPUProcess/graphics/WebGPU/RemoteDevice.h:
* Source/WebKit/GPUProcess/graphics/WebGPU/RemoteDevice.messages.in:
* Source/WebKit/GPUProcess/graphics/WebGPU/RemoteGPU.cpp:
(WebKit::RemoteGPU::createPresentationContext):
(WebKit::RemoteGPU::createSurface): Deleted.
* Source/WebKit/GPUProcess/graphics/WebGPU/RemoteGPU.h:
* Source/WebKit/GPUProcess/graphics/WebGPU/RemoteGPU.messages.in:
* Source/WebKit/GPUProcess/graphics/WebGPU/RemotePresentationContext.cpp: Renamed from Source/WebKit/GPUProcess/graphics/WebGPU/RemoteSwapChain.cpp.
(WebKit::RemotePresentationContext::RemotePresentationContext):
(WebKit::RemotePresentationContext::stopListeningForIPC):
(WebKit::RemotePresentationContext::configure):
(WebKit::RemotePresentationContext::unconfigure):
(WebKit::RemotePresentationContext::getCurrentTexture):
(WebKit::RemotePresentationContext::prepareForDisplay):
* Source/WebKit/GPUProcess/graphics/WebGPU/RemotePresentationContext.h: Renamed from Source/WebKit/GPUProcess/graphics/WebGPU/RemoteSwapChain.h.
* Source/WebKit/GPUProcess/graphics/WebGPU/RemotePresentationContext.messages.in: Renamed from Source/WebKit/GPUProcess/graphics/WebGPU/RemoteSwapChain.messages.in.
* Source/WebKit/GPUProcess/graphics/WebGPU/RemoteSurface.cpp: Removed.
* Source/WebKit/GPUProcess/graphics/WebGPU/RemoteSurface.h: Removed.
* Source/WebKit/GPUProcess/graphics/WebGPU/RemoteSurface.messages.in: Removed.
* Source/WebKit/GPUProcess/graphics/WebGPU/WebGPUObjectHeap.cpp:
(WebKit::WebGPU::ObjectHeap::addObject):
(WebKit::WebGPU::ObjectHeap::convertPresentationContextFromBacking):
(WebKit::WebGPU::ObjectHeap::ObjectHeap): Deleted.
(WebKit::WebGPU::ObjectHeap::~ObjectHeap): Deleted.
(WebKit::WebGPU::ObjectHeap::convertSurfaceFromBacking): Deleted.
(WebKit::WebGPU::ObjectHeap::convertSwapChainFromBacking): Deleted.
* Source/WebKit/GPUProcess/graphics/WebGPU/WebGPUObjectHeap.h:
* Source/WebKit/Scripts/webkit/messages.py:
(headers_for_type):
* Source/WebKit/Shared/WebGPU/WebGPUConvertFromBackingContext.h:
* Source/WebKit/Shared/WebGPU/WebGPUConvertToBackingContext.h:
* Source/WebKit/Shared/WebGPU/WebGPUPresentationConfiguration.cpp: Renamed from Source/WebKit/Shared/WebGPU/WebGPUSwapChainDescriptor.cpp.
(WebKit::WebGPU::ConvertToBackingContext::convertToBacking):
(WebKit::WebGPU::ConvertFromBackingContext::convertFromBacking):
* Source/WebKit/Shared/WebGPU/WebGPUPresentationConfiguration.h: Renamed from Source/WebKit/Shared/WebGPU/WebGPUSwapChainDescriptor.h.
* Source/WebKit/Shared/WebGPU/WebGPUPresentationConfiguration.serialization.in: Renamed from Source/WebKit/Shared/WebGPU/WebGPUSwapChainDescriptor.serialization.in.
* Source/WebKit/Shared/WebGPU/WebGPUPresentationContextDescriptor.cpp: Renamed from Source/WebKit/Shared/WebGPU/WebGPUSurfaceDescriptor.cpp.
(WebKit::WebGPU::ConvertToBackingContext::convertToBacking):
(WebKit::WebGPU::ConvertFromBackingContext::convertFromBacking):
* Source/WebKit/Shared/WebGPU/WebGPUPresentationContextDescriptor.h: Renamed from Source/WebKit/Shared/WebGPU/WebGPUSurfaceDescriptor.h.
* Source/WebKit/Shared/WebGPU/WebGPUPresentationContextDescriptor.serialization.in: Renamed from Source/WebKit/Shared/WebGPU/WebGPUSurfaceDescriptor.serialization.in.
* Source/WebKit/Sources.txt:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteDeviceProxy.cpp:
(WebKit::WebGPU::RemoteDeviceProxy::createSurfaceTexture):
(WebKit::WebGPU::RemoteDeviceProxy::createSwapChain): Deleted.
* Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteDeviceProxy.h:
* Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteGPUProxy.cpp:
(WebKit::RemoteGPUProxy::createPresentationContext):
(WebKit::RemoteGPUProxy::createSurface): Deleted.
* Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteGPUProxy.h:
* Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemotePresentationContextProxy.cpp: Renamed from Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteSwapChainProxy.cpp.
(WebKit::WebGPU::RemotePresentationContextProxy::RemotePresentationContextProxy):
(WebKit::WebGPU::RemotePresentationContextProxy::configure):
(WebKit::WebGPU::RemotePresentationContextProxy::unconfigure):
(WebKit::WebGPU::RemotePresentationContextProxy::getCurrentTexture):
(WebKit::WebGPU::RemotePresentationContextProxy::prepareForDisplay):
* Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemotePresentationContextProxy.h: Renamed from Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteSurfaceProxy.h.
* Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteSurfaceProxy.cpp: Removed.
* Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteSwapChainProxy.h: Removed.
* Source/WebKit/WebProcess/GPU/graphics/WebGPU/WebGPUDowncastConvertToBackingContext.cpp:
(WebKit::WebGPU::DowncastConvertToBackingContext::convertToBacking):
* Source/WebKit/WebProcess/GPU/graphics/WebGPU/WebGPUDowncastConvertToBackingContext.h:

Canonical link: https://commits.webkit.org/259508@main

More information about the webkit-changes mailing list