Changeset 270605 in webkit

Timestamp:

Dec 9, 2020, 3:01:08 PM (6 years ago)

Author:

Said Abou-Hallawa

Message:

[GPU Process]: Recording an in-process ImageBuffer drawing has to convert it to a NativeImage first
​https://bugs.webkit.org/show_bug.cgi?id=219705

Reviewed by Wenson Hsieh.

Source/WebCore:

We will allow GraphicsContext::drawImageBuffer() to proceed with the
painting code path if the ImageBuffer is not a RemoteImageBuffer. In this
case ImageBuffer::draw() extracts a NativeImage from the ImageBuffer and
calls GraphicsContext::drawNativeImage() which will send the NativeImage
to GPUP.

• platform/graphics/GraphicsContext.cpp:

(WebCore::GraphicsContext::drawImageBuffer):

• platform/graphics/GraphicsContextImpl.h:

(WebCore::GraphicsContextImpl::canDrawImageBuffer const):

• platform/graphics/displaylists/DisplayListRecorder.cpp:

(WebCore::DisplayList::Recorder::canDrawImageBuffer const):

• platform/graphics/displaylists/DisplayListRecorder.h:

(WebCore::DisplayList::Recorder::Delegate::isCachedImageBuffer const):

Source/WebKit:

Override the virtual method isCachedImageBuffer() which in this case
answers the question: is this a remote ImageBuffer or not?

• WebProcess/GPU/graphics/RemoteImageBufferProxy.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/GraphicsContext.cpp (modified) (1 diff)
• WebCore/platform/graphics/GraphicsContextImpl.h (modified) (1 diff)
• WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp (modified) (1 diff)
• WebCore/platform/graphics/displaylists/DisplayListRecorder.h (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-12-09  Said Abou-Hallawa  <said@apple.com>
+
+        [GPU Process]: Recording an in-process ImageBuffer drawing has to convert it to a NativeImage first
+        https://bugs.webkit.org/show_bug.cgi?id=219705
+
+        Reviewed by Wenson Hsieh.
+
+        We will allow GraphicsContext::drawImageBuffer() to proceed with the 
+        painting code path if the ImageBuffer is not a RemoteImageBuffer. In this
+        case ImageBuffer::draw() extracts a NativeImage from the ImageBuffer and
+        calls GraphicsContext::drawNativeImage() which will send the NativeImage
+        to GPUP.
+
+        * platform/graphics/GraphicsContext.cpp:
+        (WebCore::GraphicsContext::drawImageBuffer):
+        * platform/graphics/GraphicsContextImpl.h:
+        (WebCore::GraphicsContextImpl::canDrawImageBuffer const):
+        * platform/graphics/displaylists/DisplayListRecorder.cpp:
+        (WebCore::DisplayList::Recorder::canDrawImageBuffer const):
+        * platform/graphics/displaylists/DisplayListRecorder.h:
+        (WebCore::DisplayList::Recorder::Delegate::isCachedImageBuffer const):
+
 2020-12-09  John Wilander  <wilander@apple.com>
 

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

@@ -804 +804 @@
         return;
 
-    if (m_impl) {
+    if (m_impl && m_impl->canDrawImageBuffer(image)) {
         m_impl->drawImageBuffer(image, destination, source, options);
         return;

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

@@ -40 +40 @@
 
     virtual bool hasPlatformContext() const = 0;
+    virtual bool canDrawImageBuffer(const ImageBuffer&) const { return true; }
     virtual PlatformGraphicsContext* platformContext() const = 0;
 

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

@@ -138 +138 @@
 }
 
+bool Recorder::canDrawImageBuffer(const ImageBuffer& imageBuffer) const
+{
+    return !m_delegate || m_delegate->isCachedImageBuffer(imageBuffer);
+}
+
 void Recorder::clearShadow()
 {

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

@@ -68 +68 @@
         virtual void didAppendItemOfType(ItemType) { }
         virtual void cacheNativeImage(NativeImage&) { }
+        virtual bool isCachedImageBuffer(const ImageBuffer&) const { return false; }
     };
 
@@ -75 +76 @@
     friend class DrawGlyphsRecorder;
     bool hasPlatformContext() const override { return false; }
+    bool canDrawImageBuffer(const ImageBuffer&) const override;
     PlatformGraphicsContext* platformContext() const override { return nullptr; }
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-12-09  Said Abou-Hallawa  <said@apple.com>
+
+        [GPU Process]: Recording an in-process ImageBuffer drawing has to convert it to a NativeImage first
+        https://bugs.webkit.org/show_bug.cgi?id=219705
+
+        Reviewed by Wenson Hsieh.
+
+        Override the virtual method isCachedImageBuffer() which in this case
+        answers the question: is this a remote ImageBuffer or not?
+
+        * WebProcess/GPU/graphics/RemoteImageBufferProxy.h:
+
 2020-12-09  Per Arne Vollan  <pvollan@apple.com>
 

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

@@ -188 +188 @@
         if (m_remoteRenderingBackendProxy)
             m_remoteRenderingBackendProxy->remoteResourceCacheProxy().cacheNativeImage(image);
+    }
+
+    bool isCachedImageBuffer(const WebCore::ImageBuffer& imageBuffer) const override
+    {
+        if (!m_remoteRenderingBackendProxy)
+            return false;
+        auto cachedImageBuffer = m_remoteRenderingBackendProxy->remoteResourceCacheProxy().cachedImageBuffer(imageBuffer.renderingResourceIdentifier());
+        ASSERT(!cachedImageBuffer || cachedImageBuffer == &imageBuffer);
+        return cachedImageBuffer;
     }