Add a layout test for volatile front buffer (forcing a sync GPUP swap). #22958

mattwoodrow · 2024-01-19T03:35:47Z

`247a813`

Add a layout test for volatile front buffer (forcing a sync GPUP swap).
https://bugs.webkit.org/show_bug.cgi?id=267749
<rdar://121232490>

Reviewed by Simon Fraser.

Adds a new 'markFrontBufferVolatileForTesting' function to Internals, which sets
the volatile state on the current front buffer of the Element's layer.

Adds a test that uses this, and would catch the failure from bug 267300.

* LayoutTests/compositing/repaint/needs-no-display-volatile-expected.html: Added.
* LayoutTests/compositing/repaint/needs-no-display-volatile.html: Added.
* Source/WebCore/platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::markFrontBufferVolatileForTesting):
* Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::markFrontBufferVolatileForTesting):
* Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h:
* Source/WebCore/platform/graphics/ca/PlatformCALayer.h:
* Source/WebCore/rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects const):
* Source/WebCore/rendering/RenderLayer.h:
* Source/WebCore/rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::markFrontBufferVolatileForTesting):
* Source/WebCore/rendering/RenderLayerBacking.h:
* Source/WebCore/testing/Internals.cpp:
(WebCore::Internals::markFrontBufferVolatile):
* Source/WebCore/testing/Internals.h:
* Source/WebCore/testing/Internals.idl:
* Source/WebKit/GPUProcess/graphics/RemoteImageBufferSet.cpp:
(WebKit::RemoteImageBufferSet::ensureBufferForDisplay):
* Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.h:
* Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm:
(WebKit::RemoteLayerBackingStore::markFrontBufferVolatileForTesting):
* Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStoreCollection.h:
* Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStoreCollection.mm:
(WebKit::RemoteLayerBackingStoreCollection::prepareBackingStoresForDisplay):
(WebKit::RemoteLayerBackingStoreCollection::markFrontBufferVolatileForTesting):
* Source/WebKit/Shared/RemoteLayerTree/RemoteLayerWithInProcessRenderingBackingStore.h:
* Source/WebKit/Shared/RemoteLayerTree/RemoteLayerWithRemoteRenderingBackingStore.h:
* Source/WebKit/Shared/RemoteLayerTree/RemoteLayerWithRemoteRenderingBackingStore.mm:
(WebKit::RemoteLayerWithRemoteRenderingBackingStore::prepareToDisplay):
* Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemote.h:
* Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemote.mm:
(WebKit::PlatformCALayerRemote::markFrontBufferVolatileForTesting):

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

c5bdc06

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 wincairo~~
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	~~🧪 ios-wk2-wpt~~	✅ 🧪 mac-wk1	✅ 🛠 gtk
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	❌ 🧪 api-gtk
	~~🛠 tv-sim~~	✅ 🧪 mac-wk2-stress
	~~🛠 watch~~
~~🛠 🧪 unsafe-merge~~	✅ 🛠 watch-sim

webkit-early-warning-system · 2024-01-19T03:35:59Z

EWS run on previous version of this PR (hash 14657d4)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 gtk
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv-sim	✅ 🧪 mac-wk2-stress
	✅ 🛠 watch
	✅ 🛠 watch-sim

https://bugs.webkit.org/show_bug.cgi?id=268025 <rdar://121488303> Reviewed by Simon Fraser. Creating a flusher for a RemoteLayerBackingStore now waits for backend handles to be delivered as well as flushing any drawing. We need to call this even when the dirty region is empty, so that we get handles delivered. Adds an enum to describe what we want to wait for, so that can avoid flushing the drawing (or creating a flusher entirely) if no drawing commands have been issued. https://bugs.webkit.org/show_bug.cgi?id=267749 (PR WebKit#22958) adds a test that will catch this. * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.h: * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm: (WebKit::RemoteLayerBackingStore::paintContents): * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerWithInProcessRenderingBackingStore.h: * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerWithInProcessRenderingBackingStore.mm: (WebKit::RemoteLayerWithInProcessRenderingBackingStore::createFlusher): * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerWithRemoteRenderingBackingStore.h: * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerWithRemoteRenderingBackingStore.mm: (WebKit::RemoteLayerWithRemoteRenderingBackingStore::createFlusher): * Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferSetProxy.cpp: (WebKit::RemoteImageBufferSetProxyFlushFence::create): (WebKit::RemoteImageBufferSetProxyFlushFence::waitFor): (WebKit::RemoteImageBufferSetProxyFlushFence::tryTakeEvent): (WebKit::RemoteImageBufferSetProxyFlushFence::RemoteImageBufferSetProxyFlushFence): (WebKit::RemoteImageBufferSetProxy::flushFrontBufferAsync): * Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferSetProxy.h: Canonical link: https://commits.webkit.org/273475@main

smfr · 2024-01-31T02:32:02Z

Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStoreCollection.mm

Blank line here.

smfr · 2024-01-31T02:32:21Z

Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStoreCollection.mm

if (auto bufferSet = remoteBackingStore->protectedBufferSet())

We normally prefer:

if (RefPtr bufferSet = remoteBackingStore->bufferSet())

The protectedFoo() functions are to avoid local variables.

Please don't hide smart pointers behind auto. As we're adopting smart pointers, it is very convenient to see right away that we have a RefPtr here.

cdumez · 2024-01-31T02:37:32Z

Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

Please should probably use a RefPtr here per our guidelines:

if (RefPtr layer = primaryLayer()) layer->markFrontBufferVolatileForTesting();

cdumez · 2024-01-31T02:38:35Z

Source/WebCore/rendering/RenderLayer.cpp

Ideally we'd use a CheckedPtr here since the backing is not ref counted.

cdumez · 2024-01-31T02:39:21Z

Source/WebCore/rendering/RenderLayerBacking.cpp

You need a local smart pointer, per our guidelines:

if (RefPtr graphicsLayer = m_graphicsLayer) graphicsLayer->markFrontBufferVolatileForTesting();

webkit-early-warning-system · 2024-01-31T02:40:48Z

EWS run on previous version of this PR (hash 3ae821b)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	⏳ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	⏳ 🧪 wpe-wk2
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	⏳ 🧪 api-mac	~~🧪 api-wpe~~
	⏳ 🧪 ios-wk2-wpt	~~🧪 mac-wk1~~	✅ 🛠 gtk
⏳ 🛠 🧪 jsc	✅ 🧪 api-ios	⏳ 🧪 mac-wk2	~~🧪 gtk-wk2~~
⏳ 🛠 🧪 jsc-arm64	⏳ 🛠 tv	⏳ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	⏳ 🛠 tv-sim	~~🧪 mac-wk2-stress~~
	⏳ 🛠 watch
	✅ 🛠 watch-sim

cdumez · 2024-01-31T02:41:38Z

Source/WebCore/rendering/RenderLayerBacking.h

Extra blank line here.

cdumez · 2024-01-31T02:42:04Z

Source/WebCore/testing/Internals.cpp

enclosingLayer should be in a CheckedPtr before calling the member function.

cdumez · 2024-01-31T02:42:17Z

Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm

Ideally would use a CheckedPtr since not ref counted.

cdumez · 2024-01-31T02:42:54Z

Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStoreCollection.mm

CheckedRef.

cdumez · 2024-01-31T02:44:18Z

Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemote.mm

Should put the store in a CheckedPtr local before calling the member function on it (since not ref counted).

webkit-early-warning-system · 2024-01-31T03:15:12Z

EWS run on current version of this PR (hash 5972f19)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
⏳ 🧪 style	⏳ 🛠 ios	🛠 mac	⏳ 🛠 wpe	⏳ 🛠 wincairo
🧪 bindings	⏳ 🛠 ios-sim	⏳ 🛠 mac-AS-debug	⏳ 🧪 wpe-wk2
🧪 webkitperl	⏳ 🧪 ios-wk2	🧪 api-mac	⏳ 🧪 api-wpe
	⏳ 🧪 ios-wk2-wpt	🧪 mac-wk1	🛠 gtk
⏳ 🛠 🧪 jsc	⏳ 🧪 api-ios	🧪 mac-wk2	🧪 gtk-wk2
⏳ 🛠 🧪 jsc-arm64	⏳ 🛠 tv	⏳ 🧪 mac-AS-debug-wk2	🧪 api-gtk
🧪 services	⏳ 🛠 tv-sim	🧪 mac-wk2-stress	⏳ 🛠 jsc-armv7
	⏳ 🛠 watch		⏳ 🧪 jsc-armv7-tests
	⏳ 🛠 watch-sim

