Skip to content

ASSERT when asking DisplayListRecorder for a platform context#32520

Merged
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
hortont424:eng/ASSERT-when-asking-DisplayListRecorder-for-a-platform-context
Aug 22, 2024
Merged

ASSERT when asking DisplayListRecorder for a platform context#32520
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
hortont424:eng/ASSERT-when-asking-DisplayListRecorder-for-a-platform-context

Conversation

@hortont424
Copy link
Copy Markdown
Contributor

@hortont424 hortont424 commented Aug 21, 2024

b052305

ASSERT when asking DisplayListRecorder for a platform context
https://bugs.webkit.org/show_bug.cgi?id=278453
rdar://134401657

Reviewed by Abrar Rahman Protyasha.

* Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h:
Bug 278420 would have been much quicker to debug if we asserted when illegally
asking DisplayListRecorder for a platform context. So, do so!

* Source/WebCore/platform/mac/ScrollbarThemeMac.mm:
(WebCore::ScrollbarThemeMac::paint):
Instead of asking for a platform context to decide whether we can have one, ask if we can have one!

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

e27f4b2

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

@hortont424 hortont424 self-assigned this Aug 21, 2024
@hortont424 hortont424 added the WebKit Misc. For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore). label Aug 21, 2024
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Aug 21, 2024
@hortont424
Copy link
Copy Markdown
Contributor Author

For the ScrollbarThemeMac crashes, I think ScrollbarThemeMac::paint should consult hasPlatformContext, not call platformContext directly. I'll have to look at the GTK ones deeper.

@hortont424 hortont424 removed the merging-blocked Applied to prevent a change from being merged label Aug 21, 2024
@hortont424 hortont424 force-pushed the eng/ASSERT-when-asking-DisplayListRecorder-for-a-platform-context branch from ed3436f to e27f4b2 Compare August 21, 2024 19:12
@aprotyas
Copy link
Copy Markdown
Member

@hortont424 all of the GTK failures are EWS infra issues, I think. While you're at it, do you mind s/platform/hasPlatform here too?

if (m_transientPaintingSnapshot) {
if (!context.platformContext()) {
RefPtr image = m_transientPaintingSnapshot->createImage();

@hortont424 hortont424 added the merge-queue Applied to send a pull request to merge-queue label Aug 22, 2024
@webkit-commit-queue webkit-commit-queue force-pushed the eng/ASSERT-when-asking-DisplayListRecorder-for-a-platform-context branch from e27f4b2 to f4f6205 Compare August 22, 2024 00:25
https://bugs.webkit.org/show_bug.cgi?id=278453
rdar://134401657

Reviewed by Abrar Rahman Protyasha.

* Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h:
Bug 278420 would have been much quicker to debug if we asserted when illegally
asking DisplayListRecorder for a platform context. So, do so!

* Source/WebCore/platform/mac/ScrollbarThemeMac.mm:
(WebCore::ScrollbarThemeMac::paint):
Instead of asking for a platform context to decide whether we can have one, ask if we can have one!

Canonical link: https://commits.webkit.org/282593@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/ASSERT-when-asking-DisplayListRecorder-for-a-platform-context branch from f4f6205 to b052305 Compare August 22, 2024 00:27
@webkit-commit-queue
Copy link
Copy Markdown
Collaborator

Committed 282593@main (b052305): https://commits.webkit.org/282593@main

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

@webkit-commit-queue webkit-commit-queue merged commit b052305 into WebKit:main Aug 22, 2024
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Aug 22, 2024
@hortont424
Copy link
Copy Markdown
Contributor Author

@hortont424 all of the GTK failures are EWS infra issues, I think. While you're at it, do you mind s/platform/hasPlatform here too?

if (m_transientPaintingSnapshot) {
if (!context.platformContext()) {
RefPtr image = m_transientPaintingSnapshot->createImage();

Not sure how I keep missing your comments until I read my mail.

Yes, seems like we have to fix this case too!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

WebKit Misc. For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore).

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants