[webkit-changes] [WebKit/WebKit] d5ada7: Remove LocalResourceHeap and QualifiedResourceHeap

Said Abou-Hallawa noreply at github.com
Fri Aug 18 10:43:35 PDT 2023 

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: d5ada78e4261372ca6fb26a7ae6d12f9d73f5d9c
      https://github.com/WebKit/WebKit/commit/d5ada78e4261372ca6fb26a7ae6d12f9d73f5d9c
  Author: Said Abou-Hallawa <said at apple.com>
  Date:   2023-08-18 (Fri, 18 Aug 2023)

  Changed paths:
    M Source/WebCore/platform/graphics/displaylists/DisplayList.cpp
    M Source/WebCore/platform/graphics/displaylists/DisplayList.h
    M Source/WebCore/platform/graphics/displaylists/DisplayListResourceHeap.h
    M Source/WebKit/GPUProcess/ShapeDetection/RemoteBarcodeDetector.cpp
    M Source/WebKit/GPUProcess/ShapeDetection/RemoteFaceDetector.cpp
    M Source/WebKit/GPUProcess/ShapeDetection/RemoteTextDetector.cpp
    R Source/WebKit/GPUProcess/graphics/QualifiedRenderingResourceIdentifier.h
    R Source/WebKit/GPUProcess/graphics/QualifiedResourceHeap.h
    M Source/WebKit/GPUProcess/graphics/RemoteDisplayListRecorder.cpp
    M Source/WebKit/GPUProcess/graphics/RemoteDisplayListRecorder.h
    M Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.cpp
    M Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.h
    M Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp
    M Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.h
    M Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.messages.in
    M Source/WebKit/GPUProcess/graphics/RemoteResourceCache.cpp
    M Source/WebKit/GPUProcess/graphics/RemoteResourceCache.h
    M Source/WebKit/WebKit.xcodeproj/project.pbxproj
    M Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp
    M Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h
    M Source/WebKit/WebProcess/GPU/graphics/RemoteResourceCacheProxy.cpp
    M Tools/TestWebKitAPI/Tests/IPC/StreamConnectionTests.cpp
    M Tools/TestWebKitAPI/Tests/WebCore/cg/DisplayListTestsCG.cpp

  Log Message:
  -----------
  Remove LocalResourceHeap and QualifiedResourceHeap
https://bugs.webkit.org/show_bug.cgi?id=260283
rdar://113983207

Reviewed by Kimmo Kinnunen.

Move all the implementation of LocalResourceHeap to ResourceHeap.

Replace QualifiedResourceHeap with ResourceHeap since qualifying the HashMap key
RenderingResourceIdentifier with the ProcessIdentifer provides a redundant
protection.

Remove the ProcessIdentifer member of RemoteResourceCache since the owner
RemoteRenderingBackend never changes it.

