Skip to content

REGRESSION(306842@main): [WPE] Build with ENABLE_WPE_PLATFORM=OFF fails#63121

Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
aperezdc:fix-no-wpeplat-build
Apr 21, 2026
Merged

REGRESSION(306842@main): [WPE] Build with ENABLE_WPE_PLATFORM=OFF fails#63121
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
aperezdc:fix-no-wpeplat-build

Conversation

@aperezdc
Copy link
Copy Markdown
Contributor

@aperezdc aperezdc commented Apr 20, 2026

dc1afde

REGRESSION(306842@main): [WPE] Build with ENABLE_WPE_PLATFORM=OFF fails
https://bugs.webkit.org/show_bug.cgi?id=312769

Reviewed by Carlos Garcia Campos.

Avoid using the HardwareAccelerationEnabled preference when WPEPlatform
is disabled, and make the AcceleratedSurface::usesGL() helper return a
fixed value when ENABLE(WPE_PLATFORM) is disabled, because in that case
accelerated compositing is always used.

* Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.cpp: Change order
of includes to ensure that the USE() macro is defined before using it.
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/AcceleratedSurface.cpp:
(WebKit::AcceleratedSurface::AcceleratedSurface):
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/AcceleratedSurface.h:

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

fcd3c33

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 api-mac-debug ✅ 🛠 gtk3-libwebrtc
✅ 🧪 api-ios ✅ 🛠 gtk
✅ 🛠 ios-safer-cpp ✅ 🧪 mac-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 api-gtk
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🛠 playstation
✅ 🛠 🧪 unsafe-merge ✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2
✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@aperezdc aperezdc requested a review from magomez as a code owner April 20, 2026 12:52
@aperezdc aperezdc self-assigned this Apr 20, 2026
@aperezdc aperezdc added the WPE WebKit WebKit WPE component label Apr 20, 2026
@aperezdc aperezdc requested review from a team and carlosgcampos April 20, 2026 12:58
@aperezdc aperezdc force-pushed the fix-no-wpeplat-build branch from 593bf23 to fcd3c33 Compare April 20, 2026 16:28
@aperezdc aperezdc added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Apr 21, 2026
https://bugs.webkit.org/show_bug.cgi?id=312769

Reviewed by Carlos Garcia Campos.

Avoid using the HardwareAccelerationEnabled preference when WPEPlatform
is disabled, and make the AcceleratedSurface::usesGL() helper return a
fixed value when ENABLE(WPE_PLATFORM) is disabled, because in that case
accelerated compositing is always used.

* Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.cpp: Change order
of includes to ensure that the USE() macro is defined before using it.
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/AcceleratedSurface.cpp:
(WebKit::AcceleratedSurface::AcceleratedSurface):
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/AcceleratedSurface.h:

Canonical link: https://commits.webkit.org/311656@main
@webkit-commit-queue
Copy link
Copy Markdown
Collaborator

Committed 311656@main (dc1afde): https://commits.webkit.org/311656@main

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

@webkit-commit-queue webkit-commit-queue merged commit dc1afde into WebKit:main Apr 21, 2026
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Apr 21, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

WPE WebKit WebKit WPE component

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants