Changeset 286835 in webkit

Timestamp:

Dec 10, 2021, 12:11:25 AM (5 years ago)

Author:

Said Abou-Hallawa

Message:

[GPU Process] [Filters] Enable Filter rendering in GPU Process
​https://bugs.webkit.org/show_bug.cgi?id=233989

Reviewed by Cameron McCormack.

This will move applying the CSSFilterImageValue, the CSSFilter and the
SVGFilter to GPUProcess.

• css/CSSFilterImageValue.cpp:

(WebCore::CSSFilterImageValue::image):

• rendering/RenderLayerFilters.cpp:

(WebCore::RenderLayerFilters::allocateBackingStoreIfNeeded):

• rendering/RenderMenuList.cpp:

(RenderMenuList::hostWindow const):
Change the implementation to call RenderObject::hostWindow() since it is
now defined to be virtual in the two base classes.

• rendering/RenderObject.cpp:

(WebCore::RenderObject::hostWindow const):

• rendering/RenderObject.h:

Add the helper function RenderObject::hostWindow() since it is being
requested in many places because of creating ImageBuffer for GPUProcess.

• rendering/RenderSearchField.cpp:

(WebCore::RenderSearchField::hostWindow const):
Change the implementation to call RenderObject::hostWindow() since it is
now defined to be virtual in the two base classes.

• rendering/svg/RenderSVGResourceClipper.cpp:

(WebCore::RenderSVGResourceClipper::applyClippingToContext):

• rendering/svg/RenderSVGResourceFilter.cpp:

(WebCore::RenderSVGResourceFilter::applyResource):
(WebCore::RenderSVGResourceFilter::postApplyResource):

• rendering/svg/RenderSVGResourceMasker.cpp:

(WebCore::RenderSVGResourceMasker::applyResource):
filterData.sourceGraphicBuffer will have to stay around because caching
the filter result has not been implemented yet.

• rendering/svg/SVGRenderingContext.cpp:

(WebCore::SVGRenderingContext::createImageBuffer):

• rendering/svg/SVGRenderingContext.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSFilterImageValue.cpp (modified) (1 diff)
• rendering/RenderLayerFilters.cpp (modified) (1 diff)
• rendering/RenderMenuList.cpp (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/RenderObject.h (modified) (2 diffs)
• rendering/RenderSearchField.cpp (modified) (1 diff)
• rendering/svg/RenderSVGResourceClipper.cpp (modified) (1 diff)
• rendering/svg/RenderSVGResourceFilter.cpp (modified) (2 diffs)
• rendering/svg/RenderSVGResourceMasker.cpp (modified) (1 diff)
• rendering/svg/SVGRenderingContext.cpp (modified) (3 diffs)
• rendering/svg/SVGRenderingContext.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-10  Said Abou-Hallawa  <said@apple.com>
+
+        [GPU Process] [Filters] Enable Filter rendering in GPU Process
+        https://bugs.webkit.org/show_bug.cgi?id=233989
+
+        Reviewed by Cameron McCormack.
+
+        This will move applying the CSSFilterImageValue, the CSSFilter and the
+        SVGFilter to GPUProcess.
+
+        * css/CSSFilterImageValue.cpp:
+        (WebCore::CSSFilterImageValue::image):
+        * rendering/RenderLayerFilters.cpp:
+        (WebCore::RenderLayerFilters::allocateBackingStoreIfNeeded):
+        * rendering/RenderMenuList.cpp:
+        (RenderMenuList::hostWindow const):
+        Change the implementation to call RenderObject::hostWindow() since it is
+        now defined to be virtual in the two base classes.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::hostWindow const):
+        * rendering/RenderObject.h:
+        Add the helper function RenderObject::hostWindow() since it is being 
+        requested in many places because of creating ImageBuffer for GPUProcess.
+
+        * rendering/RenderSearchField.cpp:
+        (WebCore::RenderSearchField::hostWindow const):
+        Change the implementation to call RenderObject::hostWindow() since it is
+        now defined to be virtual in the two base classes.
+
+        * rendering/svg/RenderSVGResourceClipper.cpp:
+        (WebCore::RenderSVGResourceClipper::applyClippingToContext):
+        * rendering/svg/RenderSVGResourceFilter.cpp:
+        (WebCore::RenderSVGResourceFilter::applyResource):
+        (WebCore::RenderSVGResourceFilter::postApplyResource):
+        * rendering/svg/RenderSVGResourceMasker.cpp:
+        (WebCore::RenderSVGResourceMasker::applyResource):
+        filterData.sourceGraphicBuffer will have to stay around because caching
+        the filter result has not been implemented yet.
+
+        * rendering/svg/SVGRenderingContext.cpp:
+        (WebCore::SVGRenderingContext::createImageBuffer):
+        * rendering/svg/SVGRenderingContext.h:
+
 2021-12-09  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/css/CSSFilterImageValue.cpp

