Everywhere: Move the Ladybird folder to UI

Author: https://github.com/trflynn89
Commit: https://github.com/LadybirdBrowser/ladybird/commit/db47cc41f80
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/2256
Reviewed-by: https://github.com/sideshowbarker

.github/workflows/lagom-template.yml

@@ -191,7 +191,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: libweb-test-artifacts-${{ inputs.os_name }}
-          path: ${{ github.workspace }}/Build/Ladybird/test-dumps
+          path: ${{ github.workspace }}/Build/UI/test-dumps
           retention-days: 7
           if-no-files-found: ignore
 

.github/workflows/nightly-android.yml

@@ -91,7 +91,7 @@ jobs:
       # === BUILD ===
 
       - name: Build and Test
-        working-directory: ${{ github.workspace }}/Ladybird/Android
+        working-directory: ${{ github.workspace }}/UI/Android
         run: ./gradlew connectedAndroidTest
         env:
           GRADLE_OPTS: '-Xmx3072m'

CMakeLists.txt

@@ -4,7 +4,7 @@ if (VCPKG_TARGET_ANDROID)
     # If we are building for Android, we must load vcpkg_android.cmake before the project() declaration.
     # This ensures that the CMAKE_TOOLCHAIN_FILE is set correctly.
     # (we cannot set CMAKE_TOOLCHAIN_FILE from Gradle, unfortunately, so this is the only place we can do it.)
-    include("Ladybird/Android/vcpkg_android.cmake")
+    include("UI/Android/vcpkg_android.cmake")
 endif()
 
 # Pass additional information to vcpkg toolchain files if we are using vcpkg.
