Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WPE] WPE Platform: only expose the new WPE platform for WPE 2.0 API #21497

Merged

Conversation

carlosgcampos
Copy link
Contributor

@carlosgcampos carlosgcampos commented Dec 8, 2023

f2fd439

[WPE] WPE Platform: only expose the new WPE platform for WPE 2.0 API
https://bugs.webkit.org/show_bug.cgi?id=266062

Reviewed by Michael Catanzaro.

* Source/WebKit/PlatformWPE.cmake:
* Source/WebKit/Shared/NativeWebKeyboardEvent.h:
* Source/WebKit/Shared/NativeWebMouseEvent.h:
* Source/WebKit/Shared/NativeWebTouchEvent.h:
* Source/WebKit/Shared/NativeWebWheelEvent.h:
* Source/WebKit/Shared/libwpe/WebEventFactory.h:
* Source/WebKit/Shared/wpe/GRefPtrWPE.cpp:
* Source/WebKit/Shared/wpe/GRefPtrWPE.h:
* Source/WebKit/Shared/wpe/NativeWebKeyboardEventWPE.cpp:
* Source/WebKit/Shared/wpe/NativeWebMouseEventWPE.cpp:
* Source/WebKit/Shared/wpe/NativeWebTouchEventWPE.cpp:
* Source/WebKit/Shared/wpe/NativeWebWheelEventWPE.cpp:
* Source/WebKit/Shared/wpe/WebEventFactoryWPE.cpp:
* Source/WebKit/Shared/wpe/WebKeyboardEventWPE.cpp:
* Source/WebKit/UIProcess/API/C/wpe/WKView.cpp:
(WKViewCreateDeprecated):
* Source/WebKit/UIProcess/API/C/wpe/WKView.h:
* Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp:
(webkitWebViewConstructed):
(webkitWebViewSetProperty):
(webkitWebViewGetProperty):
(webkit_web_view_class_init):
(webkitWebViewCreatePage):
* Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in:
* Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp:
(WebKit::PageClientImpl::enterAcceleratedCompositingMode):
(WebKit::PageClientImpl::exitAcceleratedCompositingMode):
(WebKit::PageClientImpl::updateAcceleratedCompositingMode):
(WebKit::PageClientImpl::enterFullScreen):
(WebKit::PageClientImpl::exitFullScreen):
* Source/WebKit/UIProcess/API/wpe/PageClientImpl.h:
* Source/WebKit/UIProcess/API/wpe/WPEWebView.cpp:
(WKWPE::View::View):
(WKWPE::m_backend):
(WKWPE::View::~View):
(WKWPE::View::setFullScreen):
(WKWPE::View::setCursor):
* Source/WebKit/UIProcess/API/wpe/WPEWebView.h:
(WKWPE::View::create):
* Source/WebKit/UIProcess/API/wpe/WebKitWebViewWPE.cpp:
(webkit_web_view_new):
* Source/WebKit/UIProcess/WebPageProxy.h:
* Source/WebKit/UIProcess/glib/DisplayVBlankMonitorDRM.cpp:
(WebKit::DisplayVBlankMonitorDRM::create):
* Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp:
(WebKit::WebProcessPool::platformInitializeWebProcess):
* Source/WebKit/UIProcess/wpe/AcceleratedBackingStoreDMABuf.cpp:
* Source/WebKit/UIProcess/wpe/AcceleratedBackingStoreDMABuf.h:
* Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp:
(WebKit::WebPageProxy::preferredBufferFormats const):
(WebKit::WebPageProxy::currentStateOfModifierKeys):
* Source/WebKit/WebProcess/WebPage/AcceleratedSurface.cpp:
(WebKit::AcceleratedSurface::create):
* Source/WebKit/WebProcess/WebPage/AcceleratedSurface.h:
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp:
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h:
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp:
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:
* Source/WebKit/WebProcess/WebPage/DrawingArea.h:
* Source/WebKit/WebProcess/WebPage/WebPage.h:
* Source/WebKit/WebProcess/WebPage/WebPage.messages.in:
* Source/WebKit/WebProcess/WebPage/dmabuf/AcceleratedSurfaceDMABuf.cpp:
* Source/WebKit/WebProcess/WebPage/dmabuf/AcceleratedSurfaceDMABuf.h:
* Source/WebKit/WebProcess/WebPage/wpe/WebPageWPE.cpp:
* Source/WebKit/wpe/wpe-webkit-uninstalled.pc.in:
* Source/WebKit/wpe/wpe-webkit.pc.in:
* Source/cmake/OptionsWPE.cmake:
* Tools/MiniBrowser/wpe/CMakeLists.txt:
* Tools/MiniBrowser/wpe/main.cpp:
(createViewBackend):
(activate):
* Tools/WebKitTestRunner/PlatformWPE.cmake:
* Tools/WebKitTestRunner/libwpe/EventSenderProxyLibWPE.cpp:
(WTR::EventSenderProxy::EventSenderProxy):
* Tools/WebKitTestRunner/libwpe/PlatformWebViewLibWPE.cpp:
(WTR::PlatformWebView::PlatformWebView):
* Tools/WebKitTestRunner/wpe/EventSenderProxyClientWPE.cpp:
* Tools/WebKitTestRunner/wpe/EventSenderProxyClientWPE.h:
* Tools/WebKitTestRunner/wpe/PlatformWebViewClientWPE.cpp:
* Tools/WebKitTestRunner/wpe/PlatformWebViewClientWPE.h:

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

afe6459

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 Dec 8, 2023
@carlosgcampos carlosgcampos added the WPE WebKit WebKit WPE component label Dec 8, 2023
@dpino
Copy link
Contributor

