Changeset 269159 in webkit

Timestamp:

Oct 29, 2020, 11:35:59 AM (6 years ago)

Author:

Said Abou-Hallawa

Message:

REGRESSION(269065): [GPU Process]: Order of drawing has to be preserved when drawing a canvas to another canvas
​https://bugs.webkit.org/show_bug.cgi?id=218324

Reviewed by Simon Fraser.

Source/WebCore:

Allow DisplayList::Recorder::Delegate to take an action after appending
a DisplayList::Item to its DisplayList::DisplayList.

Test: fast/canvas/canvas-draw-canvas-on-canvas-flushing-order.html

• platform/graphics/displaylists/DisplayListRecorder.cpp:

(WebCore::DisplayList::Recorder::didAppendItem):
(WebCore::DisplayList::Recorder::appendItemAndUpdateExtent):
(WebCore::DisplayList::Recorder::appendItem):

• platform/graphics/displaylists/DisplayListRecorder.h:

(WebCore::DisplayList::Recorder::Delegate::didAppendItem):

Source/WebKit:

When drawing an ImageBuffer to another ImageBuffer, the DrawingContext of
the source and the destination ImageBuffers have to be flushed immediately.
Otherwise an older version or a newer version of the source ImageBuffer
might be drawn to the destination ImageBuffer.

• WebProcess/GPU/graphics/RemoteImageBufferProxy.h:

LayoutTests:

• fast/canvas/canvas-draw-canvas-on-canvas-flushing-order-expected.html: Added.
• fast/canvas/canvas-draw-canvas-on-canvas-flushing-order.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-draw-canvas-on-canvas-flushing-order-expected.html (added)
• LayoutTests/fast/canvas/canvas-draw-canvas-on-canvas-flushing-order.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-10-29  Said Abou-Hallawa  <said@apple.com>
+
+        REGRESSION(269065): [GPU Process]: Order of drawing has to be preserved when drawing a canvas to another canvas
+        https://bugs.webkit.org/show_bug.cgi?id=218324
+
+        Reviewed by Simon Fraser.
+
+        * fast/canvas/canvas-draw-canvas-on-canvas-flushing-order-expected.html: Added.
+        * fast/canvas/canvas-draw-canvas-on-canvas-flushing-order.html: Added.
+
 2020-10-29  Noam Rosenthal  <noam@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-29  Said Abou-Hallawa  <said@apple.com>
+
+        REGRESSION(269065): [GPU Process]: Order of drawing has to be preserved when drawing a canvas to another canvas
+        https://bugs.webkit.org/show_bug.cgi?id=218324
+
+        Reviewed by Simon Fraser.
+
+        Allow DisplayList::Recorder::Delegate to take an action after appending
+        a DisplayList::Item to its DisplayList::DisplayList.
+
+        Test: fast/canvas/canvas-draw-canvas-on-canvas-flushing-order.html
+
+        * platform/graphics/displaylists/DisplayListRecorder.cpp:
+        (WebCore::DisplayList::Recorder::didAppendItem):
+        (WebCore::DisplayList::Recorder::appendItemAndUpdateExtent):
+        (WebCore::DisplayList::Recorder::appendItem):
+        * platform/graphics/displaylists/DisplayListRecorder.h:
+        (WebCore::DisplayList::Recorder::Delegate::didAppendItem):
+
 2020-10-29  Noam Rosenthal  <noam@webkit.org>
 

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

@@ -126 +126 @@
 }
 
+void Recorder::didAppendItem(const Item& item)
+{
+    if (m_delegate)
+        m_delegate->didAppendItem(item);
+}
+
 void Recorder::updateState(const GraphicsContextState& state, GraphicsContextState::StateChangeFlags flags)
 {
@@ -448 +454 @@
 void Recorder::appendItemAndUpdateExtent(Ref<DrawingItem>&& item)
 {
-    auto& newItem = appendItem(WTFMove(item));
+    DrawingItem& newItem = item.get();
+    appendItem(WTFMove(item));
     updateItemExtent(newItem);
 }
 
-template<typename ItemType>
-ItemType& Recorder::appendItem(Ref<ItemType>&& item)
-{
+void Recorder::appendItem(Ref<Item>&& item)
+{
+    Item& newItem = item.get();
     willAppendItem(item.get());
-    return downcast<ItemType>(m_displayList.append(WTFMove(item)));
+    m_displayList.append(WTFMove(item));
+    didAppendItem(newItem);
 }
 

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

@@ -69 +69 @@
         virtual bool lockRemoteImageBuffer(WebCore::ImageBuffer&) { return false; }
         virtual void willAppendItem(const Item&) { };
+        virtual void didAppendItem(const Item&) { };
     };
 
@@ -148 +149 @@
     FloatRect roundToDevicePixels(const FloatRect&, GraphicsContext::RoundingMode) override;
 
-    template<typename ItemType>
-    ItemType& appendItem(Ref<ItemType>&&);
+    void appendItem(Ref<Item>&&);
     void willAppendItem(const Item&);
+    void didAppendItem(const Item&);
 
     void appendStateChangeItem(const GraphicsContextStateChange&, GraphicsContextState::StateChangeFlags);

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-10-29  Said Abou-Hallawa  <said@apple.com>
+
+        REGRESSION(269065): [GPU Process]: Order of drawing has to be preserved when drawing a canvas to another canvas
+        https://bugs.webkit.org/show_bug.cgi?id=218324
+
+        Reviewed by Simon Fraser.
+
+        When drawing an ImageBuffer to another ImageBuffer, the DrawingContext of
+        the source and the destination ImageBuffers have to be flushed immediately.
+        Otherwise an older version or a newer version of the source ImageBuffer
+        might be drawn to the destination ImageBuffer.
+
+        * WebProcess/GPU/graphics/RemoteImageBufferProxy.h:
+
 2020-10-29  Ryan Haddad  <ryanhaddad@apple.com>
 

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

@@ -165 +165 @@
         if (!m_remoteRenderingBackendProxy)
             return false;
-        return m_remoteRenderingBackendProxy->remoteResourceCacheProxy().lockRemoteImageBufferForRemoteClient(imageBuffer, m_renderingResourceIdentifier);
+        if (!m_remoteRenderingBackendProxy->remoteResourceCacheProxy().lockRemoteImageBufferForRemoteClient(imageBuffer, m_renderingResourceIdentifier))
+            return false;
+        imageBuffer.flushDrawingContext();
+        return true;
     }
 
@@ -179 +182 @@
     }
 
+    void didAppendItem(const WebCore::DisplayList::Item& item) override
+    {
+        if (item.type() == WebCore::DisplayList::ItemType::DrawImageBuffer)
+            flushDrawingContext();
+    }
+
     DisplayListFlushIdentifier m_sentFlushIdentifier;
     DisplayListFlushIdentifier m_receivedFlushIdentifier;