@@ -118 +118 @@
     // FIXME (149424): This buffer should not be unconditionally unaccelerated.
     auto renderingMode = RenderingMode::Unaccelerated;
-    auto sourceImage = ImageBuffer::create(size, renderingMode, 1, DestinationColorSpace::SRGB(), PixelFormat::BGRA8);
+    auto sourceImage = ImageBuffer::create(size, renderingMode, ShouldUseDisplayList::No, RenderingPurpose::DOM, 1, DestinationColorSpace::SRGB(), PixelFormat::BGRA8, renderer.hostWindow());
     if (!sourceImage)
         return &Image::nullImage();

trunk/Source/WebCore/rendering/RenderLayerFilters.cpp

@@ -140 +140 @@
 #else
         UNUSED_PARAM(targetContext);
-        m_sourceImage = ImageBuffer::create(logicalSize, filter.renderingMode(), 1, DestinationColorSpace::SRGB(), PixelFormat::BGRA8);
+        m_sourceImage = ImageBuffer::create(logicalSize, filter.renderingMode(), ShouldUseDisplayList::No, RenderingPurpose::DOM, 1, DestinationColorSpace::SRGB(), PixelFormat::BGRA8, m_layer.renderer().hostWindow());
 #endif
         if (auto context = inputContext())

trunk/Source/WebCore/rendering/RenderMenuList.cpp

@@ -550 +550 @@
 HostWindow* RenderMenuList::hostWindow() const
 {
-    return view().frameView().hostWindow();
+    return RenderFlexibleBox::hostWindow();
 }
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1455 +1455 @@
 }
 
+HostWindow* RenderObject::hostWindow() const
+{
+    return view().frameView().root() ? view().frameView().root()->hostWindow() : nullptr;
+}
+
 bool RenderObject::isRooted() const
 {

trunk/Source/WebCore/rendering/RenderObject.h

@@ -55 +55 @@
 class HitTestRequest;
 class HitTestResult;
+class HostWindow;
 class LegacyInlineBox;
 class Path;
@@ -453 +454 @@
 
     RenderView& view() const { return *document().renderView(); };
+    HostWindow* hostWindow() const;
 
     // Returns true if this renderer is rooted.

trunk/Source/WebCore/rendering/RenderSearchField.cpp

@@ -356 +356 @@
 HostWindow* RenderSearchField::hostWindow() const
 {
-    return view().frameView().hostWindow();
+    return RenderTextControlSingleLine::hostWindow();
 }
 

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

@@ -155 +155 @@
     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, &context);
+        auto maskImage = SVGRenderingContext::createImageBuffer(clippedContentBounds, absoluteTransform, DestinationColorSpace::SRGB(), RenderingMode::Unaccelerated, nullptr, &context);
         if (!maskImage)
             return false;

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

@@ -155 +155 @@
     auto colorSpace = DestinationColorSpace::SRGB();
 #endif
-    auto sourceGraphic = SVGRenderingContext::createImageBuffer(filterData->drawingRegion, effectiveTransform, colorSpace, filterData->filter->renderingMode(), context);
+    auto sourceGraphic = SVGRenderingContext::createImageBuffer(filterData->drawingRegion, effectiveTransform, colorSpace, filterData->filter->renderingMode(), renderer.hostWindow(), context);
     if (!sourceGraphic) {
         ASSERT(m_rendererFilterDataMap.contains(&renderer));
@@ -218 +218 @@
         context->drawFilteredImageBuffer(filterData.sourceGraphicBuffer.get(), filterData.drawingRegion, *filterData.filter);
     }
-
-    filterData.sourceGraphicBuffer = nullptr;
 
     LOG_WITH_STREAM(Filters, stream << "RenderSVGResourceFilter " << this << " postApplyResource done\n");

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

@@ -85 +85 @@
 
         // 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, context);
+        maskerData->maskImage = SVGRenderingContext::createImageBuffer(repaintRect, absoluteTransform, maskColorSpace, RenderingMode::Unaccelerated, nullptr, context);
         if (!maskerData->maskImage)
             return false;

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

@@ -227 +227 @@
 }
 
-RefPtr<ImageBuffer> SVGRenderingContext::createImageBuffer(const FloatRect& targetRect, const AffineTransform& absoluteTransform, const DestinationColorSpace& colorSpace, RenderingMode renderingMode, const GraphicsContext* context)
+RefPtr<ImageBuffer> SVGRenderingContext::createImageBuffer(const FloatRect& targetRect, const AffineTransform& absoluteTransform, const DestinationColorSpace& colorSpace, RenderingMode renderingMode, const HostWindow* hostWindow, const GraphicsContext* context)
 {
     IntRect paintRect = calculateImageBufferRect(targetRect, absoluteTransform);
@@ -238 +238 @@
     if (ImageBuffer::sizeNeedsClamping(clampedSize, scale))
         clampedSize = clampedSize * scale;
+
+#if USE(DIRECT2D)
+    auto imageBuffer = ImageBuffer::create(clampedSize, renderingMode, context, 1, colorSpace, PixelFormat::BGRA8);
+#else
+    UNUSED_PARAM(context);
+    auto imageBuffer = ImageBuffer::create(clampedSize, renderingMode, ShouldUseDisplayList::No, RenderingPurpose::DOM, 1, colorSpace, PixelFormat::BGRA8, hostWindow);
+#endif
+    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 GraphicsContext* context)
+{
+    IntSize clampedSize = roundedIntSize(clampedRect.size());
+    FloatSize unclampedSize = roundedIntSize(targetRect.size());
+
+    // Don't create empty ImageBuffers.
+    if (clampedSize.isEmpty())
+        return nullptr;
 
 #if USE(DIRECT2D)
@@ -248 +275 @@
         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 GraphicsContext* context)
-{
-    IntSize clampedSize = roundedIntSize(clampedRect.size());
-    FloatSize unclampedSize = roundedIntSize(targetRect.size());
-
-    // Don't create empty ImageBuffers.
-    if (clampedSize.isEmpty())
-        return nullptr;
-
-#if USE(DIRECT2D)
-    auto imageBuffer = ImageBuffer::create(clampedSize, renderingMode, context, 1, colorSpace, PixelFormat::BGRA8);
-#else
-    UNUSED_PARAM(context);
-    auto imageBuffer = ImageBuffer::create(clampedSize, renderingMode, 1, colorSpace, PixelFormat::BGRA8);
-#endif
-    if (!imageBuffer)
-        return nullptr;
-
     GraphicsContext& imageContext = imageBuffer->context();
 

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 GraphicsContext* = nullptr);
+    static RefPtr<ImageBuffer> createImageBuffer(const FloatRect& targetRect, const AffineTransform& absoluteTransform, const DestinationColorSpace&, RenderingMode, const HostWindow* = nullptr, const GraphicsContext* = nullptr);
     static RefPtr<ImageBuffer> createImageBuffer(const FloatRect& targetRect, const FloatRect& clampedRect, const DestinationColorSpace&, RenderingMode, const GraphicsContext* = nullptr);