Skip to content

Conversation

@aperezdc
Copy link
Contributor

@aperezdc aperezdc commented Feb 27, 2024

567bd6a

[WPE][Qt] Add support for building QtWPE against Qt 6
https://bugs.webkit.org/show_bug.cgi?id=270161

Reviewed by Carlos Garcia Campos.

- Keep the existing Qt 5 based WPEQt implementation and rename:
  - Source/WebKit/UIProcess/API/wpe/qt -> Source/WebKit/UIProcess/API/wpe/qt5
  - Tools/MiniBrowser/wpe/qt -> Tools/MiniBrowser/wpe/qt5

- Add a new WPEQt implementation for Qt 6, based on the new WPE platform
  API, that was recently developed, not relying on WPEBackend(-fdo) anymore.

  Touch / wheel / hover / mouse / keyboard events are supported, only
  keyboard+mouse events were tested so far.

- Polish UI: Add navigation buttons (back|forward|reload) / URL bar for
  Qt 6 MiniBrowser

- Make the WebKitWebView ref-counted in WPEQtView, by wrapping in
  GRefPtr (needs some moc related plumbing to allow for config.h
  inclusion, which is a pre-requisite to get wtf/ headers includable).

Tested using:
build-webkit --wpe --debug --cmakeargs "-DUSE_QT6=ON|OFF"
run-qt-wpe-minibrowser --debug https://www.igalia.com

Covered by existing tests, no change in default behavior.

* Source/WebKit/PlatformWPE.cmake:
* Source/WebKit/UIProcess/API/wpe/qt5/CMakeLists.txt: Renamed from Source/WebKit/UIProcess/API/wpe/qt/CMakeLists.txt.
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQmlExtensionPlugin.cpp: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQmlExtensionPlugin.cpp.
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQmlExtensionPlugin.h: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQmlExtensionPlugin.h.
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQtView.cpp: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQtView.cpp.
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQtView.h: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQtView.h.
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQtViewBackend.cpp: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.cpp.
(WPEQtViewBackend::texture):
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQtViewBackend.h: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.h.
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQtViewLoadRequest.cpp: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequest.cpp.
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQtViewLoadRequest.h: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequest.h.
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQtViewLoadRequestPrivate.h: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequestPrivate.h.
* Source/WebKit/UIProcess/API/wpe/qt5/qmldir: Copied from Source/WebKit/UIProcess/API/wpe/qt/qmldir.
* Source/WebKit/UIProcess/API/wpe/qt6/WPEDisplayQtQuick.cpp: Added.
(wpeDisplayQtQuickConnect):
(wpeDisplayQtQuickCreateView):
(wpeDisplayQtQuickGetEGLDisplay):
(wpeDisplayQtQuickGetDRMDevice):
(wpeDisplayQtQuickGetDRMRenderNode):
(wpe_display_qtquick_class_init):
(wpe_display_qtquick_new):
* Source/WebKit/UIProcess/API/wpe/qt6/WPEDisplayQtQuick.h: Added.
* Source/WebKit/UIProcess/API/wpe/qt6/WPEQmlExtensionPlugin.cpp: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQmlExtensionPlugin.cpp.
(WPEQmlExtensionPlugin::registerTypes):
* Source/WebKit/UIProcess/API/wpe/qt6/WPEQmlExtensionPlugin.h: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQmlExtensionPlugin.h.
* Source/WebKit/UIProcess/API/wpe/qt6/WPEQtView.cpp: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtView.cpp.
(WPEQtView::WPEQtView):
(WPEQtView::~WPEQtView):
(WPEQtView::geometryChange):
(WPEQtView::configureWindow):
(WPEQtView::createWebView):
(WPEQtView::notifyUrlChangedCallback):
(WPEQtView::notifyTitleChangedCallback):
(WPEQtView::notifyLoadProgressCallback):
(WPEQtView::notifyLoadChangedCallback):
(WPEQtView::notifyLoadFailedCallback):
(WPEQtView::didUpdateScene):
(WPEQtView::updatePaintNode):
(WPEQtView::url const):
(WPEQtView::setUrl):
(WPEQtView::loadProgress const):
(WPEQtView::title const):
(WPEQtView::canGoBack const):
(WPEQtView::isLoading const):
(WPEQtView::canGoForward const):
(WPEQtView::goBack):
(WPEQtView::goForward):
(WPEQtView::reload):
(WPEQtView::stop):
(WPEQtView::loadHtml):
(JavascriptCallbackData::JavascriptCallbackData):
(jsAsyncReadyCallback):
(WPEQtView::runJavaScript):
(WPEQtView::mousePressEvent):
(WPEQtView::mouseMoveEvent):
(WPEQtView::mouseReleaseEvent):
(WPEQtView::hoverEnterEvent):
(WPEQtView::hoverLeaveEvent):
(WPEQtView::hoverMoveEvent):
(WPEQtView::wheelEvent):
(WPEQtView::keyPressEvent):
(WPEQtView::keyReleaseEvent):
(WPEQtView::touchEvent):
(WPEQtView::webView const):
* Source/WebKit/UIProcess/API/wpe/qt6/WPEQtView.h: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtView.h.
* Source/WebKit/UIProcess/API/wpe/qt6/WPEQtViewLoadRequest.cpp: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequest.cpp.
(WPEQtViewLoadRequest::WPEQtViewLoadRequest):
(WPEQtViewLoadRequest::~WPEQtViewLoadRequest):
(WPEQtViewLoadRequest::url const):
(WPEQtViewLoadRequest::status const):
(WPEQtViewLoadRequest::errorString const):
* Source/WebKit/UIProcess/API/wpe/qt6/WPEQtViewLoadRequest.h: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequest.h.
* Source/WebKit/UIProcess/API/wpe/qt6/WPEQtViewLoadRequestPrivate.h: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequestPrivate.h.
(WPEQtViewLoadRequestPrivate::WPEQtViewLoadRequestPrivate):
(WPEQtViewLoadRequestPrivate::~WPEQtViewLoadRequestPrivate):
* Source/WebKit/UIProcess/API/wpe/qt6/WPEViewQtQuick.cpp: Added.
(wpeViewQtQuickDispose):
(wpeViewQtQuickRenderBuffer):
(wpeViewQtQuickResize):
(wpe_view_qtquick_class_init):
(wpe_view_qtquick_new):
(wpe_view_qtquick_initialize_rendering):
(wpe_view_qtquick_render_buffer_to_texture):
(wpe_view_qtquick_did_update_scene):
(buttonFromEvent):
(mouseModifiersFromEvent):
(keyboardModifiersFromEvent):
(modifiersFromEvent):
(wpe_view_dispatch_mouse_press_event):
(wpe_view_dispatch_mouse_move_event):
(wpe_view_dispatch_mouse_release_event):
(wpe_view_dispatch_wheel_event):
(wpe_view_dispatch_hover_enter_event):
(wpe_view_dispatch_hover_move_event):
(wpe_view_dispatch_hover_leave_event):
(wpe_view_dispatch_key_press_event):
(wpe_view_dispatch_key_release_event):
(wpe_view_dispatch_touch_event):
* Source/WebKit/UIProcess/API/wpe/qt6/WPEViewQtQuick.h: Added.
* Source/WebKit/UIProcess/API/wpe/qt6/qmldir: Renamed from Source/WebKit/UIProcess/API/wpe/qt/qmldir.
* Source/cmake/OptionsWPE.cmake:
* Tools/MiniBrowser/wpe/CMakeLists.txt:
* Tools/MiniBrowser/wpe/qt/CMakeLists.txt: Removed.
* Tools/MiniBrowser/wpe/qt5/CMakeLists.txt: Added.
* Tools/MiniBrowser/wpe/qt5/main.cpp: Copied from Tools/MiniBrowser/wpe/qt/main.cpp.
* Tools/MiniBrowser/wpe/qt5/main.qml: Renamed from Tools/MiniBrowser/wpe/qt/main.qml.
* Tools/MiniBrowser/wpe/qt5/qml.qrc: Copied from Tools/MiniBrowser/wpe/qt/qml.qrc.
* Tools/MiniBrowser/wpe/qt6/CMakeLists.txt: Added.
* Tools/MiniBrowser/wpe/qt6/main.cpp: Renamed from Tools/MiniBrowser/wpe/qt/main.cpp.
(main):
* Tools/MiniBrowser/wpe/qt6/main.qml: Added.
* Tools/MiniBrowser/wpe/qt6/qml.qrc: Renamed from Tools/MiniBrowser/wpe/qt/qml.qrc.
* Tools/Scripts/run-qt-wpe-minibrowser:
* Tools/Scripts/webkitdirs.pm:
(builtDylibPathForName):
* Tools/Scripts/webkitpy/style/checker.py:
* Tools/TestWebKitAPI/Tests/WPEQt/WPEQtTest.cpp:
* Tools/TestWebKitAPI/Tests/WPEQt/WPEQtTest.h:
* Tools/TestWebKitAPI/glib/CMakeLists.txt:

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