* Source/WebCore/platform/graphics/displaylists/DisplayList.cpp:
(WebCore::DisplayList::DisplayList::clear):
* Source/WebCore/platform/graphics/displaylists/DisplayList.h:
* Source/WebCore/platform/graphics/displaylists/DisplayListResourceHeap.h:
(WebCore::DisplayList::ResourceHeap::add):
(WebCore::DisplayList::ResourceHeap::getImageBuffer const):
(WebCore::DisplayList::ResourceHeap::getNativeImage const):
(WebCore::DisplayList::ResourceHeap::getSourceImage const):
(WebCore::DisplayList::ResourceHeap::getDecomposedGlyphs const):
(WebCore::DisplayList::ResourceHeap::getGradient const):
(WebCore::DisplayList::ResourceHeap::getFilter const):
(WebCore::DisplayList::ResourceHeap::getFont const):
(WebCore::DisplayList::ResourceHeap::getFontCustomPlatformData const):
(WebCore::DisplayList::ResourceHeap::resources const):
(WebCore::DisplayList::ResourceHeap::removeImageBuffer):
(WebCore::DisplayList::ResourceHeap::removeRenderingResource):
(WebCore::DisplayList::ResourceHeap::removeFont):
(WebCore::DisplayList::ResourceHeap::removeFontCustomPlatformData):
(WebCore::DisplayList::ResourceHeap::clearAllResources):
(WebCore::DisplayList::ResourceHeap::clearAllImageResources):
(WebCore::DisplayList::ResourceHeap::clearAllDrawingResources):
(WebCore::DisplayList::ResourceHeap::get const):
(WebCore::DisplayList::ResourceHeap::remove):
(WebCore::DisplayList::ResourceHeap::checkInvariants const):
(WebCore::DisplayList::LocalResourceHeap::add): Deleted.
(WebCore::DisplayList::LocalResourceHeap::clear): Deleted.
(WebCore::DisplayList::LocalResourceHeap::get const): Deleted.
* Source/WebKit/GPUProcess/ShapeDetection/RemoteBarcodeDetector.cpp:
(WebKit::RemoteBarcodeDetector::detect):
* Source/WebKit/GPUProcess/ShapeDetection/RemoteFaceDetector.cpp:
(WebKit::RemoteFaceDetector::detect):
* Source/WebKit/GPUProcess/ShapeDetection/RemoteTextDetector.cpp:
(WebKit::RemoteTextDetector::detect):
* Source/WebKit/GPUProcess/graphics/QualifiedRenderingResourceIdentifier.h: Removed.
* Source/WebKit/GPUProcess/graphics/QualifiedResourceHeap.h: Removed.
* Source/WebKit/GPUProcess/graphics/RemoteDisplayListRecorder.cpp:
(WebKit::RemoteDisplayListRecorder::RemoteDisplayListRecorder):
(WebKit::RemoteDisplayListRecorder::startListeningForIPC):
(WebKit::RemoteDisplayListRecorder::stopListeningForIPC):
(WebKit::RemoteDisplayListRecorder::setState):
(WebKit::RemoteDisplayListRecorder::clipToImageBuffer):
(WebKit::RemoteDisplayListRecorder::drawFilteredImageBufferInternal):
(WebKit::RemoteDisplayListRecorder::drawFilteredImageBuffer):
(WebKit::RemoteDisplayListRecorder::drawGlyphs):
(WebKit::RemoteDisplayListRecorder::drawDecomposedGlyphs):
(WebKit::RemoteDisplayListRecorder::drawImageBuffer):
(WebKit::RemoteDisplayListRecorder::drawNativeImage):
(WebKit::RemoteDisplayListRecorder::drawSystemImage):
(WebKit::RemoteDisplayListRecorder::drawPattern):
(WebKit::RemoteDisplayListRecorder::clipToImageBufferWithQualifiedIdentifier): Deleted.
(WebKit::RemoteDisplayListRecorder::drawGlyphsWithQualifiedIdentifier): Deleted.
(WebKit::RemoteDisplayListRecorder::drawDecomposedGlyphsWithQualifiedIdentifiers): Deleted.
(WebKit::RemoteDisplayListRecorder::drawImageBufferWithQualifiedIdentifier): Deleted.
(WebKit::RemoteDisplayListRecorder::drawNativeImageWithQualifiedIdentifier): Deleted.
(WebKit::RemoteDisplayListRecorder::drawPatternWithQualifiedIdentifier): Deleted.
* Source/WebKit/GPUProcess/graphics/RemoteDisplayListRecorder.h:
(WebKit::RemoteDisplayListRecorder::create):
* Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.cpp:
(WebKit::RemoteGraphicsContextGL::paintRenderingResultsToCanvas):
(WebKit::RemoteGraphicsContextGL::paintCompositedResultsToCanvas):
(WebKit::RemoteGraphicsContextGL::paintNativeImageToImageBuffer):
(WebKit::RemoteGraphicsContextGL::paintRenderingResultsToCanvasWithQualifiedIdentifier): Deleted.
(WebKit::RemoteGraphicsContextGL::paintCompositedResultsToCanvasWithQualifiedIdentifier): Deleted.
* Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.h:
* Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp:
(WebKit::RemoteRenderingBackend::RemoteRenderingBackend):
(WebKit::RemoteRenderingBackend::workQueueUninitialize):
(WebKit::RemoteRenderingBackend::didCreateImageBuffer):
(WebKit::RemoteRenderingBackend::moveToSerializedBuffer):
(WebKit::RemoteRenderingBackend::moveToImageBuffer):
(WebKit::RemoteRenderingBackend::createImageBuffer):
(WebKit::RemoteRenderingBackend::getPixelBufferForImageBuffer):
(WebKit::RemoteRenderingBackend::getPixelBufferForImageBufferWithNewMemory):
(WebKit::RemoteRenderingBackend::putPixelBufferForImageBuffer):
(WebKit::RemoteRenderingBackend::getShareableBitmapForImageBuffer):
(WebKit::RemoteRenderingBackend::getFilteredImageForImageBuffer):
(WebKit::RemoteRenderingBackend::cacheNativeImage):
(WebKit::RemoteRenderingBackend::cacheFont):
(WebKit::RemoteRenderingBackend::cacheFontCustomPlatformData):
(WebKit::RemoteRenderingBackend::cacheDecomposedGlyphs):
(WebKit::RemoteRenderingBackend::cacheGradient):
(WebKit::RemoteRenderingBackend::cacheFilter):
(WebKit::RemoteRenderingBackend::releaseAllDrawingResources):
(WebKit::RemoteRenderingBackend::releaseRenderingResource):
(WebKit::RemoteRenderingBackend::prepareLayerBuffersForDisplay):
(WebKit::RemoteRenderingBackend::markSurfacesVolatile):
(WebKit::RemoteRenderingBackend::getShareableBitmapForImageBufferWithQualifiedIdentifier): Deleted.
(WebKit::RemoteRenderingBackend::cacheNativeImageWithQualifiedIdentifier): Deleted.
(WebKit::RemoteRenderingBackend::cacheFontWithQualifiedIdentifier): Deleted.
(WebKit::RemoteRenderingBackend::cacheFontCustomPlatformDataWithQualifiedIdentifier): Deleted.
(WebKit::RemoteRenderingBackend::cacheDecomposedGlyphsWithQualifiedIdentifier): Deleted.
(WebKit::RemoteRenderingBackend::cacheGradientWithQualifiedIdentifier): Deleted.
(WebKit::RemoteRenderingBackend::cacheFilterWithQualifiedIdentifier): Deleted.
(WebKit::RemoteRenderingBackend::releaseAllResources): Deleted.
(WebKit::RemoteRenderingBackend::releaseRenderingResourceWithQualifiedIdentifier): Deleted.
* Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.h:
* Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.messages.in:
* Source/WebKit/GPUProcess/graphics/RemoteResourceCache.cpp:
(WebKit::RemoteResourceCache::cacheImageBuffer):
(WebKit::RemoteResourceCache::cachedImageBuffer const):
(WebKit::RemoteResourceCache::takeImageBuffer):
(WebKit::RemoteResourceCache::cacheNativeImage):
(WebKit::RemoteResourceCache::cacheDecomposedGlyphs):
(WebKit::RemoteResourceCache::cacheGradient):
(WebKit::RemoteResourceCache::cacheFilter):
(WebKit::RemoteResourceCache::cachedNativeImage const):
(WebKit::RemoteResourceCache::cachedSourceImage const):
(WebKit::RemoteResourceCache::cacheFont):
(WebKit::RemoteResourceCache::cachedFont const):
(WebKit::RemoteResourceCache::cacheFontCustomPlatformData):
(WebKit::RemoteResourceCache::cachedFontCustomPlatformData const):
(WebKit::RemoteResourceCache::cachedDecomposedGlyphs const):
(WebKit::RemoteResourceCache::cachedGradient const):
(WebKit::RemoteResourceCache::cachedFilter const):
(WebKit::RemoteResourceCache::releaseAllResources):
(WebKit::RemoteResourceCache::releaseAllDrawingResources):
(WebKit::RemoteResourceCache::releaseAllImageResources):
(WebKit::RemoteResourceCache::releaseRenderingResource):
(WebKit::RemoteResourceCache::RemoteResourceCache): Deleted.
* Source/WebKit/GPUProcess/graphics/RemoteResourceCache.h:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp:
(WebKit::RemoteRenderingBackendProxy::releaseAllDrawingResources):
(WebKit::RemoteRenderingBackendProxy::releaseAllRemoteResources): Deleted.
* Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h:
* Source/WebKit/WebProcess/GPU/graphics/RemoteResourceCacheProxy.cpp:
(WebKit::RemoteResourceCacheProxy::releaseMemory):
* Tools/TestWebKitAPI/Tests/IPC/StreamConnectionTests.cpp:
* Tools/TestWebKitAPI/Tests/WebCore/cg/DisplayListTestsCG.cpp:
(TestWebKitAPI::TEST):

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

More information about the webkit-changes mailing list