Skip to content

Conversation

@carlosgcampos
Copy link
Contributor

@carlosgcampos carlosgcampos commented Nov 29, 2023

3d09772

[GTK] Remove the WPE renderer
https://bugs.webkit.org/show_bug.cgi?id=265511

Reviewed by Michael Catanzaro.

DMA-BUF renderer can fallback to shared memory buffers when not available.

* Source/WebCore/PlatformGTK.cmake:
* Source/WebCore/PlatformWPE.cmake:
* Source/WebCore/SourcesGTK.txt:
* Source/WebCore/platform/graphics/egl/GLContext.h:
* Source/WebCore/platform/graphics/wayland/WlUniquePtr.h: Removed.
* Source/WebCore/platform/xr/openxr/OpenXRUtils.h:
* Source/WebKit/PlatformGTK.cmake:
* Source/WebKit/SourcesGTK.txt:
* Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp:
(WebKit::WebKitProtocolHandler::handleGPU):
* Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:
* Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::hostFileDescriptor): Deleted.
* Source/WebKit/UIProcess/API/gtk/PageClientImpl.h:
* Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseRenderHostFileDescriptor): Deleted.
* Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
* Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp:
(WebKit::WebProcessPool::platformInitializeWebProcess):
* Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp:
(WebKit::AcceleratedBackingStore::checkRequirements):
(WebKit::AcceleratedBackingStore::create):
* Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp: Removed.
* Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.h: Removed.
* Source/WebKit/WebProcess/WebPage/AcceleratedSurface.cpp:
(WebKit::AcceleratedSurface::create):
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp:
(WebKit::DrawingAreaCoordinatedGraphics::updatePreferences):
* Source/WebKit/WebProcess/WebProcess.h:
* Source/WebKit/WebProcess/glib/WebProcessGLib.cpp:
(WebKit::WebProcess::platformInitializeWebProcess):
* Source/cmake/OptionsGTK.cmake:
* Tools/gtk/dependencies/apt:
* Tools/gtk/jhbuild.modules:
* Tools/gtk/manifest.txt.in:

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

25c8dd2

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 ✅ 🛠 jsc-armv7
✅ 🛠 watch ❌ 🧪 jsc-armv7-tests
✅ 🛠 🧪 unsafe-merge ✅ 🛠 watch-sim

@carlosgcampos carlosgcampos self-assigned this Nov 29, 2023
@carlosgcampos carlosgcampos added the WebKitGTK Bugs related to the Gtk API layer. label Nov 29, 2023
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Nov 29, 2023
@carlosgcampos carlosgcampos removed the merging-blocked Applied to prevent a change from being merged label Nov 29, 2023
Copy link
Contributor

@mcatanzaro mcatanzaro left a comment

Choose a reason for hiding this comment

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

Yay!

We should also announce this on the WebKitGTK mailing list or in the release notes for 2.43.2.

@carlosgcampos carlosgcampos added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Nov 29, 2023
https://bugs.webkit.org/show_bug.cgi?id=265511

Reviewed by Michael Catanzaro.

DMA-BUF renderer can fallback to shared memory buffers when not available.

* Source/WebCore/PlatformGTK.cmake:
* Source/WebCore/PlatformWPE.cmake:
* Source/WebCore/SourcesGTK.txt:
* Source/WebCore/platform/graphics/egl/GLContext.h:
* Source/WebCore/platform/graphics/wayland/WlUniquePtr.h: Removed.
* Source/WebCore/platform/xr/openxr/OpenXRUtils.h:
* Source/WebKit/PlatformGTK.cmake:
* Source/WebKit/SourcesGTK.txt:
* Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp:
(WebKit::WebKitProtocolHandler::handleGPU):
* Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp:
* Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::hostFileDescriptor): Deleted.
* Source/WebKit/UIProcess/API/gtk/PageClientImpl.h:
* Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseRenderHostFileDescriptor): Deleted.
* Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
* Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp:
(WebKit::WebProcessPool::platformInitializeWebProcess):
* Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp:
(WebKit::AcceleratedBackingStore::checkRequirements):
(WebKit::AcceleratedBackingStore::create):
* Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp: Removed.
* Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.h: Removed.
* Source/WebKit/WebProcess/WebPage/AcceleratedSurface.cpp:
(WebKit::AcceleratedSurface::create):
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp:
(WebKit::DrawingAreaCoordinatedGraphics::updatePreferences):
* Source/WebKit/WebProcess/WebProcess.h:
* Source/WebKit/WebProcess/glib/WebProcessGLib.cpp:
(WebKit::WebProcess::platformInitializeWebProcess):
* Source/cmake/OptionsGTK.cmake:
* Tools/gtk/dependencies/apt:
* Tools/gtk/jhbuild.modules:
* Tools/gtk/manifest.txt.in:

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

Committed 271282@main (3d09772): https://commits.webkit.org/271282@main

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

@webkit-commit-queue webkit-commit-queue merged commit 3d09772 into WebKit:main Nov 29, 2023
@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 Nov 29, 2023
@carlosgcampos carlosgcampos deleted the gtk-no-wpe-renderer branch November 29, 2023 17:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

WebKitGTK Bugs related to the Gtk API layer.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants