Stowage/ladybird
2
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-12-07 13:50:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

LibWebView+UI: Move the UI event loops to the UI folder

Browse source 
Once upon a time, we needed the UI-specific event loops outside of the
UI process. This is no longer the case. Let's move the event loops back
to the UI folder to remove the awkward interface library we were left
with.
This commit is contained in:
Timothy Flynn 2025-12-05 10:20:44 -05:00 • committed by Tim Flynn
parent 5dc60fc688
commit 7d6616669c
Notes: github-actions[bot] 2025-12-05 19:25:08 +00:00
12 changed files with 24 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Libraries/LibWebView/CMakeLists.txt
View file

@ -80,30 +80,6 @@ if (HAS_FONTCONFIG)
target_link_libraries(LibWebView PRIVATE Fontconfig::Fontconfig) target_link_libraries(LibWebView PRIVATE Fontconfig::Fontconfig)
endif() endif()
add_library(LibWebViewPlatform INTERFACE)
if (ENABLE_QT)
add_library(LibWebViewQt STATIC
EventLoop/EventLoopImplementationQt.cpp
EventLoop/EventLoopImplementationQtEventTarget.cpp
)
set_target_properties(LibWebViewQt PROPERTIES AUTOMOC ON AUTORCC OFF AUTOUIC OFF)
find_package(Qt6 REQUIRED COMPONENTS Core)
target_link_libraries(LibWebViewQt PRIVATE LibCore)
target_link_libraries(LibWebViewQt PUBLIC Qt::Core)
if (WIN32)
find_package(pthread REQUIRED)
target_include_directories(LibWebViewQt PRIVATE $<BUILD_INTERFACE:${PTHREAD_INCLUDE_DIR}>)
endif()
target_link_libraries(LibWebViewPlatform INTERFACE LibWebViewQt)
elseif (APPLE)
add_library(LibWebViewCocoa STATIC
EventLoop/EventLoopImplementationMacOS.mm
)
target_link_libraries(LibWebViewCocoa PUBLIC "-framework Cocoa")
target_link_libraries(LibWebViewPlatform INTERFACE LibWebViewCocoa)
endif()
if (ENABLE_INSTALL_HEADERS) if (ENABLE_INSTALL_HEADERS)
foreach(header ${GENERATED_SOURCES}) foreach(header ${GENERATED_SOURCES})
get_filename_component(extension ${header} EXT) get_filename_component(extension ${header} EXT)

4
UI/AppKit/Application/Application.mm
View file

@ -4,9 +4,9 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <Application/EventLoopImplementationMacOS.h>
#include <LibCore/EventLoop.h> #include <LibCore/EventLoop.h>
#include <LibCore/ThreadEventQueue.h> #include <LibCore/ThreadEventQueue.h>
#include <LibWebView/EventLoop/EventLoopImplementationMacOS.h>
#include <Utilities/Conversions.h> #include <Utilities/Conversions.h>
#import <Application/Application.h> #import <Application/Application.h>
@ -26,7 +26,7 @@ Application::Application() = default;
NonnullOwnPtr<Core::EventLoop> Application::create_platform_event_loop() NonnullOwnPtr<Core::EventLoop> Application::create_platform_event_loop()
{ {
if (!browser_options().headless_mode.has_value()) { if (!browser_options().headless_mode.has_value()) {
Core::EventLoopManager::install(*new WebView::EventLoopManagerMacOS); Core::EventLoopManager::install(*new EventLoopManagerMacOS);
[::Application sharedApplication]; [::Application sharedApplication];
} }

9
Libraries/LibWebView/EventLoop/EventLoopImplementationMacOS.h → UI/AppKit/Application/EventLoopImplementationMacOS.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2023-2024, Tim Flynn <trflynn89@ladybird.org> * Copyright (c) 2023-2025, Tim Flynn <trflynn89@ladybird.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -9,11 +9,10 @@
#include <AK/Function.h> #include <AK/Function.h>
#include <AK/NonnullOwnPtr.h> #include <AK/NonnullOwnPtr.h>
#include <LibCore/EventLoopImplementation.h> #include <LibCore/EventLoopImplementation.h>
#include <LibWebView/Forward.h>
namespace WebView { namespace Ladybird {
class WEBVIEW_API EventLoopManagerMacOS final : public Core::EventLoopManager { class EventLoopManagerMacOS final : public Core::EventLoopManager {
public: public:
virtual NonnullOwnPtr<Core::EventLoopImplementation> make_implementation() override; virtual NonnullOwnPtr<Core::EventLoopImplementation> make_implementation() override;
@ -29,7 +28,7 @@ public:
virtual void unregister_signal(int) override; virtual void unregister_signal(int) override;
}; };
class WEBVIEW_API EventLoopImplementationMacOS final : public Core::EventLoopImplementation { class EventLoopImplementationMacOS final : public Core::EventLoopImplementation {
public: public:
// FIXME: This currently only manages the main NSApp event loop, as that is all we currently // FIXME: This currently only manages the main NSApp event loop, as that is all we currently
// interact with. When we need multiple event loops, or an event loop that isn't the // interact with. When we need multiple event loops, or an event loop that isn't the

6
Libraries/LibWebView/EventLoop/EventLoopImplementationMacOS.mm → UI/AppKit/Application/EventLoopImplementationMacOS.mm
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2023-2024, Tim Flynn <trflynn89@ladybird.org> * Copyright (c) 2023-2025, Tim Flynn <trflynn89@ladybird.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -9,11 +9,11 @@
#include <AK/IDAllocator.h> #include <AK/IDAllocator.h>
#include <AK/Singleton.h> #include <AK/Singleton.h>
#include <AK/TemporaryChange.h> #include <AK/TemporaryChange.h>
#include <Application/EventLoopImplementationMacOS.h>
#include <LibCore/Event.h> #include <LibCore/Event.h>
#include <LibCore/Notifier.h> #include <LibCore/Notifier.h>
#include <LibCore/ThreadEventQueue.h> #include <LibCore/ThreadEventQueue.h>
#include <LibThreading/RWLock.h> #include <LibThreading/RWLock.h>
#include <LibWebView/EventLoop/EventLoopImplementationMacOS.h>
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <CoreFoundation/CoreFoundation.h> #import <CoreFoundation/CoreFoundation.h>
@ -22,7 +22,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
namespace WebView { namespace Ladybird {
struct ThreadData; struct ThreadData;
static thread_local OwnPtr<ThreadData> s_this_thread_data; static thread_local OwnPtr<ThreadData> s_this_thread_data;

1
UI/AppKit/CMakeLists.txt
View file

@ -1,6 +1,7 @@
add_library(ladybird_impl STATIC add_library(ladybird_impl STATIC
Application/Application.mm Application/Application.mm
Application/ApplicationDelegate.mm Application/ApplicationDelegate.mm
Application/EventLoopImplementationMacOS.mm
Interface/Autocomplete.mm Interface/Autocomplete.mm
Interface/Event.mm Interface/Event.mm
Interface/InfoBar.mm Interface/InfoBar.mm

2
UI/CMakeLists.txt
View file

@ -68,7 +68,7 @@ else()
set(LADYBIRD_TARGET ladybird PRIVATE) set(LADYBIRD_TARGET ladybird PRIVATE)
endif() endif()
set(LADYBIRD_LIBS AK LibCore LibFileSystem LibGfx LibImageDecoderClient LibIPC LibJS LibMain LibWeb LibWebView LibWebViewPlatform LibRequests LibURL) set(LADYBIRD_LIBS AK LibCore LibFileSystem LibGfx LibImageDecoderClient LibIPC LibJS LibMain LibWeb LibWebView LibRequests LibURL)
target_link_libraries(${LADYBIRD_TARGET} PRIVATE ${LADYBIRD_LIBS}) target_link_libraries(${LADYBIRD_TARGET} PRIVATE ${LADYBIRD_LIBS})
target_link_libraries(${LADYBIRD_TARGET} PRIVATE OpenSSL::Crypto OpenSSL::SSL) target_link_libraries(${LADYBIRD_TARGET} PRIVATE OpenSSL::Crypto OpenSSL::SSL)

6
UI/Qt/Application.cpp
View file

@ -5,9 +5,9 @@
*/ */
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibWebView/EventLoop/EventLoopImplementationQt.h>
#include <LibWebView/URL.h> #include <LibWebView/URL.h>
#include <UI/Qt/Application.h> #include <UI/Qt/Application.h>
#include <UI/Qt/EventLoopImplementationQt.h>
#include <UI/Qt/Settings.h> #include <UI/Qt/Settings.h>
#include <UI/Qt/StringUtils.h> #include <UI/Qt/StringUtils.h>
@ -102,14 +102,14 @@ void Application::create_platform_options(WebView::BrowserOptions&, WebView::Req
NonnullOwnPtr<Core::EventLoop> Application::create_platform_event_loop() NonnullOwnPtr<Core::EventLoop> Application::create_platform_event_loop()
{ {
if (!browser_options().headless_mode.has_value()) { if (!browser_options().headless_mode.has_value()) {
Core::EventLoopManager::install(*new WebView::EventLoopManagerQt); Core::EventLoopManager::install(*new EventLoopManagerQt);
m_application = make<LadybirdQApplication>(arguments()); m_application = make<LadybirdQApplication>(arguments());
} }
auto event_loop = WebView::Application::create_platform_event_loop(); auto event_loop = WebView::Application::create_platform_event_loop();
if (!browser_options().headless_mode.has_value()) if (!browser_options().headless_mode.has_value())
static_cast<WebView::EventLoopImplementationQt&>(event_loop->impl()).set_main_loop(); static_cast<EventLoopImplementationQt&>(event_loop->impl()).set_main_loop();
return event_loop; return event_loop;
} }

2
UI/Qt/CMakeLists.txt
View file

@ -3,6 +3,8 @@ target_sources(ladybird PRIVATE
Application.cpp Application.cpp
Autocomplete.cpp Autocomplete.cpp
BrowserWindow.cpp BrowserWindow.cpp
EventLoopImplementationQt.cpp
EventLoopImplementationQtEventTarget.cpp
FindInPageWidget.cpp FindInPageWidget.cpp
Icon.cpp Icon.cpp
LocationEdit.cpp LocationEdit.cpp

6
Libraries/LibWebView/EventLoop/EventLoopImplementationQt.cpp → UI/Qt/EventLoopImplementationQt.cpp
View file

@ -16,8 +16,8 @@
#include <LibCore/ThreadEventQueue.h> #include <LibCore/ThreadEventQueue.h>
#include <LibThreading/Mutex.h> #include <LibThreading/Mutex.h>
#include <LibThreading/RWLock.h> #include <LibThreading/RWLock.h>
#include <LibWebView/EventLoop/EventLoopImplementationQt.h> #include <UI/Qt/EventLoopImplementationQt.h>
#include <LibWebView/EventLoop/EventLoopImplementationQtEventTarget.h> #include <UI/Qt/EventLoopImplementationQtEventTarget.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QEvent> #include <QEvent>
@ -26,7 +26,7 @@
#include <QThread> #include <QThread>
#include <QTimer> #include <QTimer>
namespace WebView { namespace Ladybird {
struct ThreadData; struct ThreadData;
static thread_local OwnPtr<ThreadData> s_this_thread_data; static thread_local OwnPtr<ThreadData> s_this_thread_data;

2
Libraries/LibWebView/EventLoop/EventLoopImplementationQt.h → UI/Qt/EventLoopImplementationQt.h
View file

@ -14,7 +14,7 @@ class QEvent;
class QEventLoop; class QEventLoop;
class QSocketNotifier; class QSocketNotifier;
namespace WebView { namespace Ladybird {
class EventLoopImplementationQt; class EventLoopImplementationQt;
class EventLoopImplementationQtEventTarget; class EventLoopImplementationQtEventTarget;

6
Libraries/LibWebView/EventLoop/EventLoopImplementationQtEventTarget.cpp → UI/Qt/EventLoopImplementationQtEventTarget.cpp
View file

@ -4,10 +4,10 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibWebView/EventLoop/EventLoopImplementationQt.h> #include <UI/Qt/EventLoopImplementationQt.h>
#include <LibWebView/EventLoop/EventLoopImplementationQtEventTarget.h> #include <UI/Qt/EventLoopImplementationQtEventTarget.h>
namespace WebView { namespace Ladybird {
bool EventLoopImplementationQtEventTarget::event(QEvent* event) bool EventLoopImplementationQtEventTarget::event(QEvent* event)
{ {

2
Libraries/LibWebView/EventLoop/EventLoopImplementationQtEventTarget.h → UI/Qt/EventLoopImplementationQtEventTarget.h
View file

@ -9,7 +9,7 @@
#include <QEvent> #include <QEvent>
#include <QObject> #include <QObject>
namespace WebView { namespace Ladybird {
class EventLoopImplementationQtEventTarget final : public QObject { class EventLoopImplementationQtEventTarget final : public QObject {
Q_OBJECT Q_OBJECT