c701f51

Misc iOS, 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
✅ 🧪 webkitpy 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
✅ 🛠 🧪 jsc 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 🧪 jsc-arm64 ✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-wk2-stress 🧪 api-gtk
✅ 🛠 🧪 merge ✅ 🛠 watch ✅ 🛠 jsc-armv7
✅ 🛠 watch-sim ✅ 🧪 jsc-armv7-tests

@aperezdc aperezdc self-assigned this Feb 27, 2024
@aperezdc aperezdc added the WPE WebKit WebKit WPE component label Feb 27, 2024
@aperezdc
Copy link
Contributor Author

Marked as draft because we need to investigate the following crash with Qt6:

#0  iris_set_vertex_buffers () at ../mesa-24.0.1/src/gallium/drivers/iris/iris_state.c:4051
4051             res->bind_history |= PIPE_BIND_VERTEX_BUFFER;                                                                                                                                                                                 
[Current thread is 1 (Thread 0x7a0a24a006c0 (LWP 763787))]
(gdb) bt
#0  iris_set_vertex_buffers () at ../mesa-24.0.1/src/gallium/drivers/iris/iris_state.c:4051
#1  0x00007a0a1a16d096 in tc_call_set_vertex_buffers () at ../mesa-24.0.1/src/gallium/auxiliary/util/u_threaded_context.c:2174
#2  0x00007a0a1a170d96 in batch_execute () at ../mesa-24.0.1/src/gallium/auxiliary/util/u_threaded_context.c:461
#3  tc_batch_execute () at ../mesa-24.0.1/src/gallium/auxiliary/util/u_threaded_context.c:512
#4  0x00007a0a1b06f0d8 in _tc_sync.isra.0 () at ../mesa-24.0.1/src/gallium/auxiliary/util/u_threaded_context.c:767
#5  0x00007a0a1a196cc1 in tc_flush () at ../mesa-24.0.1/src/gallium/auxiliary/util/u_threaded_context.c:3699
#6  0x00007a0a19e44135 in st_flush () at ../mesa-24.0.1/src/mesa/state_tracker/st_cb_flush.c:63
#7  st_glFlush () at ../mesa-24.0.1/src/mesa/state_tracker/st_cb_flush.c:99
#8  _mesa_make_current () at ../mesa-24.0.1/src/mesa/main/context.c:1506
#9  0x00007a0a19c4b507 in st_api_make_current () at ../mesa-24.0.1/src/mesa/state_tracker/st_manager.c:1186
#10 dri_unbind_context () at ../mesa-24.0.1/src/gallium/frontends/dri/dri_context.c:295
#11 driUnbindContext () at ../mesa-24.0.1/src/gallium/frontends/dri/dri_util.c:739
#12 0x00007a0a26d434bd in dri2_make_current () at ../mesa-24.0.1/src/egl/drivers/dri2/egl_dri2.c:1749
#13 0x00007a0a26d392bc in eglMakeCurrent () at ../mesa-24.0.1/src/egl/main/eglapi.c:982
#14 0x00007a0a34622d86 in InternalMakeCurrentVendor (dpy=0x613cf126cfd0, draw=0x7a09ec150a50, read=0x7a09ec150a50, context=0x7a09ec002850, apiState=0x7a09ec151920, vendor=<optimized out>) at ../libglvnd-v1.7.0/src/EGL/libegl.c:587
#15 0x00007a0a2f3a176f in QtWaylandClient::QWaylandGLContext::makeCurrent (this=this@entry=0x7a09ec002210, surface=<optimized out>)
    at /usr/src/debug/qt6-wayland/qtwayland-everywhere-src-6.6.2/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp:307
