[webkit-changes] [WebKit/WebKit] 216acd: Avoid geometry update assertions in some tests whe...
Cameron McCormack
noreply at github.com
Wed Oct 26 17:16:14 PDT 2022
Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 216acdc0bca8c93ccd03e1fd0706bcbe5270652b
https://github.com/WebKit/WebKit/commit/216acdc0bca8c93ccd03e1fd0706bcbe5270652b
Author: Cameron McCormack <heycam at apple.com>
Date: 2022-10-26 (Wed, 26 Oct 2022)
Changed paths:
M LayoutTests/platform/ios-simulator-wk2/TestExpectations
A LayoutTests/platform/ios-simulator-wk2/accessibility/visible-character-range-height-changes-expected.txt
A LayoutTests/platform/ios-simulator-wk2/accessibility/visible-character-range-width-changes-expected.txt
M Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm
Log Message:
-----------
Avoid geometry update assertions in some tests when UI side compositing is enabled on macOS
https://bugs.webkit.org/show_bug.cgi?id=242884
rdar://97583976
Reviewed by Kimmo Kinnunen.
Some tests hit this assertion when run on macOS with UI side compositing
enabeld:
ASSERTION FAILED: m_isWaitingForDidUpdateGeometry
.../OpenSource/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm(99) : virtual void WebKit::RemoteLayerTreeDrawingAreaProxy::didUpdateGeometry()
This is due to the set calling testRunner.setViewSize(...), which causes
UpdateGeometry / DidUpdateGeometry messages to be sent synchronously.
This means we re-entrantly call RemoteLayerTreeDrawingAreaProxy::didUpdateGeometry,
which asserts m_isWaitingForDidUpdateGeometry, before the
`m_isWaitingForDidUpdateGeometry = true` assignment just after the
send(Messages::DrawingArea::UpdateGeometry(...)) call in
RemoteLayerTreeDrawingAreaProxy::sendUpdateGeometry is run.
Move the assignment before the send() call to avoid this.
* LayoutTests/platform/ios-simulator-wk2/accessibility/visible-character-range-height-changes-expected.txt: Added.
* LayoutTests/platform/ios-simulator-wk2/accessibility/visible-character-range-width-changes-expected.txt: Added.
* LayoutTests/platform/ios-simulator-wk2/TestExpectations:
* Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm:
(WebKit::RemoteLayerTreeDrawingAreaProxy::sendUpdateGeometry):
Canonical link: https://commits.webkit.org/256042@main
More information about the webkit-changes
mailing list