@@ -28,7 +28,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(LADYBIRD_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 list(APPEND CMAKE_MODULE_PATH "${LADYBIRD_SOURCE_DIR}/Meta/CMake")
 
-include(Ladybird/cmake/EnableLagom.cmake)
+include(UI/cmake/EnableLagom.cmake)
 include(use_linker)
 include(lagom_options NO_POLICY_SCOPE)
 include(lagom_compile_options)
@@ -90,7 +90,7 @@ include(CTest) # for BUILD_TESTING option, default ON
 
 if (ENABLE_GUI_TARGETS)
     add_subdirectory(Services)
-    add_subdirectory(Ladybird)
+    add_subdirectory(UI)
 endif()
 
 add_custom_target(lint-shell-scripts

Documentation/BuildInstructionsLadybird.md

@@ -188,7 +188,7 @@ pkgman install cmake cmd:python3 ninja openal_devel qt6_base_devel qt6_multimedi
 ### Android:
 
 On a Unix-like platform, install the prerequisites for that platform and then see the [Android Studio guide](EditorConfiguration/AndroidStudioConfiguration.md).
-Or, download a version of Gradle >= 8.0.0, and run the ``gradlew`` program in ``Ladybird/Android``
+Or, download a version of Gradle >= 8.0.0, and run the ``gradlew`` program in ``UI/Android``
 
 ## Build steps
 
@@ -281,7 +281,7 @@ The script Meta/ladybird.sh and the default preset in CMakePresets.json both def
 `Build/release`. For distribution purposes, or when building multiple configurations, it may be useful to create a custom
 CMake build directory.
 
-The install rules in Ladybird/cmake/InstallRules.cmake define which binaries and libraries will be
+The install rules in UI/cmake/InstallRules.cmake define which binaries and libraries will be
 installed into the configured CMAKE_PREFIX_PATH or path passed to ``cmake --install``.
 
 Note that when using a custom build directory rather than Meta/ladybird.sh, the user may need to provide

Documentation/EditorConfiguration/AndroidStudioConfiguration.md

@@ -12,11 +12,11 @@ Ensure that your system has the following tools available:
 
 ## Opening the project
 
-After opening the ``ladybird`` directory in Android Studio (NOT the Ladybird/Android directory!)
+After opening the ``ladybird`` directory in Android Studio (NOT the UI/Android directory!)
 there should be a pop-up in the bottom left indicating that an Android Gradle project was detected
-in ``Ladybird/Android``.
+in ``UI/Android``.
 
-In the top left of the screen in the Project view, navigate to ``Ladybird/Android``. Or, click the
+In the top left of the screen in the Project view, navigate to ``UI/Android``. Or, click the
 highlighted text in the notification for that path. Open the ``settings.gradle.kts`` file. At the
 top of the file should be a banner that says ``Code Insight unavailable (related Gradle project not
 linked).`` Click the ``Link Gradle project`` text on the right side of the banner. After the IDE

Documentation/Testing.md

@@ -12,9 +12,9 @@ Tests of internal C++ code go in their own `TestFoo.cpp` file in `Tests/LibWeb`.
 > To reproduce a CI failure, see the section on [Running with Sanitizers](#running-with-sanitizers).
 
 The easiest way to run tests is to use the `ladybird.sh` script. The LibWeb tests are registered with CMake as a test in
-`Ladybird/CMakeLists.txt`. Using the built-in test filtering, you can run all tests with `Meta/ladybird.sh test` or run
+`UI/CMakeLists.txt`. Using the built-in test filtering, you can run all tests with `Meta/ladybird.sh test` or run
 just the LibWeb tests with `Meta/ladybird.sh test LibWeb`. The second way is to invoke the headless browser test runner
-directly. See the invocation in `Ladybird/CMakeLists.txt` for the expected command line arguments.
+directly. See the invocation in `UI/CMakeLists.txt` for the expected command line arguments.
 
 A third way is to invoke `ctest` directly. The simplest method is to use the `default` preset from ``CMakePresets.json``:
 

Meta/Lagom/ReadMe.md

@@ -13,7 +13,7 @@ Lagom is used by the Serenity project in the following ways:
 - [Build tools](./Tools) required to build Serenity itself using Serenity's own C++ libraries are in Lagom.
 - [Unit tests](../../Documentation/Testing.md) in CI are built using the Lagom build for host systems to ensure portability.
 - [Continuous fuzzing](#fuzzing-on-oss-fuzz) is done with the help of OSS-fuzz using the Lagom build.
-- [The Ladybird browser](../../Ladybird/README.md) uses Lagom to provide LibWeb and LibJS for non-Serenity systems.
+- [The Ladybird browser](../../README.md) uses Lagom to provide LibWeb and LibJS for non-Serenity systems.
 - [ECMA 262 spec tests](https://ladybirdbrowser.github.io/libjs-website/test262) for LibJS are run per-commit and tracked on [LibJS website](https://ladybirdbrowser.github.io/libjs-website/).
 - [Wasm spec tests](https://ladybirdbrowser.github.io/libjs-website/wasm) for LibWasm are run per-commit and tracked on [LibJS website](https://ladybirdbrowser.github.io/libjs-website/).
 

Meta/check-style.py

@@ -27,10 +27,6 @@ LICENSE_HEADER_CHECK_EXCLUDES = {
 
 # We check that "#pragma once" is present
 PRAGMA_ONCE_STRING = '#pragma once'
-PRAGMA_ONCE_CHECK_EXCLUDES = {
-    'Ladybird/AppKit/System/Detail/Header.h',
-    'Ladybird/AppKit/System/Detail/Footer.h',
-}
 
 # We make sure that there's a blank line before and after pragma once
 GOOD_PRAGMA_ONCE_PATTERN = re.compile('(^|\\S\n\n)#pragma once(\n\n\\S.|$)')
@@ -105,10 +101,7 @@ def run():
             if not GOOD_LICENSE_HEADER_PATTERN.search(file_content):
                 errors_license.append(filename)
         if filename.endswith('.h'):
-            if is_in_prefix_list(filename, PRAGMA_ONCE_CHECK_EXCLUDES):
+            if GOOD_PRAGMA_ONCE_PATTERN.search(file_content):
-                # File was excluded
-                pass
-            elif GOOD_PRAGMA_ONCE_PATTERN.search(file_content):
                 # Excellent, the formatting is correct.
                 pass
             elif PRAGMA_ONCE_STRING in file_content:

Services/ImageDecoder/CMakeLists.txt

@@ -8,9 +8,9 @@ set(SOURCES
 
 if (ANDROID)
     add_library(imagedecoderservice SHARED
-        ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/ImageDecoderService.cpp
+        ${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/ImageDecoderService.cpp
-        ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp
+        ${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp
-        ${LADYBIRD_SOURCE_DIR}/Ladybird/Utilities.cpp
+        ${LADYBIRD_SOURCE_DIR}/UI/Utilities.cpp
         ${SOURCES}
     )
 else()

Services/RequestServer/CMakeLists.txt

@@ -8,9 +8,9 @@ set(SOURCES
 
 if (ANDROID)
     add_library(requestserverservice SHARED
-        ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/RequestServerService.cpp
+        ${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/RequestServerService.cpp
-        ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp
+        ${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp
-        ${LADYBIRD_SOURCE_DIR}/Ladybird/Utilities.cpp
+        ${LADYBIRD_SOURCE_DIR}/UI/Utilities.cpp
         ${SOURCES}
     )
 else()

Services/WebContent/CMakeLists.txt

@@ -2,10 +2,10 @@ include(fontconfig)
 include(pulseaudio)
 
 set(SOURCES
-    ${LADYBIRD_SOURCE_DIR}/Ladybird/FontPlugin.cpp
+    ${LADYBIRD_SOURCE_DIR}/UI/FontPlugin.cpp
-    ${LADYBIRD_SOURCE_DIR}/Ladybird/HelperProcess.cpp
+    ${LADYBIRD_SOURCE_DIR}/UI/HelperProcess.cpp
-    ${LADYBIRD_SOURCE_DIR}/Ladybird/ImageCodecPlugin.cpp
+    ${LADYBIRD_SOURCE_DIR}/UI/ImageCodecPlugin.cpp
-    ${LADYBIRD_SOURCE_DIR}/Ladybird/Utilities.cpp
+    ${LADYBIRD_SOURCE_DIR}/UI/Utilities.cpp
     ConnectionFromClient.cpp
     ConsoleGlobalEnvironmentExtensions.cpp
     BackingStoreManager.cpp
@@ -17,10 +17,10 @@ set(SOURCES
 
 if (ANDROID)
     add_library(webcontentservice SHARED
-        ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/WebContentService.cpp
+        ${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/WebContentService.cpp
-        ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/WebContentServiceJNI.cpp
+        ${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/WebContentServiceJNI.cpp
-        ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp
+        ${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp
-        ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/JNIHelpers.cpp
+        ${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/JNIHelpers.cpp
         ${SOURCES}
     )
     target_link_libraries(webcontentservice PRIVATE android)
@@ -41,9 +41,9 @@ endif()
 
 if (ENABLE_QT)
     qt_add_executable(WebContent
-        ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/EventLoopImplementationQt.cpp
+        ${LADYBIRD_SOURCE_DIR}/UI/Qt/EventLoopImplementationQt.cpp
-        ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/EventLoopImplementationQtEventTarget.cpp
+        ${LADYBIRD_SOURCE_DIR}/UI/Qt/EventLoopImplementationQtEventTarget.cpp
-        ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/StringUtils.cpp
+        ${LADYBIRD_SOURCE_DIR}/UI/Qt/StringUtils.cpp
         main.cpp
     )
     target_link_libraries(WebContent PRIVATE Qt::Core)
@@ -53,8 +53,8 @@ if (ENABLE_QT)
         find_package(Qt6 REQUIRED COMPONENTS Multimedia)
 
         target_sources(WebContent PRIVATE
-            ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/AudioCodecPluginQt.cpp
+            ${LADYBIRD_SOURCE_DIR}/UI/Qt/AudioCodecPluginQt.cpp
-            ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/AudioThread.cpp
+            ${LADYBIRD_SOURCE_DIR}/UI/Qt/AudioThread.cpp
         )
 
         target_link_libraries(WebContent PRIVATE Qt::Multimedia)
@@ -68,8 +68,8 @@ target_link_libraries(WebContent PRIVATE webcontentservice LibURL)
 
 target_sources(webcontentservice PUBLIC FILE_SET ladybird TYPE HEADERS
     BASE_DIRS ${LADYBIRD_SOURCE_DIR}
-    FILES ${LADYBIRD_SOURCE_DIR}/Ladybird/FontPlugin.h
+    FILES ${LADYBIRD_SOURCE_DIR}/UI/FontPlugin.h
-          ${LADYBIRD_SOURCE_DIR}/Ladybird/ImageCodecPlugin.h
+          ${LADYBIRD_SOURCE_DIR}/UI/ImageCodecPlugin.h
 )
 target_sources(webcontentservice PUBLIC FILE_SET server TYPE HEADERS
     BASE_DIRS ${LADYBIRD_SOURCE_DIR}/Services

Services/WebContent/main.cpp

@@ -5,9 +5,6 @@
  */
 
 #include <AK/LexicalPath.h>
-#include <Ladybird/FontPlugin.h>
-#include <Ladybird/ImageCodecPlugin.h>
-#include <Ladybird/Utilities.h>
 #include <LibCore/ArgsParser.h>
 #include <LibCore/EventLoop.h>
 #include <LibCore/LocalServer.h>
@@ -29,16 +26,19 @@
 #include <LibWeb/PermissionsPolicy/AutoplayAllowlist.h>
 #include <LibWeb/Platform/AudioCodecPluginAgnostic.h>
 #include <LibWeb/Platform/EventLoopPluginSerenity.h>
+#include <UI/FontPlugin.h>
+#include <UI/ImageCodecPlugin.h>
+#include <UI/Utilities.h>
 #include <WebContent/ConnectionFromClient.h>
 #include <WebContent/PageClient.h>
 #include <WebContent/WebDriverConnection.h>
 
 #if defined(HAVE_QT)
-#    include <Ladybird/Qt/EventLoopImplementationQt.h>
 #    include <QCoreApplication>
+#    include <UI/Qt/EventLoopImplementationQt.h>
 
 #    if defined(HAVE_QT_MULTIMEDIA)
-#        include <Ladybird/Qt/AudioCodecPluginQt.h>
+#        include <UI/Qt/AudioCodecPluginQt.h>
 #    endif
 #endif
 

Services/WebDriver/CMakeLists.txt

@@ -1,5 +1,5 @@
 set(SOURCES
-    ${LADYBIRD_SOURCE_DIR}/Ladybird/Utilities.cpp
+    ${LADYBIRD_SOURCE_DIR}/UI/Utilities.cpp
     Client.cpp
     Session.cpp
     WebContentConnection.cpp

Services/WebDriver/main.cpp

@@ -5,7 +5,6 @@
  */
 
 #include <AK/Platform.h>
-#include <Ladybird/Utilities.h>
 #include <LibCore/ArgsParser.h>
 #include <LibCore/Directory.h>
 #include <LibCore/EventLoop.h>
@@ -15,6 +14,7 @@
 #include <LibCore/TCPServer.h>
 #include <LibMain/Main.h>
 #include <LibWeb/WebDriver/Capabilities.h>
+#include <UI/Utilities.h>
 #include <WebDriver/Client.h>
 
 static Vector<ByteString> certificates;

Services/WebWorker/CMakeLists.txt

@@ -1,9 +1,9 @@
 include(fontconfig)
 
 set(WEBWORKER_SOURCES
-    ${LADYBIRD_SOURCE_DIR}/Ladybird/FontPlugin.cpp
+    ${LADYBIRD_SOURCE_DIR}/UI/FontPlugin.cpp
-    ${LADYBIRD_SOURCE_DIR}/Ladybird/HelperProcess.cpp
+    ${LADYBIRD_SOURCE_DIR}/UI/HelperProcess.cpp
-    ${LADYBIRD_SOURCE_DIR}/Ladybird/Utilities.cpp
+    ${LADYBIRD_SOURCE_DIR}/UI/Utilities.cpp
     ConnectionFromClient.cpp
     DedicatedWorkerHost.cpp
     PageHost.cpp
@@ -26,9 +26,9 @@ endif()
 
 if (ENABLE_QT)
     qt_add_executable(WebWorker
-        ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/EventLoopImplementationQt.cpp
+        ${LADYBIRD_SOURCE_DIR}/UI/Qt/EventLoopImplementationQt.cpp
-        ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/EventLoopImplementationQtEventTarget.cpp
+        ${LADYBIRD_SOURCE_DIR}/UI/Qt/EventLoopImplementationQtEventTarget.cpp
-        ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/StringUtils.cpp
+        ${LADYBIRD_SOURCE_DIR}/UI/Qt/StringUtils.cpp
         main.cpp
     )
     target_link_libraries(WebWorker PRIVATE Qt::Core)

Services/WebWorker/main.cpp

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Ladybird/FontPlugin.h>
-#include <Ladybird/HelperProcess.h>
-#include <Ladybird/Utilities.h>
 #include <LibCore/ArgsParser.h>
 #include <LibCore/EventLoop.h>
 #include <LibCore/LocalServer.h>
@@ -22,11 +19,14 @@
 #include <LibWeb/Platform/EventLoopPlugin.h>
 #include <LibWeb/Platform/EventLoopPluginSerenity.h>
 #include <LibWeb/WebSockets/WebSocket.h>
+#include <UI/FontPlugin.h>
+#include <UI/HelperProcess.h>
+#include <UI/Utilities.h>
 #include <WebWorker/ConnectionFromClient.h>
 
 #if defined(HAVE_QT)
-#    include <Ladybird/Qt/EventLoopImplementationQt.h>
 #    include <QCoreApplication>
+#    include <UI/Qt/EventLoopImplementationQt.h>
 #endif
 
 static ErrorOr<void> initialize_resource_loader(JS::Heap&, int request_server_socket);

UI/Android/src/main/cpp/LadybirdActivity.cpp

@@ -11,7 +11,6 @@
 #include <AK/HashMap.h>
 #include <AK/LexicalPath.h>
 #include <AK/OwnPtr.h>
-#include <Ladybird/Utilities.h>
 #include <LibArchive/TarStream.h>
 #include <LibCore/DirIterator.h>
 #include <LibCore/Directory.h>
@@ -20,6 +19,7 @@
 #include <LibCore/Timer.h>
 #include <LibFileSystem/FileSystem.h>
 #include <LibWebView/Application.h>
+#include <UI/Utilities.h>
 #include <jni.h>
 
 static ErrorOr<void> extract_tar_archive(String archive_file, ByteString output_directory);

UI/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp

@@ -7,8 +7,8 @@
 #include "LadybirdServiceBase.h"
 #include <AK/Atomic.h>
 #include <AK/Format.h>
-#include <Ladybird/Utilities.h>
 #include <LibCore/ResourceImplementationFile.h>
+#include <UI/Utilities.h>
 #include <jni.h>
 
 JavaVM* global_vm;

UI/Android/src/main/cpp/RequestServerService.cpp

@@ -8,7 +8,6 @@
 #include "LadybirdServiceBase.h"
 #include <AK/LexicalPath.h>
 #include <AK/OwnPtr.h>
-#include <Ladybird/Utilities.h>
 #include <LibCore/ArgsParser.h>
 #include <LibCore/EventLoop.h>
 #include <LibCore/LocalServer.h>
@@ -19,6 +18,7 @@
 #include <RequestServer/ConnectionFromClient.h>
 #include <RequestServer/HttpProtocol.h>
 #include <RequestServer/HttpsProtocol.h>
+#include <UI/Utilities.h>
 
 // FIXME: Share b/w RequestServer and WebSocket
 static ErrorOr<ByteString> find_certificates(StringView serenity_resource_root)

UI/Android/src/main/cpp/WebContentService.cpp

@@ -7,10 +7,6 @@
 #include "WebContentService.h"
 #include "LadybirdServiceBase.h"
 #include <AK/LexicalPath.h>
-#include <Ladybird/FontPlugin.h>
-#include <Ladybird/HelperProcess.h>
-#include <Ladybird/ImageCodecPlugin.h>
-#include <Ladybird/Utilities.h>
 #include <LibCore/ArgsParser.h>
 #include <LibCore/EventLoop.h>
 #include <LibCore/LocalServer.h>
@@ -29,6 +25,10 @@
 #include <LibWeb/Platform/AudioCodecPluginAgnostic.h>
 #include <LibWeb/Platform/EventLoopPluginSerenity.h>
 #include <LibWebView/RequestServerAdapter.h>
+#include <UI/FontPlugin.h>
+#include <UI/HelperProcess.h>
+#include <UI/ImageCodecPlugin.h>
+#include <UI/Utilities.h>
 #include <WebContent/ConnectionFromClient.h>
 #include <WebContent/PageHost.h>
 

UI/AppKit/Application/Application.mm

@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Ladybird/HelperProcess.h>
+#include <Interface/LadybirdWebViewBridge.h>
-#include <Ladybird/Utilities.h>
 #include <LibCore/EventLoop.h>
 #include <LibCore/ThreadEventQueue.h>
 #include <LibImageDecoderClient/Client.h>
 #include <LibRequests/RequestClient.h>
 #include <LibWebView/Application.h>
 #include <LibWebView/WebContentClient.h>
-#include <UI/LadybirdWebViewBridge.h>
+#include <UI/HelperProcess.h>
+#include <UI/Utilities.h>
 #include <Utilities/Conversions.h>
 
 #import <Application/Application.h>

UI/AppKit/Application/ApplicationDelegate.mm

@@ -9,10 +9,10 @@
 #include <LibWebView/SearchEngine.h>
 
 #import <Application/ApplicationDelegate.h>
+#import <Interface/LadybirdWebView.h>
+#import <Interface/Tab.h>
+#import <Interface/TabController.h>
 #import <LibWebView/UserAgent.h>
-#import <UI/LadybirdWebView.h>
-#import <UI/Tab.h>
-#import <UI/TabController.h>
 
 #if defined(LADYBIRD_USE_SWIFT)
 // FIXME: Report this codegen error to Apple
@@ -20,7 +20,7 @@
 #    import <Ladybird-Swift.h>
 #    undef StyleMask
 #else
-#    import <UI/TaskManagerController.h>
+#    import <Interface/TaskManagerController.h>
 #endif
 
 #import <Utilities/Conversions.h>

UI/AppKit/CMakeLists.txt

@@ -3,16 +3,16 @@ add_library(ladybird_impl STATIC
     Application/Application.mm
     Application/ApplicationDelegate.mm
     Application/EventLoopImplementation.mm
-    UI/Event.mm
+    Interface/Event.mm
-    UI/Inspector.mm
+    Interface/Inspector.mm
-    UI/InspectorController.mm
+    Interface/InspectorController.mm
-    UI/LadybirdWebView.mm
+    Interface/LadybirdWebView.mm
-    UI/LadybirdWebViewBridge.cpp
+    Interface/LadybirdWebViewBridge.cpp
-    UI/LadybirdWebViewWindow.mm
+    Interface/LadybirdWebViewWindow.mm
-    UI/Palette.mm
+    Interface/Palette.mm
-    UI/SearchPanel.mm
+    Interface/SearchPanel.mm
-    UI/Tab.mm
+    Interface/Tab.mm
-    UI/TabController.mm
+    Interface/TabController.mm
     Utilities/Conversions.mm
 )
 target_include_directories(ladybird_impl PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
@@ -25,8 +25,8 @@ target_compile_features(ladybird_impl PUBLIC cxx_std_23)
 
 if (ENABLE_SWIFT)
     target_sources(ladybird_impl PRIVATE
-        UI/TaskManager.swift
+        Interface/TaskManager.swift
-        UI/TaskManagerController.swift
+        Interface/TaskManagerController.swift
     )
     target_compile_definitions(ladybird_impl PUBLIC LADYBIRD_USE_SWIFT)
     set_target_properties(ladybird_impl PROPERTIES Swift_MODULE_NAME "SwiftLadybird")
@@ -37,8 +37,8 @@ if (ENABLE_SWIFT)
     )
 else()
     target_sources(ladybird_impl PRIVATE
-        UI/TaskManager.mm
+        Interface/TaskManager.mm
-        UI/TaskManagerController.mm
+        Interface/TaskManagerController.mm
     )
 endif()
 

UI/AppKit/Interface/Event.mm

@@ -11,7 +11,7 @@
 #include <LibWeb/UIEvents/KeyCode.h>
 
 #import <Carbon/Carbon.h>
-#import <UI/Event.h>
+#import <Interface/Event.h>
 #import <Utilities/Conversions.h>
 
 namespace Ladybird {

UI/AppKit/Interface/Inspector.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #import <Cocoa/Cocoa.h>
-#import <Ladybird/AppKit/UI/LadybirdWebViewWindow.h>
+#import <Interface/LadybirdWebViewWindow.h>
 
 @class LadybirdWebView;
 @class Tab;

UI/AppKit/Interface/Inspector.mm

@@ -9,10 +9,10 @@
 #include <LibWebView/InspectorClient.h>
 #include <LibWebView/ViewImplementation.h>
 
-#import <UI/Event.h>
+#import <Interface/Event.h>
-#import <UI/Inspector.h>
+#import <Interface/Inspector.h>
-#import <UI/LadybirdWebView.h>
+#import <Interface/LadybirdWebView.h>
-#import <UI/Tab.h>
+#import <Interface/Tab.h>
 #import <Utilities/Conversions.h>
 
 #if !__has_feature(objc_arc)

UI/AppKit/Interface/InspectorController.mm

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#import <UI/Inspector.h>
+#import <Interface/Inspector.h>
-#import <UI/InspectorController.h>
+#import <Interface/InspectorController.h>
-#import <UI/LadybirdWebView.h>
+#import <Interface/LadybirdWebView.h>
-#import <UI/Tab.h>
+#import <Interface/Tab.h>
 
 #if !__has_feature(objc_arc)
 #    error "This project requires ARC"

UI/AppKit/Interface/LadybirdWebView.mm

@@ -6,6 +6,7 @@
 
 #include <AK/Optional.h>
 #include <AK/TemporaryChange.h>
+#include <Interface/LadybirdWebViewBridge.h>
 #include <LibGfx/ImageFormats/PNGWriter.h>
 #include <LibGfx/ShareableBitmap.h>
 #include <LibURL/URL.h>
@@ -14,12 +15,11 @@
 #include <LibWebView/SearchEngine.h>
 #include <LibWebView/SourceHighlighter.h>
 #include <LibWebView/URL.h>
-#include <UI/LadybirdWebViewBridge.h>
 
 #import <Application/Application.h>
 #import <Application/ApplicationDelegate.h>
-#import <UI/Event.h>
+#import <Interface/Event.h>
-#import <UI/LadybirdWebView.h>
+#import <Interface/LadybirdWebView.h>
 #import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
 #import <Utilities/Conversions.h>
 

UI/AppKit/Interface/LadybirdWebViewBridge.cpp

@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Ladybird/HelperProcess.h>
+#include <Interface/LadybirdWebViewBridge.h>
-#include <Ladybird/Utilities.h>
 #include <LibGfx/Font/FontDatabase.h>
 #include <LibGfx/Rect.h>
 #include <LibIPC/File.h>
 #include <LibWeb/Crypto/Crypto.h>
 #include <LibWebView/Application.h>
 #include <LibWebView/UserAgent.h>
-#include <UI/LadybirdWebViewBridge.h>
+#include <UI/HelperProcess.h>
+#include <UI/Utilities.h>
 
-#import <UI/Palette.h>
+#import <Interface/Palette.h>
 
 namespace Ladybird {
 

UI/AppKit/Interface/LadybirdWebViewWindow.mm

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#import <UI/LadybirdWebView.h>
+#import <Interface/LadybirdWebView.h>
-#import <UI/LadybirdWebViewWindow.h>
+#import <Interface/LadybirdWebViewWindow.h>
 
 #if !__has_feature(objc_arc)
 #    error "This project requires ARC"

UI/AppKit/Interface/Palette.mm

@@ -5,13 +5,13 @@
  */
 
 #include <AK/ByteString.h>
-#include <Ladybird/Utilities.h>
 #include <LibCore/Resource.h>
 #include <LibGfx/Palette.h>
 #include <LibGfx/SystemTheme.h>
+#include <UI/Utilities.h>
 
 #import <Cocoa/Cocoa.h>
-#import <UI/Palette.h>
+#import <Interface/Palette.h>
 #import <Utilities/Conversions.h>
 
 namespace Ladybird {

UI/AppKit/Interface/SearchPanel.mm

@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <UI/LadybirdWebViewBridge.h>
+#include <Interface/LadybirdWebViewBridge.h>
 
-#import <UI/LadybirdWebView.h>
+#import <Interface/LadybirdWebView.h>
-#import <UI/SearchPanel.h>
+#import <Interface/SearchPanel.h>
-#import <UI/Tab.h>
+#import <Interface/Tab.h>
 #import <Utilities/Conversions.h>
 
 #if !__has_feature(objc_arc)