#16 0x00007a0a3427d30d in QOpenGLContext::makeCurrent (this=0x7a09ec001f60, surface=0x613cf11c2bb0) at /usr/src/debug/qt6-base/qtbase-everywhere-src-6.6.2/src/gui/kernel/qopenglcontext.cpp:661
#17 0x00007a0a3428bd2b in QRhiGles2::ensureContext (this=0x7a09ec0018e0, surface=0x613cf11c2bb0) at /usr/src/debug/qt6-base/qtbase-everywhere-src-6.6.2/src/gui/rhi/qrhigles2.cpp:620
#18 0x00007a0a34298105 in QRhiGles2::endFrame (this=0x7a09ec0018e0, swapChain=0x7a09ec1620e0, flags=...) at /usr/src/debug/qt6-base/qtbase-everywhere-src-6.6.2/src/gui/rhi/qrhigles2.cpp:2051
#19 0x00007a0a34154d1c in QRhi::endFrame (this=0x7a09ec0018c0, swapChain=0x7a09ec1620e0, flags=..., flags@entry=...) at /usr/src/debug/qt6-base/qtbase-everywhere-src-6.6.2/src/gui/rhi/qrhi.cpp:10213
#20 0x00007a0a351bfed6 in QSGRenderThread::syncAndRender (this=<optimized out>) at /usr/include/qt6/QtCore/qflags.h:73
#21 QSGRenderThread::run (this=0x613cf11f3b20) at /usr/src/debug/qt6-declarative/qtdeclarative-everywhere-src-6.6.2/src/quick/scenegraph/qsgthreadedrenderloop.cpp:946
#22 0x00007a0a33aa0bd3 in operator() (__closure=<optimized out>) at /usr/src/debug/qt6-base/qtbase-everywhere-src-6.6.2/src/corelib/thread/qthread_unix.cpp:324
#23 (anonymous namespace)::terminate_on_exception<QThreadPrivate::start(void*)::<lambda()> > (t=<optimized out>) at /usr/src/debug/qt6-base/qtbase-everywhere-src-6.6.2/src/corelib/thread/qthread_unix.cpp:260
#24 QThreadPrivate::start (arg=0x613cf11f3b20) at /usr/src/debug/qt6-base/qtbase-everywhere-src-6.6.2/src/corelib/thread/qthread_unix.cpp:283
#25 0x00007a0a332a955a in start_thread (arg=<optimized out>) at pthread_create.c:447
#26 0x00007a0a33326a3c in clone3 () at ../sysdeps/unix/sysv/linux/x86_64/clone3.S:78
(gdb)

@nikolaszimmermann nikolaszimmermann marked this pull request as ready for review May 3, 2024 07:56
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 3, 2024
@nikolaszimmermann nikolaszimmermann removed the merging-blocked Applied to prevent a change from being merged label May 3, 2024
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 3, 2024
@nikolaszimmermann nikolaszimmermann removed the merging-blocked Applied to prevent a change from being merged label May 6, 2024
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 7, 2024
@nikolaszimmermann nikolaszimmermann removed the merging-blocked Applied to prevent a change from being merged label May 9, 2024
@nikolaszimmermann
Copy link
Contributor

I adressed all comments, ready to go :-)

@nikolaszimmermann nikolaszimmermann added the merge-queue Applied to send a pull request to merge-queue label May 22, 2024
@webkit-commit-queue
Copy link
Collaborator

No reviewer information in commit message, blocking PR #25197

@webkit-commit-queue webkit-commit-queue added merging-blocked Applied to prevent a change from being merged and removed merge-queue Applied to send a pull request to merge-queue labels May 22, 2024
@nikolaszimmermann nikolaszimmermann removed the merging-blocked Applied to prevent a change from being merged label May 22, 2024
@nikolaszimmermann nikolaszimmermann added the merge-queue Applied to send a pull request to merge-queue label May 22, 2024
https://bugs.webkit.org/show_bug.cgi?id=270161

Reviewed by Carlos Garcia Campos.

- Keep the existing Qt 5 based WPEQt implementation and rename:
  - Source/WebKit/UIProcess/API/wpe/qt -> Source/WebKit/UIProcess/API/wpe/qt5
  - Tools/MiniBrowser/wpe/qt -> Tools/MiniBrowser/wpe/qt5

- Add a new WPEQt implementation for Qt 6, based on the new WPE platform
  API, that was recently developed, not relying on WPEBackend(-fdo) anymore.

  Touch / wheel / hover / mouse / keyboard events are supported, only
  keyboard+mouse events were tested so far.