webkit-early-warning-system · 2024-01-31T03:15:13Z

EWS run on previous version of this PR (hash 5972f19)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	⏳ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	⏳ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	⏳ 🧪 api-mac	~~🧪 api-wpe~~
	⏳ 🧪 ios-wk2-wpt	~~🧪 mac-wk1~~	✅ 🛠 gtk
⏳ 🛠 🧪 jsc	~~🧪 api-ios~~	⏳ 🧪 mac-wk2	⏳ 🧪 gtk-wk2
⏳ 🛠 🧪 jsc-arm64	⏳ 🛠 tv	⏳ 🧪 mac-AS-debug-wk2	⏳ 🧪 api-gtk
	⏳ 🛠 tv-sim	~~🧪 mac-wk2-stress~~
	⏳ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2024-01-31T03:28:30Z

EWS run on current version of this PR (hash c5bdc06)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 wincairo~~
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	~~🧪 ios-wk2-wpt~~	✅ 🧪 mac-wk1	✅ 🛠 gtk
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	❌ 🧪 api-gtk
	~~🛠 tv-sim~~	✅ 🧪 mac-wk2-stress
	~~🛠 watch~~
~~🛠 🧪 unsafe-merge~~	✅ 🛠 watch-sim

https://bugs.webkit.org/show_bug.cgi?id=267749 <rdar://121232490> Reviewed by Simon Fraser. Adds a new 'markFrontBufferVolatileForTesting' function to Internals, which sets the volatile state on the current front buffer of the Element's layer. Adds a test that uses this, and would catch the failure from bug 267300. * LayoutTests/compositing/repaint/needs-no-display-volatile-expected.html: Added. * LayoutTests/compositing/repaint/needs-no-display-volatile.html: Added. * Source/WebCore/platform/graphics/GraphicsLayer.h: (WebCore::GraphicsLayer::markFrontBufferVolatileForTesting): * Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp: (WebCore::GraphicsLayerCA::markFrontBufferVolatileForTesting): * Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h: * Source/WebCore/platform/graphics/ca/PlatformCALayer.h: * Source/WebCore/rendering/RenderLayer.cpp: (WebCore::RenderLayer::calculateClipRects const): * Source/WebCore/rendering/RenderLayer.h: * Source/WebCore/rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::markFrontBufferVolatileForTesting): * Source/WebCore/rendering/RenderLayerBacking.h: * Source/WebCore/testing/Internals.cpp: (WebCore::Internals::markFrontBufferVolatile): * Source/WebCore/testing/Internals.h: * Source/WebCore/testing/Internals.idl: * Source/WebKit/GPUProcess/graphics/RemoteImageBufferSet.cpp: (WebKit::RemoteImageBufferSet::ensureBufferForDisplay): * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.h: * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm: (WebKit::RemoteLayerBackingStore::markFrontBufferVolatileForTesting): * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStoreCollection.h: * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStoreCollection.mm: (WebKit::RemoteLayerBackingStoreCollection::prepareBackingStoresForDisplay): (WebKit::RemoteLayerBackingStoreCollection::markFrontBufferVolatileForTesting): * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerWithInProcessRenderingBackingStore.h: * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerWithRemoteRenderingBackingStore.h: * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerWithRemoteRenderingBackingStore.mm: (WebKit::RemoteLayerWithRemoteRenderingBackingStore::prepareToDisplay): * Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemote.h: * Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemote.mm: (WebKit::PlatformCALayerRemote::markFrontBufferVolatileForTesting): Canonical link: https://commits.webkit.org/273814@main

webkit-commit-queue · 2024-01-31T06:31:54Z

Committed 273814@main (247a813): https://commits.webkit.org/273814@main

Reviewed commits have been landed. Closing PR #22958 and removing active labels.

