WebContent: Move all WebContent configuration to Services

Author: https://github.com/trflynn89
Commit: 20bdd34696
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/2251

Ladybird/CMakeLists.txt

@@ -132,7 +132,6 @@ else()
 endif()
 
 add_subdirectory(Headless)
-add_subdirectory(WebContent)
 add_subdirectory(WebWorker)
 
 set(ladybird_helper_processes ImageDecoder RequestServer WebContent WebWorker)

Userland/Services/CMakeLists.txt

@@ -1,3 +1,4 @@
 add_subdirectory(ImageDecoder)
 add_subdirectory(RequestServer)
+add_subdirectory(WebContent)
 add_subdirectory(WebDriver)

Userland/Services/WebContent/CMakeLists.txt

@@ -1,39 +1,37 @@
 include(fontconfig)
 include(pulseaudio)
 
-set(WEBCONTENT_SOURCE_DIR ${LADYBIRD_SOURCE_DIR}/Userland/Services/WebContent/)
+set(SOURCES
-
+    ${LADYBIRD_SOURCE_DIR}/Ladybird/FontPlugin.cpp
-set(WEBCONTENT_SOURCES
+    ${LADYBIRD_SOURCE_DIR}/Ladybird/HelperProcess.cpp
-    ${WEBCONTENT_SOURCE_DIR}/ConnectionFromClient.cpp
+    ${LADYBIRD_SOURCE_DIR}/Ladybird/ImageCodecPlugin.cpp
-    ${WEBCONTENT_SOURCE_DIR}/ConsoleGlobalEnvironmentExtensions.cpp
+    ${LADYBIRD_SOURCE_DIR}/Ladybird/Utilities.cpp
-    ${WEBCONTENT_SOURCE_DIR}/BackingStoreManager.cpp
+    ConnectionFromClient.cpp
-    ${WEBCONTENT_SOURCE_DIR}/PageClient.cpp
+    ConsoleGlobalEnvironmentExtensions.cpp
-    ${WEBCONTENT_SOURCE_DIR}/PageHost.cpp
+    BackingStoreManager.cpp
-    ${WEBCONTENT_SOURCE_DIR}/WebContentConsoleClient.cpp
+    PageClient.cpp
-    ${WEBCONTENT_SOURCE_DIR}/WebDriverConnection.cpp
+    PageHost.cpp
-    ../FontPlugin.cpp
+    WebContentConsoleClient.cpp
-    ../HelperProcess.cpp
+    WebDriverConnection.cpp
-    ../ImageCodecPlugin.cpp
-    ../Utilities.cpp
 )
 
 if (ANDROID)
     add_library(webcontentservice SHARED
-        ${WEBCONTENT_SOURCES}
+        ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/WebContentService.cpp
-        ../Android/src/main/cpp/WebContentService.cpp
+        ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/WebContentServiceJNI.cpp
-        ../Android/src/main/cpp/WebContentServiceJNI.cpp
+        ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp
-        ../Android/src/main/cpp/LadybirdServiceBaseJNI.cpp
+        ${LADYBIRD_SOURCE_DIR}/Ladybird/Android/src/main/cpp/JNIHelpers.cpp
-        ../Android/src/main/cpp/JNIHelpers.cpp
+        ${SOURCES}
     )
     target_link_libraries(webcontentservice PRIVATE android)
 else()
-    add_library(webcontentservice STATIC ${WEBCONTENT_SOURCES})
+    add_library(webcontentservice STATIC ${SOURCES})
     set_target_properties(webcontentservice PROPERTIES AUTOMOC OFF AUTORCC OFF AUTOUIC OFF)
 endif()
 
+target_include_directories(webcontentservice PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../..>)
 target_include_directories(webcontentservice PUBLIC $<BUILD_INTERFACE:${LADYBIRD_SOURCE_DIR}/Userland/Services/>)
 target_include_directories(webcontentservice PUBLIC $<BUILD_INTERFACE:${LADYBIRD_SOURCE_DIR}/Userland/>)
-target_include_directories(webcontentservice PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/..>)
 
 target_link_libraries(webcontentservice PUBLIC LibCore LibFileSystem LibGfx LibIPC LibJS LibMain LibMedia LibWeb LibWebSocket LibRequests LibWebView LibImageDecoderClient)
 
@@ -43,9 +41,9 @@ endif()
 
 if (ENABLE_QT)
     qt_add_executable(WebContent
-        ../Qt/EventLoopImplementationQt.cpp
+        ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/EventLoopImplementationQt.cpp
-        ../Qt/EventLoopImplementationQtEventTarget.cpp
+        ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/EventLoopImplementationQtEventTarget.cpp
-        ../Qt/StringUtils.cpp
+        ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/StringUtils.cpp
         main.cpp
     )
     target_link_libraries(WebContent PRIVATE Qt::Core)
@@ -55,8 +53,8 @@ if (ENABLE_QT)
         find_package(Qt6 REQUIRED COMPONENTS Multimedia)
 
         target_sources(WebContent PRIVATE
-            ../Qt/AudioCodecPluginQt.cpp
+            ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/AudioCodecPluginQt.cpp
-            ../Qt/AudioThread.cpp
+            ${LADYBIRD_SOURCE_DIR}/Ladybird/Qt/AudioThread.cpp
         )
 
         target_link_libraries(WebContent PRIVATE Qt::Multimedia)
@@ -70,15 +68,15 @@ target_link_libraries(WebContent PRIVATE webcontentservice LibURL)
 
 target_sources(webcontentservice PUBLIC FILE_SET ladybird TYPE HEADERS
     BASE_DIRS ${LADYBIRD_SOURCE_DIR}
-    FILES ../FontPlugin.h
+    FILES ${LADYBIRD_SOURCE_DIR}/Ladybird/FontPlugin.h
-          ../ImageCodecPlugin.h
+          ${LADYBIRD_SOURCE_DIR}/Ladybird/ImageCodecPlugin.h
 )
 target_sources(webcontentservice PUBLIC FILE_SET server TYPE HEADERS
     BASE_DIRS ${LADYBIRD_SOURCE_DIR}/Userland/Services
-    FILES ${WEBCONTENT_SOURCE_DIR}/ConnectionFromClient.h
+    FILES ConnectionFromClient.h
-          ${WEBCONTENT_SOURCE_DIR}/ConsoleGlobalEnvironmentExtensions.h
+          ConsoleGlobalEnvironmentExtensions.h
-          ${WEBCONTENT_SOURCE_DIR}/Forward.h
+          Forward.h
-          ${WEBCONTENT_SOURCE_DIR}/PageHost.h
+          PageHost.h
-          ${WEBCONTENT_SOURCE_DIR}/WebContentConsoleClient.h
+          WebContentConsoleClient.h
-          ${WEBCONTENT_SOURCE_DIR}/WebDriverConnection.h
+          WebDriverConnection.h
 )