- Polish UI: Add navigation buttons (back|forward|reload) / URL bar for
  Qt 6 MiniBrowser

- Make the WebKitWebView ref-counted in WPEQtView, by wrapping in
  GRefPtr (needs some moc related plumbing to allow for config.h
  inclusion, which is a pre-requisite to get wtf/ headers includable).

Tested using:
build-webkit --wpe --debug --cmakeargs "-DUSE_QT6=ON|OFF"
run-qt-wpe-minibrowser --debug https://www.igalia.com

Covered by existing tests, no change in default behavior.

* Source/WebKit/PlatformWPE.cmake:
* Source/WebKit/UIProcess/API/wpe/qt5/CMakeLists.txt: Renamed from Source/WebKit/UIProcess/API/wpe/qt/CMakeLists.txt.
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQmlExtensionPlugin.cpp: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQmlExtensionPlugin.cpp.
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQmlExtensionPlugin.h: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQmlExtensionPlugin.h.
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQtView.cpp: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQtView.cpp.
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQtView.h: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQtView.h.
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQtViewBackend.cpp: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.cpp.
(WPEQtViewBackend::texture):
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQtViewBackend.h: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.h.
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQtViewLoadRequest.cpp: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequest.cpp.
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQtViewLoadRequest.h: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequest.h.
* Source/WebKit/UIProcess/API/wpe/qt5/WPEQtViewLoadRequestPrivate.h: Copied from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequestPrivate.h.
* Source/WebKit/UIProcess/API/wpe/qt5/qmldir: Copied from Source/WebKit/UIProcess/API/wpe/qt/qmldir.
* Source/WebKit/UIProcess/API/wpe/qt6/WPEDisplayQtQuick.cpp: Added.
(wpeDisplayQtQuickConnect):
(wpeDisplayQtQuickCreateView):
(wpeDisplayQtQuickGetEGLDisplay):
(wpeDisplayQtQuickGetDRMDevice):
(wpeDisplayQtQuickGetDRMRenderNode):
(wpe_display_qtquick_class_init):
(wpe_display_qtquick_new):
* Source/WebKit/UIProcess/API/wpe/qt6/WPEDisplayQtQuick.h: Added.
* Source/WebKit/UIProcess/API/wpe/qt6/WPEQmlExtensionPlugin.cpp: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQmlExtensionPlugin.cpp.
(WPEQmlExtensionPlugin::registerTypes):
* Source/WebKit/UIProcess/API/wpe/qt6/WPEQmlExtensionPlugin.h: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQmlExtensionPlugin.h.
* Source/WebKit/UIProcess/API/wpe/qt6/WPEQtView.cpp: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtView.cpp.
(WPEQtView::WPEQtView):
(WPEQtView::~WPEQtView):
(WPEQtView::geometryChange):
(WPEQtView::configureWindow):
(WPEQtView::createWebView):
(WPEQtView::notifyUrlChangedCallback):
(WPEQtView::notifyTitleChangedCallback):
(WPEQtView::notifyLoadProgressCallback):
(WPEQtView::notifyLoadChangedCallback):
(WPEQtView::notifyLoadFailedCallback):
(WPEQtView::didUpdateScene):
(WPEQtView::updatePaintNode):
(WPEQtView::url const):
(WPEQtView::setUrl):
(WPEQtView::loadProgress const):
(WPEQtView::title const):
(WPEQtView::canGoBack const):
(WPEQtView::isLoading const):
(WPEQtView::canGoForward const):
(WPEQtView::goBack):
(WPEQtView::goForward):
(WPEQtView::reload):
(WPEQtView::stop):
(WPEQtView::loadHtml):
(JavascriptCallbackData::JavascriptCallbackData):
(jsAsyncReadyCallback):
(WPEQtView::runJavaScript):
(WPEQtView::mousePressEvent):
(WPEQtView::mouseMoveEvent):
(WPEQtView::mouseReleaseEvent):
(WPEQtView::hoverEnterEvent):
(WPEQtView::hoverLeaveEvent):
(WPEQtView::hoverMoveEvent):
(WPEQtView::wheelEvent):
(WPEQtView::keyPressEvent):
(WPEQtView::keyReleaseEvent):
(WPEQtView::touchEvent):
(WPEQtView::webView const):
* Source/WebKit/UIProcess/API/wpe/qt6/WPEQtView.h: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtView.h.
* Source/WebKit/UIProcess/API/wpe/qt6/WPEQtViewLoadRequest.cpp: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequest.cpp.
(WPEQtViewLoadRequest::WPEQtViewLoadRequest):
(WPEQtViewLoadRequest::~WPEQtViewLoadRequest):
(WPEQtViewLoadRequest::url const):
(WPEQtViewLoadRequest::status const):
(WPEQtViewLoadRequest::errorString const):
* Source/WebKit/UIProcess/API/wpe/qt6/WPEQtViewLoadRequest.h: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequest.h.
* Source/WebKit/UIProcess/API/wpe/qt6/WPEQtViewLoadRequestPrivate.h: Renamed from Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewLoadRequestPrivate.h.
(WPEQtViewLoadRequestPrivate::WPEQtViewLoadRequestPrivate):
(WPEQtViewLoadRequestPrivate::~WPEQtViewLoadRequestPrivate):
* Source/WebKit/UIProcess/API/wpe/qt6/WPEViewQtQuick.cpp: Added.
(wpeViewQtQuickDispose):
(wpeViewQtQuickRenderBuffer):
(wpeViewQtQuickResize):
(wpe_view_qtquick_class_init):
(wpe_view_qtquick_new):
(wpe_view_qtquick_initialize_rendering):
(wpe_view_qtquick_render_buffer_to_texture):
(wpe_view_qtquick_did_update_scene):
(buttonFromEvent):
(mouseModifiersFromEvent):
(keyboardModifiersFromEvent):
(modifiersFromEvent):
(wpe_view_dispatch_mouse_press_event):
(wpe_view_dispatch_mouse_move_event):
(wpe_view_dispatch_mouse_release_event):
(wpe_view_dispatch_wheel_event):
(wpe_view_dispatch_hover_enter_event):
(wpe_view_dispatch_hover_move_event):
(wpe_view_dispatch_hover_leave_event):
(wpe_view_dispatch_key_press_event):
(wpe_view_dispatch_key_release_event):
(wpe_view_dispatch_touch_event):
* Source/WebKit/UIProcess/API/wpe/qt6/WPEViewQtQuick.h: Added.
* Source/WebKit/UIProcess/API/wpe/qt6/qmldir: Renamed from Source/WebKit/UIProcess/API/wpe/qt/qmldir.
* Source/cmake/OptionsWPE.cmake:
* Tools/MiniBrowser/wpe/CMakeLists.txt:
* Tools/MiniBrowser/wpe/qt/CMakeLists.txt: Removed.
* Tools/MiniBrowser/wpe/qt5/CMakeLists.txt: Added.
* Tools/MiniBrowser/wpe/qt5/main.cpp: Copied from Tools/MiniBrowser/wpe/qt/main.cpp.
* Tools/MiniBrowser/wpe/qt5/main.qml: Renamed from Tools/MiniBrowser/wpe/qt/main.qml.
* Tools/MiniBrowser/wpe/qt5/qml.qrc: Copied from Tools/MiniBrowser/wpe/qt/qml.qrc.
* Tools/MiniBrowser/wpe/qt6/CMakeLists.txt: Added.
* Tools/MiniBrowser/wpe/qt6/main.cpp: Renamed from Tools/MiniBrowser/wpe/qt/main.cpp.
(main):
* Tools/MiniBrowser/wpe/qt6/main.qml: Added.
* Tools/MiniBrowser/wpe/qt6/qml.qrc: Renamed from Tools/MiniBrowser/wpe/qt/qml.qrc.
* Tools/Scripts/run-qt-wpe-minibrowser:
* Tools/Scripts/webkitdirs.pm:
(builtDylibPathForName):
* Tools/Scripts/webkitpy/style/checker.py:
* Tools/TestWebKitAPI/Tests/WPEQt/WPEQtTest.cpp:
* Tools/TestWebKitAPI/Tests/WPEQt/WPEQtTest.h:
* Tools/TestWebKitAPI/glib/CMakeLists.txt:

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

Committed 279129@main (567bd6a): https://commits.webkit.org/279129@main

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

@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label May 22, 2024
@webkit-commit-queue webkit-commit-queue merged commit 567bd6a into WebKit:main May 22, 2024
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.

6 participants