dpino commented Dec 8, 2023

LGTM.

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

Reviewed by Michael Catanzaro.

* Source/WebKit/PlatformWPE.cmake:
* Source/WebKit/Shared/NativeWebKeyboardEvent.h:
* Source/WebKit/Shared/NativeWebMouseEvent.h:
* Source/WebKit/Shared/NativeWebTouchEvent.h:
* Source/WebKit/Shared/NativeWebWheelEvent.h:
* Source/WebKit/Shared/libwpe/WebEventFactory.h:
* Source/WebKit/Shared/wpe/GRefPtrWPE.cpp:
* Source/WebKit/Shared/wpe/GRefPtrWPE.h:
* Source/WebKit/Shared/wpe/NativeWebKeyboardEventWPE.cpp:
* Source/WebKit/Shared/wpe/NativeWebMouseEventWPE.cpp:
* Source/WebKit/Shared/wpe/NativeWebTouchEventWPE.cpp:
* Source/WebKit/Shared/wpe/NativeWebWheelEventWPE.cpp:
* Source/WebKit/Shared/wpe/WebEventFactoryWPE.cpp:
* Source/WebKit/Shared/wpe/WebKeyboardEventWPE.cpp:
* Source/WebKit/UIProcess/API/C/wpe/WKView.cpp:
(WKViewCreateDeprecated):
* Source/WebKit/UIProcess/API/C/wpe/WKView.h:
* Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp:
(webkitWebViewConstructed):
(webkitWebViewSetProperty):
(webkitWebViewGetProperty):
(webkit_web_view_class_init):
(webkitWebViewCreatePage):
* Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in:
* Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp:
(WebKit::PageClientImpl::enterAcceleratedCompositingMode):
(WebKit::PageClientImpl::exitAcceleratedCompositingMode):
(WebKit::PageClientImpl::updateAcceleratedCompositingMode):
(WebKit::PageClientImpl::enterFullScreen):
(WebKit::PageClientImpl::exitFullScreen):
* Source/WebKit/UIProcess/API/wpe/PageClientImpl.h:
* Source/WebKit/UIProcess/API/wpe/WPEWebView.cpp:
(WKWPE::View::View):
(WKWPE::m_backend):
(WKWPE::View::~View):
(WKWPE::View::setFullScreen):
(WKWPE::View::setCursor):
* Source/WebKit/UIProcess/API/wpe/WPEWebView.h:
(WKWPE::View::create):
* Source/WebKit/UIProcess/API/wpe/WebKitWebViewWPE.cpp:
(webkit_web_view_new):
* Source/WebKit/UIProcess/WebPageProxy.h:
* Source/WebKit/UIProcess/glib/DisplayVBlankMonitorDRM.cpp:
(WebKit::DisplayVBlankMonitorDRM::create):
* Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp:
(WebKit::WebProcessPool::platformInitializeWebProcess):
* Source/WebKit/UIProcess/wpe/AcceleratedBackingStoreDMABuf.cpp:
* Source/WebKit/UIProcess/wpe/AcceleratedBackingStoreDMABuf.h:
* Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp:
(WebKit::WebPageProxy::preferredBufferFormats const):
(WebKit::WebPageProxy::currentStateOfModifierKeys):
* Source/WebKit/WebProcess/WebPage/AcceleratedSurface.cpp:
(WebKit::AcceleratedSurface::create):
* Source/WebKit/WebProcess/WebPage/AcceleratedSurface.h:
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp:
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h:
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp:
* Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:
* Source/WebKit/WebProcess/WebPage/DrawingArea.h:
* Source/WebKit/WebProcess/WebPage/WebPage.h:
* Source/WebKit/WebProcess/WebPage/WebPage.messages.in:
* Source/WebKit/WebProcess/WebPage/dmabuf/AcceleratedSurfaceDMABuf.cpp:
* Source/WebKit/WebProcess/WebPage/dmabuf/AcceleratedSurfaceDMABuf.h:
* Source/WebKit/WebProcess/WebPage/wpe/WebPageWPE.cpp:
* Source/WebKit/wpe/wpe-webkit-uninstalled.pc.in:
* Source/WebKit/wpe/wpe-webkit.pc.in:
* Source/cmake/OptionsWPE.cmake:
* Tools/MiniBrowser/wpe/CMakeLists.txt:
* Tools/MiniBrowser/wpe/main.cpp:
(createViewBackend):
(activate):
* Tools/WebKitTestRunner/PlatformWPE.cmake:
* Tools/WebKitTestRunner/libwpe/EventSenderProxyLibWPE.cpp:
(WTR::EventSenderProxy::EventSenderProxy):
* Tools/WebKitTestRunner/libwpe/PlatformWebViewLibWPE.cpp:
(WTR::PlatformWebView::PlatformWebView):
* Tools/WebKitTestRunner/wpe/EventSenderProxyClientWPE.cpp:
* Tools/WebKitTestRunner/wpe/EventSenderProxyClientWPE.h:
* Tools/WebKitTestRunner/wpe/PlatformWebViewClientWPE.cpp:
* Tools/WebKitTestRunner/wpe/PlatformWebViewClientWPE.h:

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

Committed 271730@main (f2fd439): https://commits.webkit.org/271730@main

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

@webkit-commit-queue webkit-commit-queue merged commit f2fd439 into WebKit:main Dec 8, 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 Dec 8, 2023
@carlosgcampos carlosgcampos deleted the wpe-platform-2022-api branch December 8, 2023 15:17
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
5 participants