Changeset 289518 in webkit

Timestamp:

Feb 9, 2022, 9:18:02 PM (5 years ago)

Author:

Said Abou-Hallawa

Message:

[GPU Process] Move ImageBuffer::createCompatibleImageBuffer() and SVGRenderingContext::createImageBuffer to GraphicsContext
​https://bugs.webkit.org/show_bug.cgi?id=235758
rdar://88478470

Reviewed by Simon Fraser.

Source/WebCore:

The goal of this patch is to record the drawing if the concrete type of
the GraphicsContext is RemoteDisplayListRecorderProxy. Currently all the
intermediate compatible ImageBuffers are of type ConcreteImageBuffer.
The drawing to these ImageBuffers still happens in the WebProcess. Moreover
when we call drawImageBuffer() or clipToImageBuffer() for one of these
intermediate ImageBuffers to a remote ImageBuffer, we have to sink the
intermediate ImageBuffer to a NativeImage and send it to GPUProcess.

To fix this, the new enum 'RenderingMethod' will be used when creating
the ImageBuffer methods. The value of RenderingMethod can be one of the
following constants:

1. Default: The type of the created ImageBuffer will match the type of the underlying ImageBuffer of the GraphicsContext.

2. DisplayList: A DisplayList::ImageBuffer will be created whose GraphicsContext will be of type DisplayList::RecorderImpl.

3. Local: The ImageBuffer will be of type ConcreteImageBuffer and it will hold a platform GraphicsContext.

Also GraphicsContext will provide these functions for creating an
ImageBuffer:

1. GraphicsContext::createImageBuffer() (virtual): Creates a ConcreteImageBuffer or a DisplayList::ImageBuffer. The type of the created ImageBuffer is controlled by the argument 'renderingMethod'. Because RemoteDisplayListRecorderProxy is a super class of GraphicsContext, it overrides this method and returns the desired RemoteImageBuffer. RemoteDisplayListRecorderProxy has access to RemotRenderingBackendProxy so it can call its createImageBuffer().

2. GraphicsContext::createImageBuffer() (non-virtual): Creates a scaled ImageBuffer and sets the context accordingly. The type of the created ImageBuffer is controlled by the argument 'renderingMethod'.

3. GraphicsContext::createCompatibleImageBuffer() (virtual): Takes the scaleFactor() into consideration when creating the ImageBuffer. RemoteDisplayListRecorderProxy will override this function to return an Unaccelerated ImageBuffer if 'renderingMethod != Default'. This is to ensure that for GPUProcess drawing, no intermediate local ImageBuffers will draw to an IOSurface in WebProcess.

Two versions of these functions are provided: one takes a FloatSize and
the other takes a FloatRecct. The FloatRect version expands the four
corners of the rectangle to full pixels.

• html/CustomPaintCanvas.cpp:

(WebCore::CustomPaintCanvas::replayDisplayList const):

• html/CustomPaintImage.cpp:

(WebCore::CustomPaintImage::drawPattern):

• html/OffscreenCanvas.cpp:

(WebCore::OffscreenCanvas::transferToImageBitmap):
(WebCore::OffscreenCanvas::commitToPlaceholderCanvas):

• html/canvas/CanvasRenderingContext2DBase.cpp:

(WebCore::CanvasRenderingContext2DBase::drawImage):

• platform/cocoa/ThemeCocoa.mm:

(WebCore::drawApplePayButton):

• platform/graphics/BitmapImage.cpp:

(WebCore::BitmapImage::drawPattern):

• platform/graphics/CrossfadeGeneratedImage.cpp:

(WebCore::CrossfadeGeneratedImage::drawPattern):

• platform/graphics/GradientImage.cpp:

(WebCore::GradientImage::drawPattern):

• platform/graphics/GraphicsContext.cpp:

(WebCore::scaledImageBufferSize):
(WebCore::scaledImageBufferRect):
(WebCore::clampingScaleForImageBufferSize):
(WebCore::GraphicsContext::compatibleImageBufferSize const):
(WebCore::GraphicsContext::createImageBuffer const):
(WebCore::GraphicsContext::createCompatibleImageBuffer const):
(WebCore::GraphicsContext::clipToDrawingCommands):

• platform/graphics/GraphicsContext.h:

(WebCore::GraphicsContext::createImageBuffer):

• platform/graphics/ImageBuffer.cpp:

(WebCore::ImageBuffer::clone const):
(WebCore::ImageBuffer::createCompatibleBuffer): Deleted.
(WebCore::ImageBuffer::compatibleBufferSize): Deleted.
(WebCore::ImageBuffer::compatibleBufferInfo): Deleted.
(WebCore::ImageBuffer::copyRectToBuffer): Deleted.

• platform/graphics/ImageBuffer.h:
• platform/graphics/NamedImageGeneratedImage.cpp:

(WebCore::NamedImageGeneratedImage::drawPattern):

• platform/graphics/RenderingMode.h:
• platform/graphics/cg/PDFDocumentImage.cpp:

(WebCore::PDFDocumentImage::updateCachedImageIfNeeded):
(WebCore::PDFDocumentImage::draw):

• platform/graphics/coretext/DrawGlyphsRecorderCoreText.cpp:

(WebCore::DrawGlyphsRecorder::drawOTSVGRun):

• platform/graphics/displaylists/DisplayListRecorder.cpp:

(WebCore::DisplayList::Recorder::createImageBuffer const):

• platform/graphics/displaylists/DisplayListRecorder.h:
• platform/graphics/displaylists/DisplayListReplayer.cpp:

(WebCore::DisplayList::Replayer::applyItem):

• platform/mac/ThemeMac.mm:

(WebCore::ThemeMac::drawCellOrFocusRingWithViewIntoContext):

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::paintFillLayerExtended):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::setupFilters):

• rendering/RenderLayerBacking.cpp:

(WebCore::patternForDescription):

• rendering/RenderLayerFilters.cpp:

(WebCore::RenderLayerFilters::allocateBackingStoreIfNeeded):
(WebCore::RenderLayerFilters::beginFilterEffect):

• rendering/RenderLayerFilters.h:
• rendering/RenderThemeCocoa.mm:

(WebCore::RenderThemeCocoa::paintApplePayButton):

• rendering/RenderThemeMac.mm:

(WebCore::RenderThemeMac::paintListButtonForInput):
(WebCore::RenderThemeMac::paintProgressBar):

• rendering/svg/RenderSVGResourceClipper.cpp:

(WebCore::RenderSVGResourceClipper::applyClippingToContext):

• rendering/svg/RenderSVGResourceFilter.cpp:

(WebCore::RenderSVGResourceFilter::applyResource):

• rendering/svg/RenderSVGResourceGradient.cpp:

(WebCore::createMaskAndSwapContextForTextGradient):
(WebCore::clipToTextMask):

• rendering/svg/RenderSVGResourceMasker.cpp:

(WebCore::RenderSVGResourceMasker::applyResource):

• rendering/svg/RenderSVGResourcePattern.cpp:

(WebCore::RenderSVGResourcePattern::buildPattern):
(WebCore::RenderSVGResourcePattern::createTileImage const):

• rendering/svg/RenderSVGResourcePattern.h:
• rendering/svg/SVGRenderingContext.cpp:

(WebCore::SVGRenderingContext::clipToImageBuffer):
(WebCore::SVGRenderingContext::bufferForeground):
(WebCore::SVGRenderingContext::createImageBuffer): Deleted.
(WebCore::SVGRenderingContext::clear2DRotation): Deleted.

• rendering/svg/SVGRenderingContext.h:
• svg/SVGFEImageElement.cpp:

(WebCore::scaledImageBufferRect):
(WebCore::clampingScaleForImageBufferSize):
(WebCore::createImageBuffer):
(WebCore::SVGFEImageElement::imageBufferForEffect const):

• svg/graphics/SVGImage.cpp:

(WebCore::SVGImage::drawPatternForContainer):

Source/WebKit:

• GPUProcess/graphics/RemoteDisplayListRecorder.cpp:

(WebKit::RemoteDisplayListRecorder::beginClipToDrawingCommands):

• WebProcess/GPU/graphics/RemoteDisplayListRecorderProxy.cpp:

(WebKit::RemoteDisplayListRecorderProxy::createImageBuffer const):
(WebKit::RemoteDisplayListRecorderProxy::createCompatibleImageBuffer const):

• WebProcess/GPU/graphics/RemoteDisplayListRecorderProxy.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/CustomPaintCanvas.cpp (modified) (1 diff)
• WebCore/html/CustomPaintImage.cpp (modified) (1 diff)
• WebCore/html/OffscreenCanvas.cpp (modified) (3 diffs)
• WebCore/html/canvas/CanvasRenderingContext2DBase.cpp (modified) (1 diff)
• WebCore/platform/cocoa/ThemeCocoa.mm (modified) (1 diff)
• WebCore/platform/graphics/BitmapImage.cpp (modified) (1 diff)
• WebCore/platform/graphics/CrossfadeGeneratedImage.cpp (modified) (1 diff)
• WebCore/platform/graphics/GradientImage.cpp (modified) (1 diff)
• WebCore/platform/graphics/GraphicsContext.cpp (modified) (2 diffs)
• WebCore/platform/graphics/GraphicsContext.h (modified) (2 diffs)
• WebCore/platform/graphics/ImageBuffer.cpp (modified) (3 diffs)
• WebCore/platform/graphics/ImageBuffer.h (modified) (4 diffs)
• WebCore/platform/graphics/NamedImageGeneratedImage.cpp (modified) (1 diff)
• WebCore/platform/graphics/RenderingMode.h (modified) (1 diff)
• WebCore/platform/graphics/cg/PDFDocumentImage.cpp (modified) (3 diffs)
• WebCore/platform/graphics/coretext/DrawGlyphsRecorderCoreText.cpp (modified) (1 diff)
• WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp (modified) (1 diff)
• WebCore/platform/graphics/displaylists/DisplayListRecorder.h (modified) (1 diff)
• WebCore/platform/graphics/displaylists/DisplayListReplayer.cpp (modified) (1 diff)
• WebCore/platform/mac/ThemeMac.mm (modified) (1 diff)
• WebCore/rendering/RenderBoxModelObject.cpp (modified) (1 diff)
• WebCore/rendering/RenderLayer.cpp (modified) (1 diff)
• WebCore/rendering/RenderLayerBacking.cpp (modified) (1 diff)
• WebCore/rendering/RenderLayerFilters.cpp (modified) (3 diffs)
• WebCore/rendering/RenderLayerFilters.h (modified) (3 diffs)
• WebCore/rendering/RenderThemeCocoa.mm (modified) (1 diff)
• WebCore/rendering/RenderThemeMac.mm (modified) (3 diffs)
• WebCore/rendering/svg/RenderSVGResourceClipper.cpp (modified) (3 diffs)
• WebCore/rendering/svg/RenderSVGResourceFilter.cpp (modified) (4 diffs)
• WebCore/rendering/svg/RenderSVGResourceGradient.cpp (modified) (3 diffs)
• WebCore/rendering/svg/RenderSVGResourceMasker.cpp (modified) (4 diffs)
• WebCore/rendering/svg/RenderSVGResourcePattern.cpp (modified) (3 diffs)
• WebCore/rendering/svg/RenderSVGResourcePattern.h (modified) (2 diffs)
• WebCore/rendering/svg/SVGRenderingContext.cpp (modified) (4 diffs)
• WebCore/rendering/svg/SVGRenderingContext.h (modified) (1 diff)
• WebCore/svg/SVGFEImageElement.cpp (modified) (2 diffs)
• WebCore/svg/graphics/SVGImage.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/GPUProcess/graphics/RemoteDisplayListRecorder.cpp (modified) (1 diff)
• WebKit/WebProcess/GPU/graphics/RemoteDisplayListRecorderProxy.cpp (modified) (1 diff)
• WebKit/WebProcess/GPU/graphics/RemoteDisplayListRecorderProxy.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-09  Said Abou-Hallawa  <said@apple.com>
+
+        [GPU Process] Move ImageBuffer::createCompatibleImageBuffer() and SVGRenderingContext::createImageBuffer to GraphicsContext
+        https://bugs.webkit.org/show_bug.cgi?id=235758
+        rdar://88478470
+
+        Reviewed by Simon Fraser.
+
+        The goal of this patch is to record the drawing if the concrete type of 
+        the GraphicsContext is RemoteDisplayListRecorderProxy. Currently all the
+        intermediate compatible ImageBuffers are of type ConcreteImageBuffer.
+        The drawing to these ImageBuffers still happens in the WebProcess. Moreover
+        when we call drawImageBuffer() or clipToImageBuffer() for one of these
+        intermediate ImageBuffers to a remote ImageBuffer, we have to sink the
+        intermediate ImageBuffer to a NativeImage and send it to GPUProcess.
+
+        To fix this, the new enum 'RenderingMethod' will be used when creating
+        the ImageBuffer methods. The value of RenderingMethod can be one of the 
+        following constants:
+
+        1. Default: The type of the created ImageBuffer will match the type of
+           the underlying ImageBuffer of the GraphicsContext.
+
+        2. DisplayList: A DisplayList::ImageBuffer will be created whose
+           GraphicsContext will be of type DisplayList::RecorderImpl.
+
+        3. Local: The ImageBuffer will be of type ConcreteImageBuffer and it will
+           hold a platform GraphicsContext.
+
+        Also GraphicsContext will provide these functions for creating an 
+        ImageBuffer:
+
+        1. GraphicsContext::createImageBuffer() (virtual): Creates a 
+           ConcreteImageBuffer or a DisplayList::ImageBuffer. The type of the created
+           ImageBuffer is controlled by the argument 'renderingMethod'. Because
+           RemoteDisplayListRecorderProxy is a super class of GraphicsContext,
+           it overrides this method and returns the desired RemoteImageBuffer.
+           RemoteDisplayListRecorderProxy has access to RemotRenderingBackendProxy
+           so it can call its createImageBuffer().
+
+        2. GraphicsContext::createImageBuffer() (non-virtual): Creates a scaled
+           ImageBuffer and sets the context accordingly. The type of the created
+           ImageBuffer is controlled by the argument 'renderingMethod'.
+
+        3. GraphicsContext::createCompatibleImageBuffer() (virtual): Takes the
+           scaleFactor() into consideration when creating the ImageBuffer. 
+           RemoteDisplayListRecorderProxy will override this function to return
+           an Unaccelerated ImageBuffer if 'renderingMethod != Default'. This is
+           to ensure that for GPUProcess drawing, no intermediate local
+           ImageBuffers will draw to an IOSurface in WebProcess.
+
+        Two versions of these functions are provided: one takes a FloatSize and
+        the other takes a FloatRecct. The FloatRect version expands the four
+        corners of the rectangle to full pixels.
+
+        * html/CustomPaintCanvas.cpp:
+        (WebCore::CustomPaintCanvas::replayDisplayList const):
+        * html/CustomPaintImage.cpp:
+        (WebCore::CustomPaintImage::drawPattern):
+        * html/OffscreenCanvas.cpp:
+        (WebCore::OffscreenCanvas::transferToImageBitmap):
+        (WebCore::OffscreenCanvas::commitToPlaceholderCanvas):
+        * html/canvas/CanvasRenderingContext2DBase.cpp:
+        (WebCore::CanvasRenderingContext2DBase::drawImage):
+        * platform/cocoa/ThemeCocoa.mm:
+        (WebCore::drawApplePayButton):
+        * platform/graphics/BitmapImage.cpp:
+        (WebCore::BitmapImage::drawPattern):
+        * platform/graphics/CrossfadeGeneratedImage.cpp:
+        (WebCore::CrossfadeGeneratedImage::drawPattern):
+        * platform/graphics/GradientImage.cpp:
+        (WebCore::GradientImage::drawPattern):
+        * platform/graphics/GraphicsContext.cpp:
+        (WebCore::scaledImageBufferSize):
+        (WebCore::scaledImageBufferRect):
+        (WebCore::clampingScaleForImageBufferSize):
+        (WebCore::GraphicsContext::compatibleImageBufferSize const):
+        (WebCore::GraphicsContext::createImageBuffer const):
+        (WebCore::GraphicsContext::createCompatibleImageBuffer const):
+        (WebCore::GraphicsContext::clipToDrawingCommands):
+        * platform/graphics/GraphicsContext.h:
+        (WebCore::GraphicsContext::createImageBuffer):
+        * platform/graphics/ImageBuffer.cpp:
+        (WebCore::ImageBuffer::clone const):
+        (WebCore::ImageBuffer::createCompatibleBuffer): Deleted.
+        (WebCore::ImageBuffer::compatibleBufferSize): Deleted.
+        (WebCore::ImageBuffer::compatibleBufferInfo): Deleted.
+        (WebCore::ImageBuffer::copyRectToBuffer): Deleted.
+        * platform/graphics/ImageBuffer.h:
+        * platform/graphics/NamedImageGeneratedImage.cpp:
+        (WebCore::NamedImageGeneratedImage::drawPattern):
+        * platform/graphics/RenderingMode.h:
+        * platform/graphics/cg/PDFDocumentImage.cpp:
+        (WebCore::PDFDocumentImage::updateCachedImageIfNeeded):
+        (WebCore::PDFDocumentImage::draw):
+        * platform/graphics/coretext/DrawGlyphsRecorderCoreText.cpp:
+        (WebCore::DrawGlyphsRecorder::drawOTSVGRun):
+        * platform/graphics/displaylists/DisplayListRecorder.cpp:
+        (WebCore::DisplayList::Recorder::createImageBuffer const):
+        * platform/graphics/displaylists/DisplayListRecorder.h:
+        * platform/graphics/displaylists/DisplayListReplayer.cpp:
+        (WebCore::DisplayList::Replayer::applyItem):
+        * platform/mac/ThemeMac.mm:
+        (WebCore::ThemeMac::drawCellOrFocusRingWithViewIntoContext):
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::setupFilters):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::patternForDescription):
+        * rendering/RenderLayerFilters.cpp:
+        (WebCore::RenderLayerFilters::allocateBackingStoreIfNeeded):
+        (WebCore::RenderLayerFilters::beginFilterEffect):
+        * rendering/RenderLayerFilters.h:
+        * rendering/RenderThemeCocoa.mm:
+        (WebCore::RenderThemeCocoa::paintApplePayButton):
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::paintListButtonForInput):
+        (WebCore::RenderThemeMac::paintProgressBar):
+        * rendering/svg/RenderSVGResourceClipper.cpp:
+        (WebCore::RenderSVGResourceClipper::applyClippingToContext):
+        * rendering/svg/RenderSVGResourceFilter.cpp:
+        (WebCore::RenderSVGResourceFilter::applyResource):
+        * rendering/svg/RenderSVGResourceGradient.cpp:
+        (WebCore::createMaskAndSwapContextForTextGradient):
+        (WebCore::clipToTextMask):
+        * rendering/svg/RenderSVGResourceMasker.cpp:
+        (WebCore::RenderSVGResourceMasker::applyResource):
+        * rendering/svg/RenderSVGResourcePattern.cpp:
+        (WebCore::RenderSVGResourcePattern::buildPattern):
+        (WebCore::RenderSVGResourcePattern::createTileImage const):
+        * rendering/svg/RenderSVGResourcePattern.h:
+        * rendering/svg/SVGRenderingContext.cpp:
+        (WebCore::SVGRenderingContext::clipToImageBuffer):
+        (WebCore::SVGRenderingContext::bufferForeground):
+        (WebCore::SVGRenderingContext::createImageBuffer): Deleted.
+        (WebCore::SVGRenderingContext::clear2DRotation): Deleted.
+        * rendering/svg/SVGRenderingContext.h:
+        * svg/SVGFEImageElement.cpp:
+        (WebCore::scaledImageBufferRect):
+        (WebCore::clampingScaleForImageBufferSize):
+        (WebCore::createImageBuffer):
+        (WebCore::SVGFEImageElement::imageBufferForEffect const):
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::drawPatternForContainer):
+
 2022-02-09  Lauro Moura  <lmoura@igalia.com>
 

trunk/Source/WebCore/html/CustomPaintCanvas.cpp

@@ -74 +74 @@
     auto clipBounds = ctx->clipBounds();
 
-    auto image = ImageBuffer::createCompatibleBuffer(clipBounds.size(), *ctx);
+    auto image = ctx->createCompatibleImageBuffer(clipBounds.size());
     if (!image)
         return;

trunk/Source/WebCore/html/CustomPaintImage.cpp

@@ -200 +200 @@
     adjustedSrcRect.scale(xScale, yScale);
 
-    auto buffer = ImageBuffer::createCompatibleBuffer(adjustedSize, DestinationColorSpace::SRGB(), destContext);
+    auto buffer = destContext.createCompatibleImageBuffer(adjustedSize);
     if (!buffer)
         return;

trunk/Source/WebCore/html/OffscreenCanvas.cpp

@@ -284 +284 @@
         // by buffer(), to avoid resetting the context state, we have to make a copy and
         // clear the original buffer rather than returning the original buffer.
-        auto bufferCopy = buffer()->copyRectToBuffer(FloatRect(FloatPoint(), buffer()->logicalSize()), buffer()->colorSpace(), *drawingContext());
+        auto bufferCopy = buffer()->clone();
         downcast<OffscreenCanvasRenderingContext2D>(*m_context).clearCanvas();
         clearCopiedImage();
@@ -452 +452 @@
 
     if (m_placeholderData->bufferPipeSource) {
-        auto bufferCopy = imageBuffer->copyRectToBuffer(FloatRect(FloatPoint(), imageBuffer->logicalSize()), DestinationColorSpace::SRGB(), imageBuffer->context());
-        if (bufferCopy)
+        if (auto bufferCopy = imageBuffer->clone())
             m_placeholderData->bufferPipeSource->handle(WTFMove(bufferCopy));
     }
@@ -459 +458 @@
     Locker locker { m_placeholderData->bufferLock };
     bool shouldPushBuffer = !m_placeholderData->pendingCommitBuffer;
-    m_placeholderData->pendingCommitBuffer = imageBuffer->copyRectToBuffer(FloatRect(FloatPoint(), imageBuffer->logicalSize()), DestinationColorSpace::SRGB(), imageBuffer->context());
+    m_placeholderData->pendingCommitBuffer = imageBuffer->clone();
     if (m_placeholderData->pendingCommitBuffer && shouldPushBuffer)
         pushBufferToPlaceholder();

trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp

@@ -1612 +1612 @@
     } else if (state().globalComposite == CompositeOperator::Copy) {
         if (&sourceCanvas == &canvasBase()) {
-            if (auto copy = buffer->copyRectToBuffer(srcRect, colorSpace(), *c)) {
+            if (auto copy = c->createCompatibleImageBuffer(srcRect.size(), colorSpace())) {
+                copy->context().drawImageBuffer(*buffer, -srcRect.location());
                 clearCanvas();
                 c->drawImageBuffer(*copy, dstRect, { { }, srcRect.size() }, { state().globalComposite, state().globalBlend });

trunk/Source/WebCore/platform/cocoa/ThemeCocoa.mm

@@ -111 +111 @@
 static void drawApplePayButton(GraphicsContext& context, CGPDFPageRef page, const FloatSize& size)
 {
-    auto imageBuffer = ImageBuffer::createCompatibleBuffer(size, context);
+    // Create a local ImageBuffer because decoding the PDF images has to happen in WebProcess.
+    auto imageBuffer = context.createCompatibleImageBuffer(size, DestinationColorSpace::SRGB(), RenderingMethod::Local);
     if (!imageBuffer)
         return;

trunk/Source/WebCore/platform/graphics/BitmapImage.cpp

@@ -348 +348 @@
 
     if (!m_cachedImage) {
-        auto buffer = ImageBuffer::createCompatibleBuffer(expandedIntSize(tileRect.size()), DestinationColorSpace::SRGB(), ctxt);
+        auto buffer = ctxt.createCompatibleImageBuffer(expandedIntSize(tileRect.size()));
         if (!buffer)
             return;

trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp

@@ -104 +104 @@
 void CrossfadeGeneratedImage::drawPattern(GraphicsContext& context, const FloatRect& dstRect, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, const ImagePaintingOptions& options)
 {
-    auto imageBuffer = ImageBuffer::create(size(), context.renderingMode(), 1, DestinationColorSpace::SRGB(), PixelFormat::BGRA8);
+    auto imageBuffer = context.createImageBuffer(size());
     if (!imageBuffer)
         return;

trunk/Source/WebCore/platform/graphics/GradientImage.cpp

@@ -73 +73 @@
 
     if (!m_cachedImage || m_cachedGeneratorHash != generatorHash || m_cachedAdjustedSize != adjustedSize || !areEssentiallyEqual(destContext.scaleFactor(), m_cachedScaleFactor)) {
-        auto imageBuffer = ImageBuffer::createCompatibleBuffer(adjustedSize, DestinationColorSpace::SRGB(), destContext);
+        auto imageBuffer = destContext.createCompatibleImageBuffer(adjustedSize);
         if (!imageBuffer)
             return;

trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp

@@ -552 +552 @@
 }
 
+static IntSize scaledImageBufferSize(const FloatSize& size, const FloatSize& scale)
+{
+    // Enlarge the buffer size if the context's transform is scaling it so we need a higher
+    // resolution than one pixel per unit.
+    return expandedIntSize(size * scale);
+}
+
+static IntRect scaledImageBufferRect(const FloatRect& rect, const FloatSize& scale)
+{
+    auto scaledRect = rect;
+    scaledRect.scale(scale);
+    return enclosingIntRect(scaledRect);
+}
+
+static FloatSize clampingScaleForImageBufferSize(const FloatSize& size)
+{
+    FloatSize clampingScale(1, 1);
+    ImageBuffer::sizeNeedsClamping(size, clampingScale);
+    return clampingScale;
+}
+
+IntSize GraphicsContext::compatibleImageBufferSize(const FloatSize& size) const
+{
+    return scaledImageBufferSize(size, scaleFactor());
+}
+
+RefPtr<ImageBuffer> GraphicsContext::createImageBuffer(const FloatSize& size, const DestinationColorSpace& colorSpace, RenderingMode renderingMode, RenderingMethod renderingMethod) const
+{
+    if (renderingMethod == RenderingMethod::DisplayList)
+        return ImageBuffer::create(size, renderingMode, ShouldUseDisplayList::Yes, RenderingPurpose::Unspecified, 1, colorSpace, PixelFormat::BGRA8);
+
+    return ImageBuffer::create(size, renderingMode, 1, colorSpace, PixelFormat::BGRA8);
+}
+
+RefPtr<ImageBuffer> GraphicsContext::createImageBuffer(const FloatSize& size, const FloatSize& scale, const DestinationColorSpace& colorSpace, std::optional<RenderingMode> renderingMode, RenderingMethod renderingMethod) const
+{
+    auto expandedScaledSize = scaledImageBufferSize(size, scale);
+    if (expandedScaledSize.isEmpty())
+        return nullptr;
+
+    auto clampingScale = clampingScaleForImageBufferSize(expandedScaledSize);
+
+    auto imageBuffer = createImageBuffer(expandedScaledSize * clampingScale, colorSpace, renderingMode.value_or(this->renderingMode()), renderingMethod);
+    if (!imageBuffer)
+        return nullptr;
+
+    imageBuffer->context().scale(clampingScale);
+
+    // 'expandedScaledSize' is mapped to 'size'. So use 'expandedScaledSize / size'
+    // not 'scale' because they are not necessarily equal.
+    imageBuffer->context().scale(expandedScaledSize / size);
+    return imageBuffer;
+}
+
+RefPtr<ImageBuffer> GraphicsContext::createImageBuffer(const FloatRect& rect, const FloatSize& scale, const DestinationColorSpace& colorSpace, std::optional<RenderingMode> renderingMode, RenderingMethod renderingMethod) const
+{
+    auto expandedScaledRect = scaledImageBufferRect(rect, scale);
+    if (expandedScaledRect.isEmpty())
+        return nullptr;
+
+    auto clampingScale = clampingScaleForImageBufferSize(expandedScaledRect.size());
+
+    auto imageBuffer = createImageBuffer(expandedScaledRect.size() * clampingScale, colorSpace, renderingMode.value_or(this->renderingMode()), renderingMethod);
+    if (!imageBuffer)
+        return nullptr;
+
+    imageBuffer->context().scale(clampingScale);
+    
+    // 'rect' is mapped to a rectangle inside expandedScaledRect.
+    imageBuffer->context().translate(-expandedScaledRect.location());
+    
+    // The size of this rectangle is not necessarily equal to expandedScaledRect.size().
+    // So use 'scale' not 'expandedScaledRect.size() / rect.size()'.
+    imageBuffer->context().scale(scale);
+    return imageBuffer;
+}
+
+RefPtr<ImageBuffer> GraphicsContext::createCompatibleImageBuffer(const FloatSize& size, const DestinationColorSpace& colorSpace, RenderingMethod renderingMethod) const
+{
+    return createImageBuffer(size, scaleFactor(), colorSpace, renderingMode(), renderingMethod);
+}
+
+RefPtr<ImageBuffer> GraphicsContext::createCompatibleImageBuffer(const FloatRect& rect, const DestinationColorSpace& colorSpace, RenderingMethod renderingMethod) const
+{
+    return createImageBuffer(rect, scaleFactor(), colorSpace, renderingMode(), renderingMethod);
+}
+
 ImageDrawResult GraphicsContext::drawImage(Image& image, const FloatPoint& destination, const ImagePaintingOptions& imagePaintingOptions)
 {
@@ -669 +756 @@
 GraphicsContext::ClipToDrawingCommandsResult GraphicsContext::clipToDrawingCommands(const FloatRect& destination, const DestinationColorSpace& colorSpace, Function<void(GraphicsContext&)>&& drawingFunction)
 {
-    auto imageBuffer = ImageBuffer::createCompatibleBuffer(destination.size(), colorSpace, *this);
+    auto imageBuffer = createCompatibleImageBuffer(destination.size(), colorSpace);
     if (!imageBuffer)
         return ClipToDrawingCommandsResult::FailedToCreateImageBuffer;

trunk/Source/WebCore/platform/graphics/GraphicsContext.h

@@ -417 +417 @@
     // Images, Patterns, and Media
 
+    IntSize compatibleImageBufferSize(const FloatSize&) const;
+
+    WEBCORE_EXPORT RefPtr<ImageBuffer> createImageBuffer(const FloatSize&, const FloatSize& scale = { 1, 1 }, const DestinationColorSpace& = DestinationColorSpace::SRGB(), std::optional<RenderingMode> = std::nullopt, RenderingMethod = RenderingMethod::Default) const;
+    WEBCORE_EXPORT RefPtr<ImageBuffer> createImageBuffer(const FloatRect&, const FloatSize& scale = { 1, 1 }, const DestinationColorSpace& = DestinationColorSpace::SRGB(), std::optional<RenderingMode> = std::nullopt, RenderingMethod = RenderingMethod::Default) const;
+
+    virtual RefPtr<ImageBuffer> createCompatibleImageBuffer(const FloatSize&, const DestinationColorSpace& = DestinationColorSpace::SRGB(), RenderingMethod = RenderingMethod::Default) const;
+    virtual RefPtr<ImageBuffer> createCompatibleImageBuffer(const FloatRect&, const DestinationColorSpace& = DestinationColorSpace::SRGB(), RenderingMethod = RenderingMethod::Default) const;
+
     virtual void drawNativeImage(NativeImage&, const FloatSize& selfSize, const FloatRect& destRect, const FloatRect& srcRect, const ImagePaintingOptions& = { }) = 0;
 
@@ -546 +554 @@
     void fillEllipseAsPath(const FloatRect&);
     void strokeEllipseAsPath(const FloatRect&);
+
+    virtual RefPtr<ImageBuffer> createImageBuffer(const FloatSize&, const DestinationColorSpace&, RenderingMode, RenderingMethod) const;
 
     FloatRect computeLineBoundsAndAntialiasingModeForText(const FloatRect&, bool printing, Color&);

trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp

@@ -2 +2 @@
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
- * Copyright (C) 2016-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-2022 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -73 +73 @@
 }
 
-RefPtr<ImageBuffer> ImageBuffer::createCompatibleBuffer(const FloatSize& size, const GraphicsContext& context)
+RefPtr<ImageBuffer> ImageBuffer::clone() const
 {
-    if (size.isEmpty())
+    auto clone = context().createCompatibleImageBuffer(logicalSize(), colorSpace());
+    if (!clone)
         return nullptr;
 
-    IntSize scaledSize = ImageBuffer::compatibleBufferSize(size, context);
-
-    RefPtr<ImageBuffer> imageBuffer;
-
-    if (context.renderingMode() == RenderingMode::Accelerated)
-        imageBuffer = AcceleratedImageBuffer::create(scaledSize, context);
-    
-    if (!imageBuffer)
-        imageBuffer = UnacceleratedImageBuffer::create(scaledSize, context);
-
-    if (!imageBuffer)
-        return nullptr;
-
-    imageBuffer->context().scale(scaledSize / size);
-    return imageBuffer;
-}
-
-// This is useful when you need to make sure the pixel grid of the ImageBuffer aligns with the pixel grid of the context.
-// Simply saying createCompatibleBuffer(rect.size(), context) isn't sufficient in this situation, because rect.location() may not lie on a pixel boundary.
-// In this situation, we have to inflate both the left side and the right side, which can lead to different results than
-// createCompatibleBuffer(rect.size(), context) would have produced.
-auto ImageBuffer::createCompatibleBuffer(const FloatRect& rect, const GraphicsContext& context) -> std::optional<CompatibleBufferDescription>
-{
-    if (rect.isEmpty())
-        return std::nullopt;
-
-    auto info = ImageBuffer::compatibleBufferInfo(rect, context);
-
-    RefPtr<ImageBuffer> imageBuffer;
-
-    if (context.renderingMode() == RenderingMode::Accelerated)
-        imageBuffer = AcceleratedImageBuffer::create(info.physicalSizeInDeviceCoordinates, context);
-    
-    if (!imageBuffer)
-        imageBuffer = UnacceleratedImageBuffer::create(info.physicalSizeInDeviceCoordinates, context);
-
-    if (!imageBuffer)
-        return std::nullopt;
-
-    imageBuffer->context().scale(info.scale);
-    imageBuffer->context().translate(-info.inflatedRectInUserCoordinates.location());
-    return { { imageBuffer.releaseNonNull(), info.inflatedRectInUserCoordinates } };
-}
-
-RefPtr<ImageBuffer> ImageBuffer::createCompatibleBuffer(const FloatSize& size, const DestinationColorSpace& colorSpace, const GraphicsContext& context)
-{
-    if (size.isEmpty())
-        return nullptr;
-
-    IntSize scaledSize = ImageBuffer::compatibleBufferSize(size, context);
-
-    auto imageBuffer = ImageBuffer::createCompatibleBuffer(scaledSize, 1, colorSpace, context);
-    if (!imageBuffer)
-        return nullptr;
-
-    imageBuffer->context().scale(scaledSize / size);
-    return imageBuffer;
-}
-
-RefPtr<ImageBuffer> ImageBuffer::createCompatibleBuffer(const FloatSize& size, float resolutionScale, const DestinationColorSpace& colorSpace, const GraphicsContext& context)
-{
-    return ImageBuffer::create(size, context.renderingMode(), resolutionScale, colorSpace, PixelFormat::BGRA8);
+    clone->context().drawImageBuffer(const_cast<ImageBuffer&>(*this), FloatPoint());
+    return clone;
 }
 
@@ -186 +127 @@
 }
 
-IntSize ImageBuffer::compatibleBufferSize(const FloatSize& size, const GraphicsContext& context)
-{
-    // Enlarge the buffer size if the context's transform is scaling it so we need a higher
-    // resolution than one pixel per unit.
-    return expandedIntSize(size * context.scaleFactor());
-}
-
-auto ImageBuffer::compatibleBufferInfo(const FloatRect& rect, const GraphicsContext& context) -> CompatibleBufferInfo
-{
-    auto scaleFactor = context.scaleFactor();
-    auto scaledRect = rect;
-    scaledRect.scale(scaleFactor);
-    auto inflatedScaledRect = enclosingIntRect(scaledRect);
-    auto inflatedRectInUserCoordinates = FloatRect(inflatedScaledRect);
-
-    // We don't want to allocate huge ImageBuffers because they can take a lot of memory,
-    // so if the size would have been too big, decrease resolution and scale the resulting context.
-    // This will mean that the ImageBuffer will lose quality, but will still generally look correct.
-    constexpr int maxDimension = 4096;
-    if (inflatedScaledRect.width() > maxDimension) {
-        // The pixel grids won't align any more, so there's no need to try to handle fractions of pixels.
-        inflatedScaledRect.setWidth(maxDimension);
-        inflatedRectInUserCoordinates.scale(maxDimension / inflatedRectInUserCoordinates.width(), 1);
-        scaleFactor.setWidth(maxDimension / rect.width());
-    }
-    if (inflatedScaledRect.height() > maxDimension) {
-        // The pixel grids won't align any more, so there's no need to try to handle fractions of pixels.
-        inflatedScaledRect.setHeight(maxDimension);
-        inflatedRectInUserCoordinates.scale(1, maxDimension / inflatedRectInUserCoordinates.height());
-        scaleFactor.setHeight(maxDimension / rect.height());
-    }
-
-    auto physicalSizeInDeviceCoordinates = inflatedScaledRect.size();
-    inflatedRectInUserCoordinates.scale(1.0f / scaleFactor);
-    return { WTFMove(physicalSizeInDeviceCoordinates), WTFMove(inflatedRectInUserCoordinates), scaleFactor };
-}
-
-RefPtr<ImageBuffer> ImageBuffer::copyRectToBuffer(const FloatRect& rect, const DestinationColorSpace& colorSpace, const GraphicsContext& context)
-{
-    if (rect.isEmpty())
-        return nullptr;
-
-    IntSize scaledSize = ImageBuffer::compatibleBufferSize(rect.size(), context);
-
-    auto buffer = ImageBuffer::createCompatibleBuffer(scaledSize, 1, colorSpace, context);
-    if (!buffer)
-        return nullptr;
-
-    buffer->context().drawImageBuffer(*this, -rect.location());
-    return buffer;
-}
-
 RefPtr<NativeImage> ImageBuffer::sinkIntoNativeImage(RefPtr<ImageBuffer> imageBuffer)
 {

trunk/Source/WebCore/platform/graphics/ImageBuffer.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
- * Copyright (C) 2007-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2022 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
@@ -45 +45 @@
     WEBCORE_EXPORT static RefPtr<ImageBuffer> create(const FloatSize&, RenderingMode, float resolutionScale, const DestinationColorSpace&, PixelFormat, const HostWindow* = nullptr);
 
-    // Create an image buffer compatible with the context, with suitable resolution for drawing into the buffer and then into this context.
-    static RefPtr<ImageBuffer> createCompatibleBuffer(const FloatSize&, const GraphicsContext&);
-    struct CompatibleBufferDescription {
-        Ref<ImageBuffer> imageBuffer;
-        FloatRect inflatedRectInUserCoordinates;
-    };
-    static std::optional<CompatibleBufferDescription> createCompatibleBuffer(const FloatRect& rectInUserCoordinates, const GraphicsContext&);
-    WEBCORE_EXPORT static RefPtr<ImageBuffer> createCompatibleBuffer(const FloatSize&, const DestinationColorSpace&, const GraphicsContext&);
-    static RefPtr<ImageBuffer> createCompatibleBuffer(const FloatSize&, float resolutionScale, const DestinationColorSpace&, const GraphicsContext&);
+    RefPtr<ImageBuffer> clone() const;
 
     // These functions are used when clamping the ImageBuffer which is created for filter, masker or clipper.
@@ -62 +54 @@
     static FloatRect clampedRect(const FloatRect&);
 
-    static IntSize compatibleBufferSize(const FloatSize&, const GraphicsContext&);
-    struct CompatibleBufferInfo {
-        IntSize physicalSizeInDeviceCoordinates;
-        FloatRect inflatedRectInUserCoordinates;
-        FloatSize scale;
-    };
-    static CompatibleBufferInfo compatibleBufferInfo(const FloatRect&, const GraphicsContext&);
-    
-    WEBCORE_EXPORT virtual ~ImageBuffer() = default;
+    virtual ~ImageBuffer() = default;
 
     virtual void setBackend(std::unique_ptr<ImageBufferBackend>&&) = 0;
@@ -114 +98 @@
     virtual RefPtr<Image> filteredImage(Filter&) = 0;
 
-    // Create an image buffer compatible with the context and copy rect from this buffer into this new one.
-    RefPtr<ImageBuffer> copyRectToBuffer(const FloatRect&, const DestinationColorSpace&, const GraphicsContext&);
-
     virtual void draw(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect = FloatRect(0, 0, -1, -1), const ImagePaintingOptions& = { }) = 0;
     virtual void drawPattern(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, const ImagePaintingOptions& = { }) = 0;

trunk/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp

@@ -66 +66 @@
 {
 #if USE(NEW_THEME)
-    auto imageBuffer = ImageBuffer::createCompatibleBuffer(size(), context);
+    auto imageBuffer = context.createCompatibleImageBuffer(size());
     if (!imageBuffer)
         return;

trunk/Source/WebCore/platform/graphics/RenderingMode.h

@@ -38 +38 @@
 enum class RenderingMode : bool { Unaccelerated, Accelerated };
 
+enum class RenderingMethod : uint8_t {
+    Default,
+    Local,
+    DisplayList
+};
+
 } // namespace WebCore

trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp

@@ -233 +233 @@
     // Cache the PDF image only if the size of the new image won't exceed the cache threshold.
     if (m_pdfImageCachingPolicy == PDFImageCachingPolicy::BelowMemoryLimit) {
-        IntSize scaledSize = ImageBuffer::compatibleBufferSize(cachedImageSize, context);
+        auto scaledSize = context.compatibleImageBufferSize(cachedImageSize);
         if (s_allDecodedDataSize + scaledSize.unclampedArea() * 4 - m_cachedBytes > s_maxDecodedDataSize) {
             destroyDecodedData();
@@ -240 +240 @@
     }
 
-    m_cachedImageBuffer = ImageBuffer::createCompatibleBuffer(cachedImageSize, context);
+    // Create a local ImageBuffer because decoding the PDF images has to happen in WebProcess.
+    m_cachedImageBuffer = context.createCompatibleImageBuffer(cachedImageSize, DestinationColorSpace::SRGB(), RenderingMethod::Local);
     if (!m_cachedImageBuffer) {
         destroyDecodedData();
@@ -293 +294 @@
             auto scalar = std::min(1.f, std::sqrt(static_cast<float>(s_maxCachedImageArea) / (dstRect.width() * dstRect.height())));
             FloatRect localDestinationRect(FloatPoint(), dstRect.size() * scalar);
-            if (auto imageBuffer = ImageBuffer::createCompatibleBuffer(localDestinationRect.size(), context)) {
+            if (auto imageBuffer = context.createCompatibleImageBuffer(localDestinationRect.size(), DestinationColorSpace::SRGB(), RenderingMethod::Local)) {
                 auto& bufferContext = imageBuffer->context();
                 transformContextForPainting(bufferContext, localDestinationRect, srcRect);

trunk/Source/WebCore/platform/graphics/coretext/DrawGlyphsRecorderCoreText.cpp

@@ -375 +375 @@
 {
     FloatPoint penPosition = startPoint;
+
     for (unsigned i = 0; i < numGlyphs; ++i) {
         auto bounds = font.boundsForGlyph(glyphs[i]);
-        if (auto imageBufferDescription = ImageBuffer::createCompatibleBuffer(bounds, m_owner)) {
-            FontCascade::drawGlyphs(imageBufferDescription->imageBuffer->context(), font, glyphs + i, advances + i, 1, FloatPoint(), smoothingMode);
-            auto destinationRect = imageBufferDescription->inflatedRectInUserCoordinates;
+
+        // Create a local ImageBuffer because decoding the SVG fonts has to happen in WebProcess.
+        if (auto imageBuffer = m_owner.createCompatibleImageBuffer(bounds, DestinationColorSpace::SRGB(), RenderingMethod::Local)) {
+            FontCascade::drawGlyphs(imageBuffer->context(), font, glyphs + i, advances + i, 1, FloatPoint(), smoothingMode);
+
+            FloatRect destinationRect = enclosingIntRect(bounds);
             destinationRect.moveBy(penPosition);
-            m_owner.drawImageBuffer(imageBufferDescription->imageBuffer, destinationRect);
+            m_owner.drawImageBuffer(*imageBuffer, destinationRect);
         }
+
         penPosition.move(size(advances[i]));
     }

trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp

@@ -508 +508 @@
 }
 
+RefPtr<ImageBuffer> Recorder::createImageBuffer(const FloatSize& size, const DestinationColorSpace& colorSpace, RenderingMode renderingMode, RenderingMethod renderingMethod) const
+{
+    if (renderingMethod == RenderingMethod::Default)
+        renderingMethod = RenderingMethod::DisplayList;
+
+    return GraphicsContext::createImageBuffer(size, colorSpace, renderingMode, renderingMethod);
+}
+
 #if ENABLE(VIDEO)
 void Recorder::paintFrameForMedia(MediaPlayer& player, const FloatRect& destination)

trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h

@@ -186 +186 @@
     ContextState& currentState();
 
+    WEBCORE_EXPORT RefPtr<ImageBuffer> createImageBuffer(const FloatSize&, const DestinationColorSpace&, RenderingMode, RenderingMethod) const override;
+
 private:
     bool hasPlatformContext() const final { return false; }

trunk/Source/WebCore/platform/graphics/displaylists/DisplayListReplayer.cpp

@@ -155 +155 @@
             return { StopReplayReason::InvalidItemOrExtent, std::nullopt };
         auto& clipItem = item.get<BeginClipToDrawingCommands>();
-        m_maskImageBuffer = ImageBuffer::createCompatibleBuffer(clipItem.destination().size(), clipItem.colorSpace(), m_context);
+        m_maskImageBuffer = m_context.createCompatibleImageBuffer(clipItem.destination().size(), clipItem.colorSpace());
         if (!m_maskImageBuffer)
             return { StopReplayReason::OutOfMemory, std::nullopt };

trunk/Source/WebCore/platform/mac/ThemeMac.mm

@@ -735 +735 @@
     if (useImageBuffer) {
         NSRect imageBufferDrawRect = NSRect(FloatRect(buttonFocusRectOutlineWidth, buttonFocusRectOutlineWidth, rect.width(), rect.height()));
-        auto imageBuffer = ImageBuffer::createCompatibleBuffer(rect.size() + 2 * FloatSize(buttonFocusRectOutlineWidth, buttonFocusRectOutlineWidth), deviceScaleFactor, DestinationColorSpace::SRGB(), context);
+        auto imageBuffer = context.createImageBuffer(rect.size() + 2 * FloatSize(buttonFocusRectOutlineWidth, buttonFocusRectOutlineWidth), { deviceScaleFactor, deviceScaleFactor });
         if (!imageBuffer)
             return needsRepaint;

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -895 +895 @@
 
         // Now create the mask.
-        maskImage = ImageBuffer::createCompatibleBuffer(maskRect.size(), DestinationColorSpace::SRGB(), context);
+        maskImage = context.createCompatibleImageBuffer(maskRect.size());
         if (!maskImage)
             return;

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -3277 +3277 @@
     auto rootRelativeBounds = calculateLayerBounds(paintingInfo.rootLayer, offsetFromRoot, { });
 
-    GraphicsContext* filterContext = paintingFilters->beginFilterEffect(renderer(), enclosingIntRect(rootRelativeBounds), enclosingIntRect(paintingInfo.paintDirtyRect), enclosingIntRect(filterRepaintRect));
+    GraphicsContext* filterContext = paintingFilters->beginFilterEffect(renderer(), destinationContext, enclosingIntRect(rootRelativeBounds), enclosingIntRect(paintingInfo.paintDirtyRect), enclosingIntRect(filterRepaintRect));
     if (!filterContext)
         return nullptr;

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -3341 +3341 @@
     const FloatSize tileSize { 32, 18 };
 
-    auto imageBuffer = ImageBuffer::createCompatibleBuffer(tileSize, DestinationColorSpace::SRGB(), destContext);
+    auto imageBuffer = destContext.createCompatibleImageBuffer(tileSize);
     if (!imageBuffer)
         return nullptr;

trunk/Source/WebCore/rendering/RenderLayerFilters.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2022 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -130 +130 @@
 }
 
-void RenderLayerFilters::allocateBackingStoreIfNeeded()
+void RenderLayerFilters::allocateBackingStoreIfNeeded(GraphicsContext& context)
 {
     auto& filter = *m_filter;
     auto logicalSize = filter.scaledByFilterScale(m_filterRegion.size());
 
-    if (!m_sourceImage || m_sourceImage->logicalSize() != logicalSize) {
-        m_sourceImage = ImageBuffer::create(logicalSize, filter.renderingMode(), ShouldUseDisplayList::No, RenderingPurpose::DOM, 1, DestinationColorSpace::SRGB(), PixelFormat::BGRA8, m_layer.renderer().hostWindow());
-        if (auto context = inputContext())
-            context->scale(filter.filterScale());
-    }
-}
-
-GraphicsContext* RenderLayerFilters::beginFilterEffect(RenderElement& renderer, const LayoutRect& filterBoxRect, const LayoutRect& dirtyRect, const LayoutRect& layerRepaintRect)
+    if (!m_sourceImage || m_sourceImage->logicalSize() != logicalSize)
+        m_sourceImage = context.createImageBuffer(m_filterRegion.size(), filter.filterScale(), DestinationColorSpace::SRGB(), filter.renderingMode());
+}
+
+GraphicsContext* RenderLayerFilters::beginFilterEffect(RenderElement& renderer, GraphicsContext& context, const LayoutRect& filterBoxRect, const LayoutRect& dirtyRect, const LayoutRect& layerRepaintRect)
 {
     if (!m_filter)
@@ -194 +191 @@
 
     filter.setFilterRegion(m_filterRegion);
-    allocateBackingStoreIfNeeded();
+    allocateBackingStoreIfNeeded(context);
 
     auto* sourceGraphicsContext = inputContext();

trunk/Source/WebCore/rendering/RenderLayerFilters.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2022 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -64 +64 @@
     LayoutRect repaintRect() const { return m_repaintRect; }
 
-    GraphicsContext* beginFilterEffect(RenderElement&, const LayoutRect& filterBoxRect, const LayoutRect& dirtyRect, const LayoutRect& layerRepaintRect);
+    GraphicsContext* beginFilterEffect(RenderElement&, GraphicsContext&, const LayoutRect& filterBoxRect, const LayoutRect& dirtyRect, const LayoutRect& layerRepaintRect);
     void applyFilterEffect(GraphicsContext& destinationContext);
 
@@ -71 +71 @@
     void resetDirtySourceRect() { m_dirtySourceRect = LayoutRect(); }
     GraphicsContext* inputContext();
-    void allocateBackingStoreIfNeeded();
+    void allocateBackingStoreIfNeeded(GraphicsContext&);
 
     RenderLayer& m_layer;

trunk/Source/WebCore/rendering/RenderThemeCocoa.mm

@@ -155 +155 @@
     auto& destinationContext = paintInfo.context();
 
-    auto imageBuffer = ImageBuffer::createCompatibleBuffer(paintRect.size(), destinationContext);
+    auto imageBuffer = destinationContext.createCompatibleImageBuffer(paintRect.size());
     if (!imageBuffer)
         return false;

trunk/Source/WebCore/rendering/RenderThemeMac.mm

@@ -997 +997 @@
     float deviceScaleFactor = o.document().deviceScaleFactor();
 
-    auto comboBoxImageBuffer = ImageBuffer::createCompatibleBuffer(comboBoxSize, deviceScaleFactor, DestinationColorSpace::SRGB(), context);
+    auto comboBoxImageBuffer = context.createImageBuffer(comboBoxSize, { deviceScaleFactor, deviceScaleFactor });
     if (!comboBoxImageBuffer)
         return;
@@ -1021 +1021 @@
     }];
 
-    auto comboBoxButtonImageBuffer = ImageBuffer::createCompatibleBuffer(desiredComboBoxButtonSize, deviceScaleFactor, DestinationColorSpace::SRGB(), context);
+    auto comboBoxButtonImageBuffer = context.createImageBuffer(desiredComboBoxButtonSize, { deviceScaleFactor, deviceScaleFactor });
     if (!comboBoxButtonImageBuffer)
         return;
@@ -1380 +1380 @@
     float deviceScaleFactor = renderObject.document().deviceScaleFactor();
     bool isIndeterminate = renderProgress.position() < 0;
-    auto imageBuffer = ImageBuffer::createCompatibleBuffer(inflatedRect.size(), deviceScaleFactor, DestinationColorSpace::SRGB(), paintInfo.context());
+    auto imageBuffer = paintInfo.context().createImageBuffer(inflatedRect.size(), { deviceScaleFactor, deviceScaleFactor });
     if (!imageBuffer)
         return true;

trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp

@@ -4 +4 @@
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  * Copyright (C) 2011 Dirk Schulze <krit@webkit.org>
+ * Copyright (C) 2022 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -153 +154 @@
 
     AffineTransform absoluteTransform = SVGRenderingContext::calculateTransformationToOutermostCoordinateSystem(renderer);
+
+    // Ignore 2D rotation, as it doesn't affect the size of the mask.
+    FloatSize scale(absoluteTransform.xScale(), absoluteTransform.yScale());
+
+    // Determine scale factor for the clipper. The size of intermediate ImageBuffers shouldn't be bigger than kMaxFilterSize.
+    ImageBuffer::sizeNeedsClamping(objectBoundingBox.size(), scale);
+
     if (!clipperData.isValidForGeometry(objectBoundingBox, clippedContentBounds, absoluteTransform)) {
         // FIXME (149469): This image buffer should not be unconditionally unaccelerated. Making it match the context breaks nested clipping, though.
-        auto maskImage = SVGRenderingContext::createImageBuffer(clippedContentBounds, absoluteTransform, DestinationColorSpace::SRGB(), RenderingMode::Unaccelerated, hostWindow());
+        auto maskImage = context.createImageBuffer(clippedContentBounds, scale, DestinationColorSpace::SRGB(), RenderingMode::Unaccelerated);
         if (!maskImage)
             return false;
@@ -186 +194 @@
         return false;
 
-    SVGRenderingContext::clipToImageBuffer(context, absoluteTransform, clippedContentBounds, clipperData.imageBuffer, true);
+    SVGRenderingContext::clipToImageBuffer(context, clippedContentBounds, scale, clipperData.imageBuffer, true);
     return true;
 }

trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp

@@ -5 +5 @@
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
+ * Copyright (C) 2021-2022 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -147 +148 @@
     }
 
-    // Change the coordinate transformation applied to the filtered element to reflect the resolution of the filter.
-    auto effectiveTransform = AffineTransform(filterScale.width(), 0, 0, filterScale.height(), 0, 0);
-
 #if ENABLE(DESTINATION_COLOR_SPACE_LINEAR_SRGB)
     auto colorSpace = DestinationColorSpace::LinearSRGB();
@@ -155 +153 @@
     auto colorSpace = DestinationColorSpace::SRGB();
 #endif
-    auto sourceGraphic = SVGRenderingContext::createImageBuffer(filterData->drawingRegion, effectiveTransform, colorSpace, filterData->filter->renderingMode(), renderer.hostWindow());
+
+    auto sourceGraphic = context->createImageBuffer(filterData->drawingRegion, filterScale, colorSpace, filterData->filter->renderingMode());
     if (!sourceGraphic) {
         ASSERT(m_rendererFilterDataMap.contains(&renderer));
@@ -161 +160 @@
         return false;
     }
-    
+
     auto& sourceGraphicContext = sourceGraphic->context();
-  
+
     filterData->sourceGraphicBuffer = WTFMove(sourceGraphic);
     filterData->savedContext = context;

trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp

@@ -4 +4 @@
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
+ * Copyright (C) 2022 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -61 +62 @@
     FloatRect repaintRect = textRootBlock->repaintRectInLocalCoordinates();
 
-    auto maskImage = SVGRenderingContext::createImageBuffer(repaintRect, absoluteTransform, DestinationColorSpace::SRGB(), context->renderingMode(), renderer.hostWindow());
+    // Ignore 2D rotation, as it doesn't affect the size of the mask.
+    FloatSize scale(absoluteTransform.xScale(), absoluteTransform.yScale());
+
+    // Determine scale factor for the clipper. The size of intermediate ImageBuffers shouldn't be bigger than kMaxFilterSize.
+    ImageBuffer::sizeNeedsClamping(repaintRect.size(), scale);
+
+    auto maskImage = context->createImageBuffer(repaintRect, scale);
     if (!maskImage)
         return false;
@@ -81 +88 @@
 
     targetRect = textRootBlock->repaintRectInLocalCoordinates();
-
-    SVGRenderingContext::clipToImageBuffer(context, absoluteTransform, targetRect, imageBuffer, false);
+    
+    // Ignore 2D rotation, as it doesn't affect the size of the mask.
+    FloatSize scale(absoluteTransform.xScale(), absoluteTransform.yScale());
+
+    // Determine scale factor for the clipper. The size of intermediate ImageBuffers shouldn't be bigger than kMaxFilterSize.
+    ImageBuffer::sizeNeedsClamping(targetRect.size(), scale);
+
+    SVGRenderingContext::clipToImageBuffer(context, targetRect, scale, imageBuffer, false);
 
     AffineTransform matrix;

trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
+ * Copyright (C) 2022 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -69 +70 @@
     FloatRect repaintRect = renderer.repaintRectInLocalCoordinates();
 
+    // Ignore 2D rotation, as it doesn't affect the size of the mask.
+    FloatSize scale(absoluteTransform.xScale(), absoluteTransform.yScale());
+
+    // Determine scale factor for the mask. The size of intermediate ImageBuffers shouldn't be bigger than kMaxFilterSize.
+    ImageBuffer::sizeNeedsClamping(repaintRect.size(), scale);
+
     if (!maskerData->maskImage && !repaintRect.isEmpty()) {
         const SVGRenderStyle& svgStyle = style().svgStyle();
@@ -83 +90 @@
         }
 #endif
-
         // FIXME (149470): This image buffer should not be unconditionally unaccelerated. Making it match the context breaks alpha masking, though.
-        maskerData->maskImage = SVGRenderingContext::createImageBuffer(repaintRect, absoluteTransform, maskColorSpace, RenderingMode::Unaccelerated, hostWindow());
+        maskerData->maskImage = context->createImageBuffer(repaintRect, scale, maskColorSpace, RenderingMode::Unaccelerated);
         if (!maskerData->maskImage)
             return false;
@@ -96 +102 @@
         return false;
 
-    SVGRenderingContext::clipToImageBuffer(*context, absoluteTransform, repaintRect, maskerData->maskImage, missingMaskerData);
+    SVGRenderingContext::clipToImageBuffer(*context, repaintRect, scale, maskerData->maskImage, missingMaskerData);
     return true;
 }

trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp

@@ -2 +2 @@
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
+ * Copyright (C) 2022 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -96 +97 @@
         return nullptr;
 
-    AffineTransform absoluteTransformIgnoringRotation = SVGRenderingContext::calculateTransformationToOutermostCoordinateSystem(renderer);
+    auto absoluteTransform = SVGRenderingContext::calculateTransformationToOutermostCoordinateSystem(renderer);
 
     // Ignore 2D rotation, as it doesn't affect the size of the tile.
-    SVGRenderingContext::clear2DRotation(absoluteTransformIgnoringRotation);
-    FloatRect absoluteTileBoundaries = absoluteTransformIgnoringRotation.mapRect(tileBoundaries);
-    FloatRect clampedAbsoluteTileBoundaries;
+    FloatSize tileScale(absoluteTransform.xScale(), absoluteTransform.yScale());
 
     // Scale the tile size to match the scale level of the patternTransform.
-    absoluteTileBoundaries.scale(static_cast<float>(m_attributes.patternTransform().xScale()),
-        static_cast<float>(m_attributes.patternTransform().yScale()));
+    tileScale.scale(static_cast<float>(m_attributes.patternTransform().xScale()), static_cast<float>(m_attributes.patternTransform().yScale()));
 
     // Build tile image.
-    auto tileImage = createTileImage(m_attributes, tileBoundaries, absoluteTileBoundaries, tileImageTransform, clampedAbsoluteTileBoundaries, context.renderingMode());
+    auto tileImage = createTileImage(context, tileBoundaries.size(), tileScale, tileImageTransform, m_attributes);
     if (!tileImage)
         return nullptr;
@@ -235 +233 @@
 }
 
-RefPtr<ImageBuffer> RenderSVGResourcePattern::createTileImage(const PatternAttributes& attributes, const FloatRect& tileBoundaries, const FloatRect& absoluteTileBoundaries, const AffineTransform& tileImageTransform, FloatRect& clampedAbsoluteTileBoundaries, RenderingMode renderingMode) const
-{
-    clampedAbsoluteTileBoundaries = ImageBuffer::clampedRect(absoluteTileBoundaries);
-    auto tileImage = SVGRenderingContext::createImageBuffer(absoluteTileBoundaries, clampedAbsoluteTileBoundaries, DestinationColorSpace::SRGB(), renderingMode, hostWindow());
+RefPtr<ImageBuffer> RenderSVGResourcePattern::createTileImage(GraphicsContext& context, const FloatSize& size, const FloatSize& scale, const AffineTransform& tileImageTransform, const PatternAttributes& attributes) const
+{
+    // This is equivalent to making createImageBuffer() use roundedIntSize().
+    auto roundedUnscaledImageBufferSize = [](const FloatSize& size, const FloatSize& scale) -> FloatSize {
+        auto scaledSize = size * scale;
+        return size - (expandedIntSize(scaledSize) - roundedIntSize(scaledSize)) * (scaledSize - flooredIntSize(scaledSize)) / scale;
+    };
+
+    auto tileSize = roundedUnscaledImageBufferSize(size, scale);
+
+    // FIXME: Use createImageBuffer(rect, scale), delete the above calculations and fix 'tileImageTransform'
+    auto tileImage = context.createImageBuffer(tileSize, scale);
     if (!tileImage)
         return nullptr;
 
     GraphicsContext& tileImageContext = tileImage->context();
-
-    // The image buffer represents the final rendered size, so the content has to be scaled (to avoid pixelation).
-    tileImageContext.scale(clampedAbsoluteTileBoundaries.size() / tileBoundaries.size());
 
     // Apply tile image transformations.

trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h

@@ -2 +2 @@
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
+ * Copyright (C) 2022 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -62 +63 @@
     bool buildTileImageTransform(RenderElement&, const PatternAttributes&, const SVGPatternElement&, FloatRect& patternBoundaries, AffineTransform& tileImageTransform) const;
 
-    RefPtr<ImageBuffer> createTileImage(const PatternAttributes&, const FloatRect& tileBoundaries, const FloatRect& absoluteTileBoundaries, const AffineTransform& tileImageTransform, FloatRect& clampedAbsoluteTileBoundaries, RenderingMode) const;
+    RefPtr<ImageBuffer> createTileImage(GraphicsContext&, const FloatSize&, const FloatSize& scale, const AffineTransform& tileImageTransform, const PatternAttributes&) const;
 
     PatternData* buildPattern(RenderElement&, OptionSet<RenderSVGResourceMode>, GraphicsContext&);

trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp

@@ -228 +228 @@
 }
 
-RefPtr<ImageBuffer> SVGRenderingContext::createImageBuffer(const FloatRect& targetRect, const AffineTransform& absoluteTransform, const DestinationColorSpace& colorSpace, RenderingMode renderingMode, const HostWindow* hostWindow)
-{
-    IntRect paintRect = calculateImageBufferRect(targetRect, absoluteTransform);
-    // Don't create empty ImageBuffers.
-    if (paintRect.isEmpty())
-        return nullptr;
-
-    FloatSize scale(1, 1);
-    FloatSize clampedSize = paintRect.size();
-    if (ImageBuffer::sizeNeedsClamping(clampedSize, scale))
-        clampedSize = clampedSize * scale;
-
-    auto imageBuffer = ImageBuffer::create(clampedSize, renderingMode, ShouldUseDisplayList::No, RenderingPurpose::DOM, 1, colorSpace, PixelFormat::BGRA8, hostWindow);
-    if (!imageBuffer)
-        return nullptr;
-
-    AffineTransform transform;
-    transform.scale(scale).translate(-paintRect.location()).multiply(absoluteTransform);
-
-    GraphicsContext& imageContext = imageBuffer->context();
-    imageContext.concatCTM(transform);
-
-    return imageBuffer;
-}
-
-RefPtr<ImageBuffer> SVGRenderingContext::createImageBuffer(const FloatRect& targetRect, const FloatRect& clampedRect, const DestinationColorSpace& colorSpace, RenderingMode renderingMode, const HostWindow* hostWindow)
-{
-    IntSize clampedSize = roundedIntSize(clampedRect.size());
-    FloatSize unclampedSize = roundedIntSize(targetRect.size());
-
-    // Don't create empty ImageBuffers.
-    if (clampedSize.isEmpty())
-        return nullptr;
-
-    auto imageBuffer = ImageBuffer::create(clampedSize, renderingMode, ShouldUseDisplayList::No, RenderingPurpose::DOM, 1, colorSpace, PixelFormat::BGRA8, hostWindow);
-    if (!imageBuffer)
-        return nullptr;
-
-    GraphicsContext& imageContext = imageBuffer->context();
-
-    // Compensate rounding effects, as the absolute target rect is using floating-point numbers and the image buffer size is integer.
-    imageContext.scale(unclampedSize / targetRect.size());
-
-    return imageBuffer;
-}
-
 void SVGRenderingContext::renderSubtreeToContext(GraphicsContext& context, RenderElement& item, const AffineTransform& subtreeContentTransformation)
 {
@@ -290 +244 @@
 }
 
-void SVGRenderingContext::clipToImageBuffer(GraphicsContext& context, const AffineTransform& absoluteTransform, const FloatRect& targetRect, RefPtr<ImageBuffer>& imageBuffer, bool safeToClear)
+void SVGRenderingContext::clipToImageBuffer(GraphicsContext& context, const FloatRect& targetRect, const FloatSize& scale, RefPtr<ImageBuffer>& imageBuffer, bool safeToClear)
 {
     if (!imageBuffer)
         return;
 
-    FloatRect absoluteTargetRect = calculateImageBufferRect(targetRect, absoluteTransform);
+    AffineTransform absoluteTransform;
+    absoluteTransform.scale(scale.width(), scale.height());
+
+    auto absoluteTargetRect = calculateImageBufferRect(targetRect, absoluteTransform);
 
     // The mask image has been created in the absolute coordinate space, as the image should not be scaled.
@@ -307 +264 @@
     if (safeToClear && !currentContentTransformation().isIdentity())
         imageBuffer = nullptr;
-}
-
-void SVGRenderingContext::clear2DRotation(AffineTransform& transform)
-{
-    AffineTransform::DecomposedType decomposition;
-    transform.decompose(decomposition);
-    decomposition.angle = 0;
-    transform.recompose(decomposition);
 }
 
@@ -334 +283 @@
     // Create a new buffer and paint the foreground into it.
     if (!imageBuffer) {
-        imageBuffer = ImageBuffer::createCompatibleBuffer(expandedIntSize(boundingBox.size()), DestinationColorSpace::SRGB(), m_paintInfo->context());
+        imageBuffer = m_paintInfo->context().createCompatibleImageBuffer(expandedIntSize(boundingBox.size()));
         if (!imageBuffer)
             return false;

trunk/Source/WebCore/rendering/svg/SVGRenderingContext.h

@@ -61 +61 @@
     bool isRenderingPrepared() const { return m_renderingFlags & RenderingPrepared; }
 
-    static RefPtr<ImageBuffer> createImageBuffer(const FloatRect& targetRect, const AffineTransform& absoluteTransform, const DestinationColorSpace&, RenderingMode, const HostWindow* = nullptr);
-    static RefPtr<ImageBuffer> createImageBuffer(const FloatRect& targetRect, const FloatRect& clampedRect, const DestinationColorSpace&, RenderingMode, const HostWindow* = nullptr);
-
     static void renderSubtreeToContext(GraphicsContext&, RenderElement&, const AffineTransform&);
-    static void clipToImageBuffer(GraphicsContext&, const AffineTransform& absoluteTransform, const FloatRect& targetRect, RefPtr<ImageBuffer>&, bool safeToClear);
+    static void clipToImageBuffer(GraphicsContext&, const FloatRect& targetRect, const FloatSize& scale, RefPtr<ImageBuffer>&, bool safeToClear);
 
     static float calculateScreenFontSizeScalingFactor(const RenderObject&);
     static AffineTransform calculateTransformationToOutermostCoordinateSystem(const RenderObject&);
-    static void clear2DRotation(AffineTransform&);
 
     static IntRect calculateImageBufferRect(const FloatRect& targetRect, const AffineTransform& absoluteTransform)

trunk/Source/WebCore/svg/SVGFEImageElement.cpp

@@ -178 +178 @@
 }
 
+static inline IntRect scaledImageBufferRect(const FloatRect& rect, const FloatSize& scale)
+{
+    auto scaledRect = rect;
+    scaledRect.scale(scale);
+    return enclosingIntRect(scaledRect);
+}
+
+static inline FloatSize clampingScaleForImageBufferSize(const FloatSize& size)
+{
+    FloatSize clampingScale(1, 1);
+    ImageBuffer::sizeNeedsClamping(size, clampingScale);
+    return clampingScale;
+}
+
+static RefPtr<ImageBuffer> createImageBuffer(const FloatRect& rect, const FloatSize& scale, HostWindow* hostWindow)
+{
+    auto scaledRect = scaledImageBufferRect(rect, scale);
+    if (scaledRect.isEmpty())
+        return nullptr;
+
+    auto clampingScale = clampingScaleForImageBufferSize(scaledRect.size());
+
+    auto imageBuffer = ImageBuffer::create(scaledRect.size() * clampingScale, RenderingMode::Unaccelerated, ShouldUseDisplayList::No, RenderingPurpose::DOM, 1, DestinationColorSpace::SRGB(), PixelFormat::BGRA8, hostWindow);
+    if (!imageBuffer)
+        return nullptr;
+
+    imageBuffer->context().scale(clampingScale);
+    imageBuffer->context().translate(-scaledRect.location());
+    imageBuffer->context().scale(scale);
+    return imageBuffer;
+}
+
 std::tuple<RefPtr<ImageBuffer>, FloatRect> SVGFEImageElement::imageBufferForEffect() const
 {
@@ -196 +228 @@
         return { };
 
-    auto shearFreeAbsoluteTransform = AffineTransform(absoluteTransform.xScale(), 0, 0, absoluteTransform.yScale(), 0, 0);
-
+    // Ignore 2D rotation, as it doesn't affect the image size.
+    FloatSize scale(absoluteTransform.xScale(), absoluteTransform.yScale());
     auto imageRect = renderer->repaintRectInLocalCoordinates();
 
-    auto imageBuffer = SVGRenderingContext::createImageBuffer(imageRect, shearFreeAbsoluteTransform, DestinationColorSpace::SRGB(), RenderingMode::Unaccelerated, renderer->hostWindow());
+    // FIXME: Replace this call with GraphicsContext::createImageBuffer() once the destination GraphicsContext is passed to this function.
+    auto imageBuffer = createImageBuffer(imageRect, scale, renderer->hostWindow());
     if (!imageBuffer)
         return { };

trunk/Source/WebCore/svg/graphics/SVGImage.cpp

@@ -251 +251 @@
     imageBufferSize.scale(imageBufferScale.width(), imageBufferScale.height());
 
-    auto buffer = ImageBuffer::createCompatibleBuffer(expandedIntSize(imageBufferSize.size()), 1, DestinationColorSpace::SRGB(), context);
+    auto buffer = context.createImageBuffer(expandedIntSize(imageBufferSize.size()));
     if (!buffer) // Failed to allocate buffer.
         return;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-02-09  Said Abou-Hallawa  <said@apple.com>
+
+        [GPU Process] Move ImageBuffer::createCompatibleImageBuffer() and SVGRenderingContext::createImageBuffer to GraphicsContext
+        https://bugs.webkit.org/show_bug.cgi?id=235758
+        rdar://88478470
+
+        Reviewed by Simon Fraser.
+
+        * GPUProcess/graphics/RemoteDisplayListRecorder.cpp:
+        (WebKit::RemoteDisplayListRecorder::beginClipToDrawingCommands):
+        * WebProcess/GPU/graphics/RemoteDisplayListRecorderProxy.cpp:
+        (WebKit::RemoteDisplayListRecorderProxy::createImageBuffer const):
+        (WebKit::RemoteDisplayListRecorderProxy::createCompatibleImageBuffer const):
+        * WebProcess/GPU/graphics/RemoteDisplayListRecorderProxy.h:
+
 2022-02-09  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/GPUProcess/graphics/RemoteDisplayListRecorder.cpp

@@ -203 +203 @@
 void RemoteDisplayListRecorder::beginClipToDrawingCommands(const FloatRect& destination, const DestinationColorSpace& colorSpace)
 {
-    m_maskImageBuffer = ImageBuffer::createCompatibleBuffer(destination.size(), colorSpace, drawingContext());
+    m_maskImageBuffer = drawingContext().createCompatibleImageBuffer(destination.size(), colorSpace);
 }
 

trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteDisplayListRecorderProxy.cpp

@@ -468 +468 @@
 }
 
+RefPtr<ImageBuffer> RemoteDisplayListRecorderProxy::createImageBuffer(const FloatSize& size, const DestinationColorSpace& colorSpace, RenderingMode renderingMode, RenderingMethod renderingMethod) const
+{
+    if (UNLIKELY(!m_renderingBackend)) {
+        ASSERT_NOT_REACHED();
+        return nullptr;
+    }
+
+    if (renderingMethod != RenderingMethod::Default)
+        return Recorder::createImageBuffer(size, colorSpace, renderingMode, renderingMethod);
+
+    return m_renderingBackend->createImageBuffer(size, renderingMode, 1, colorSpace, PixelFormat::BGRA8);
+}
+
+RefPtr<ImageBuffer> RemoteDisplayListRecorderProxy::createCompatibleImageBuffer(const FloatSize& size, const DestinationColorSpace& colorSpace, RenderingMethod renderingMethod) const
+{
+    auto renderingMode = renderingMethod == RenderingMethod::Default ? this->renderingMode() : RenderingMode::Unaccelerated;
+    return GraphicsContext::createImageBuffer(size, scaleFactor(), colorSpace, renderingMode, renderingMethod);
+}
+
+RefPtr<ImageBuffer> RemoteDisplayListRecorderProxy::createCompatibleImageBuffer(const FloatRect& rect, const DestinationColorSpace& colorSpace, RenderingMethod renderingMethod) const
+{
+    auto renderingMode = renderingMethod == RenderingMethod::Default ? this->renderingMode() : RenderingMode::Unaccelerated;
+    return GraphicsContext::createImageBuffer(rect, scaleFactor(), colorSpace, renderingMode, renderingMethod);
+}
+
 } // namespace WebCore
 

trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteDisplayListRecorderProxy.h

@@ -145 +145 @@
     std::unique_ptr<WebCore::GraphicsContext> createNestedContext(const WebCore::FloatRect& initialClip, const WebCore::AffineTransform& initialCTM) final;
 
+    RefPtr<WebCore::ImageBuffer> createImageBuffer(const WebCore::FloatSize&, const WebCore::DestinationColorSpace&, WebCore::RenderingMode, WebCore::RenderingMethod) const final;
+    RefPtr<WebCore::ImageBuffer> createCompatibleImageBuffer(const WebCore::FloatSize&, const WebCore::DestinationColorSpace& = WebCore::DestinationColorSpace::SRGB(), WebCore::RenderingMethod = WebCore::RenderingMethod::Default) const final;
+    RefPtr<WebCore::ImageBuffer> createCompatibleImageBuffer(const WebCore::FloatRect&, const WebCore::DestinationColorSpace& = WebCore::DestinationColorSpace::SRGB(), WebCore::RenderingMethod = WebCore::RenderingMethod::Default) const final;
+
     WebCore::RenderingResourceIdentifier m_destinationBufferIdentifier;
     WeakPtr<WebCore::ImageBuffer> m_imageBuffer;