[webkit-changes] [WebKit/WebKit] f784ae: Reduce exposure of ImageBuffer's backend implement...

Tim Horton noreply at github.com
Fri Dec 1 13:20:47 PST 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: f784aeef6e0a7be2725bf8e003511a7501683081
      https://github.com/WebKit/WebKit/commit/f784aeef6e0a7be2725bf8e003511a7501683081
  Author: Tim Horton <timothy_horton at apple.com>
  Date:   2023-12-01 (Fri, 01 Dec 2023)

  Changed paths:
    M Source/WebCore/platform/graphics/ImageBuffer.cpp
    M Source/WebCore/platform/graphics/ImageBuffer.h
    M Source/WebKit/GPUProcess/graphics/ImageBufferShareableAllocator.cpp
    M Source/WebKit/GPUProcess/graphics/RemoteImageBuffer.cpp
    M Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp
    M Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm
    M Source/WebKit/Shared/RemoteLayerTree/RemoteLayerWithRemoteRenderingBackingStoreCollection.mm
    M Source/WebKit/Shared/WebImage.cpp
    M Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.cpp
    M Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h
    M Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp
    M Source/WebKit/WebProcess/WebPage/RemoteLayerTree/GraphicsLayerCARemote.mm
    M Source/WebKit/WebProcess/WebPage/wc/DrawingAreaWC.cpp
    M Source/WebKit/WebProcess/WebPage/wc/WCBackingStore.h

  Log Message:
  -----------
  Reduce exposure of ImageBuffer's backend implementation detail
https://bugs.webkit.org/show_bug.cgi?id=265623

Reviewed by Matt Woodrow.

In preparation for an ImageBuffer subclass that owns multiple backends,
try to reduce non-ImageBuffer code's ability to get ahold of the backend directly.

To do this:
- rename ensureBackendCreated() to ensureBackend(); it still creates and returns the backend
- add ensureBackendCreated(), which creates but does not return the backend
- remove takeBackend(), which is unused
- add toBackendSharing(), which just delegates to the backend internally
- add transferToNewContext(), which just delegates to the backend internally
- add hasBackend(), which just returns the existence of the backend but does not expose it
- make backend() and ensureBackend() protected, entirely isolating the backend from the rest of WebCore

There is definitely more cleanup to be done; it seems prudent to eventually further
hide the backend from ImageBuffer clients (but we still have e.g. ensureBackendCreated
and hasBackend,  and the whole ImageBufferBackendSharing class structure
unnecessarily uses the "Backend" naming).

* Source/WebCore/platform/graphics/ImageBuffer.cpp:
(WebCore::ImageBuffer::flushDrawingContext):
(WebCore::ImageBuffer::copyNativeImage const):
(WebCore::ImageBuffer::createNativeImageReference const):
(WebCore::ImageBuffer::sinkIntoNativeImage):
(WebCore::ImageBuffer::filteredNativeImage):
(WebCore::ImageBuffer::createCairoSurface):
(WebCore::ImageBuffer::convertToLuminanceMask):
(WebCore::ImageBuffer::transformToColorSpace):
(WebCore::ImageBuffer::getPixelBuffer const):
(WebCore::ImageBuffer::putPixelBuffer):
(WebCore::ImageBuffer::isInUse const):
(WebCore::ImageBuffer::releaseGraphicsContext):
(WebCore::ImageBuffer::setVolatile):
(WebCore::ImageBuffer::setNonVolatile):
(WebCore::ImageBuffer::volatilityState const):
(WebCore::ImageBuffer::setVolatilityState):
(WebCore::ImageBuffer::createFlusher):
(WebCore::ImageBuffer::toBackendSharing):
(WebCore::ImageBuffer::transferToNewContext):
(WebCore::ImageBuffer::takeBackend): Deleted.
* Source/WebCore/platform/graphics/ImageBuffer.h:
(WebCore::ImageBuffer::ensureBackendCreated const):
(WebCore::ImageBuffer::hasBackend):
(WebCore::ImageBuffer::backend const):
(WebCore::ImageBuffer::ensureBackend const):
* Source/WebKit/GPUProcess/graphics/ImageBufferShareableAllocator.cpp:
(WebKit::ImageBufferShareableAllocator::createImageBuffer const):
* Source/WebKit/GPUProcess/graphics/RemoteImageBuffer.cpp:
(WebKit::RemoteImageBuffer::~RemoteImageBuffer):
* Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp:
(WebKit::RemoteRenderingBackend::didCreateImageBuffer):
(WebKit::RemoteRenderingBackend::moveToImageBuffer):
(WebKit::handleFromBuffer):
* Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm:
(WebKit::RemoteLayerBackingStore::encode const):
* Source/WebKit/Shared/RemoteLayerTree/RemoteLayerWithRemoteRenderingBackingStoreCollection.mm:
(WebKit::RemoteLayerWithRemoteRenderingBackingStoreCollection::collectBackingStoreBufferIdentifiersToMarkVolatile):
* Source/WebKit/Shared/WebImage.cpp:
(WebKit::WebImage::bitmap const):
(WebKit::WebImage::createHandle const):
* Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.cpp:
(WebKit::RemoteImageBufferProxy::ensureBackend const):
(WebKit::RemoteImageBufferProxy::prepareForBackingStoreChange):
(WebKit::RemoteImageBufferProxy::sinkIntoSerializedImageBuffer):
(WebKit::RemoteImageBufferProxy::ensureBackendCreated const): Deleted.
* Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h:
* Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp:
(WebKit::RemoteRenderingBackendProxy::prepareBuffersForDisplay):
* Source/WebKit/WebProcess/WebPage/RemoteLayerTree/GraphicsLayerCARemote.mm:
* Source/WebKit/WebProcess/WebPage/wc/DrawingAreaWC.cpp:
(WebKit::DrawingAreaWC::sendUpdateNonAC):
* Source/WebKit/WebProcess/WebPage/wc/WCBackingStore.h:
(WebKit::WCBackingStore::encode const):

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




More information about the webkit-changes mailing list