Corrupt/missing tile content on tab switch. https://bugs.webkit.org/show_bug.cgi?id=268025 <rdar://121488303> Reviewed by Simon Fraser. Creating a flusher for a RemoteLayerBackingStore now waits for backend handles to be delivered as well as flushing any drawing. We need to call this even when the dirty region is empty, so that we get handles delivered. Adds an enum to describe what we want to wait for, so that can avoid flushing the drawing (or creating a flusher entirely) if no drawing commands have been issued. https://bugs.webkit.org/show_bug.cgi?id=267749 (PR WebKit#22958) adds a test that will catch this. * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.h: * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm: (WebKit::RemoteLayerBackingStore::paintContents): * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerWithInProcessRenderingBackingStore.h: * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerWithInProcessRenderingBackingStore.mm: (WebKit::RemoteLayerWithInProcessRenderingBackingStore::createFlusher): * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerWithRemoteRenderingBackingStore.h: * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerWithRemoteRenderingBackingStore.mm: (WebKit::RemoteLayerWithRemoteRenderingBackingStore::createFlusher): * Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferSetProxy.cpp: (WebKit::RemoteImageBufferSetProxyFlushFence::create): (WebKit::RemoteImageBufferSetProxyFlushFence::waitFor): (WebKit::RemoteImageBufferSetProxyFlushFence::tryTakeEvent): (WebKit::RemoteImageBufferSetProxyFlushFence::RemoteImageBufferSetProxyFlushFence): (WebKit::RemoteImageBufferSetProxy::flushFrontBufferAsync): * Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferSetProxy.h: Canonical link: https://commits.webkit.org/273475@main Identifier: 272448.383@safari-7618-branch

mattwoodrow requested a review from cdumez as a code owner January 19, 2024 03:35

mattwoodrow self-assigned this Jan 19, 2024

mattwoodrow added the Layout and Rendering For bugs with layout and rendering of Web pages. label Jan 19, 2024

smfr approved these changes Jan 31, 2024

View reviewed changes

cdumez reviewed Jan 31, 2024

View reviewed changes

Source/WebCore/rendering/RenderLayer.cpp Outdated

Copy link

Contributor

cdumez Jan 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally we'd use a CheckedPtr here since the backing is not ref counted.

cdumez reviewed Jan 31, 2024

View reviewed changes

mattwoodrow changed the title ~~Add a layout test for volatile front buffer (forcing a sync GPUP swap).~~ Corrupt tiles when scrolling and selecting text quickly. Jan 31, 2024

mattwoodrow force-pushed the eng/books-unlock-flicker-with-test branch from 14657d4 to 3ae821b Compare January 31, 2024 02:40

cdumez reviewed Jan 31, 2024

View reviewed changes

mattwoodrow changed the title ~~Corrupt tiles when scrolling and selecting text quickly.~~ Add a layout test for volatile front buffer (forcing a sync GPUP swap). Jan 31, 2024

mattwoodrow force-pushed the eng/books-unlock-flicker-with-test branch from 3ae821b to 5972f19 Compare January 31, 2024 03:15

mattwoodrow force-pushed the eng/books-unlock-flicker-with-test branch from 5972f19 to c5bdc06 Compare January 31, 2024 03:28

mattwoodrow added merge-queue Applied to send a pull request to merge-queue unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing and removed unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing labels Jan 31, 2024

webkit-commit-queue force-pushed the eng/books-unlock-flicker-with-test branch from c5bdc06 to 247a813 Compare January 31, 2024 06:31

webkit-commit-queue merged commit 247a813 into WebKit:main Jan 31, 2024

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Jan 31, 2024

Add a layout test for volatile front buffer (forcing a sync GPUP swap). #22958

Add a layout test for volatile front buffer (forcing a sync GPUP swap). #22958

Uh oh!

Conversation

mattwoodrow commented Jan 19, 2024 • edited by webkit-early-warning-system Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jan 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

webkit-early-warning-system commented Jan 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

webkit-early-warning-system commented Jan 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jan 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jan 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-commit-queue commented Jan 31, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

mattwoodrow commented Jan 19, 2024 •

edited by webkit-early-warning-system

Loading

webkit-early-warning-system commented Jan 19, 2024 •

edited

Loading

webkit-early-warning-system commented Jan 31, 2024 •

edited

Loading

webkit-early-warning-system commented Jan 31, 2024 •

edited

Loading

webkit-early-warning-system commented Jan 31, 2024 •

edited

Loading

webkit-early-warning-system commented Jan 31, 2024 •

edited

Loading