From 7a7e39c7af4a9a86339e5dab27e0567d6abe69b5 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 6 Jul 2020 20:36:34 +0200 Subject: [PATCH] LibWeb: Move WebContentView from Demos/WebView into LibWeb --- Demos/WebView/CMakeLists.txt | 9 +-------- Demos/WebView/main.cpp | 2 +- Libraries/LibWeb/CMakeLists.txt | 4 ++++ {Demos/WebView => Libraries/LibWeb}/WebContentClient.cpp | 0 {Demos/WebView => Libraries/LibWeb}/WebContentClient.h | 0 {Demos/WebView => Libraries/LibWeb}/WebContentView.cpp | 0 {Demos/WebView => Libraries/LibWeb}/WebContentView.h | 0 7 files changed, 6 insertions(+), 9 deletions(-) rename {Demos/WebView => Libraries/LibWeb}/WebContentClient.cpp (100%) rename {Demos/WebView => Libraries/LibWeb}/WebContentClient.h (100%) rename {Demos/WebView => Libraries/LibWeb}/WebContentView.cpp (100%) rename {Demos/WebView => Libraries/LibWeb}/WebContentView.h (100%) diff --git a/Demos/WebView/CMakeLists.txt b/Demos/WebView/CMakeLists.txt index cf139cff1af..51489682f32 100644 --- a/Demos/WebView/CMakeLists.txt +++ b/Demos/WebView/CMakeLists.txt @@ -1,13 +1,6 @@ set(SOURCES main.cpp - WebContentView.cpp - WebContentClient.cpp -) - -set(GENERATED_SOURCES - ../../Services/WebContent/WebContentClientEndpoint.h - ../../Services/WebContent/WebContentServerEndpoint.h ) serenity_bin(WebView) -target_link_libraries(WebView LibGUI) +target_link_libraries(WebView LibWeb LibGUI) diff --git a/Demos/WebView/main.cpp b/Demos/WebView/main.cpp index 4fe29c725fb..d3c8d7e24ab 100644 --- a/Demos/WebView/main.cpp +++ b/Demos/WebView/main.cpp @@ -24,13 +24,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "WebContentView.h" #include #include #include #include #include #include +#include int main(int argc, char** argv) { diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt index 815119997df..30e79d5c3e9 100644 --- a/Libraries/LibWeb/CMakeLists.txt +++ b/Libraries/LibWeb/CMakeLists.txt @@ -109,11 +109,15 @@ set(SOURCES CSS/PropertyID.h CSS/PropertyID.cpp CSS/DefaultStyleSheetSource.cpp + WebContentView.cpp + WebContentClient.cpp ) set(GENERATED_SOURCES ../../Services/ProtocolServer/ProtocolClientEndpoint.h ../../Services/ProtocolServer/ProtocolServerEndpoint.h + ../../Services/WebContent/WebContentClientEndpoint.h + ../../Services/WebContent/WebContentServerEndpoint.h ) set_property(GLOBAL PROPERTY wrapper_sources) diff --git a/Demos/WebView/WebContentClient.cpp b/Libraries/LibWeb/WebContentClient.cpp similarity index 100% rename from Demos/WebView/WebContentClient.cpp rename to Libraries/LibWeb/WebContentClient.cpp diff --git a/Demos/WebView/WebContentClient.h b/Libraries/LibWeb/WebContentClient.h similarity index 100% rename from Demos/WebView/WebContentClient.h rename to Libraries/LibWeb/WebContentClient.h diff --git a/Demos/WebView/WebContentView.cpp b/Libraries/LibWeb/WebContentView.cpp similarity index 100% rename from Demos/WebView/WebContentView.cpp rename to Libraries/LibWeb/WebContentView.cpp diff --git a/Demos/WebView/WebContentView.h b/Libraries/LibWeb/WebContentView.h similarity index 100% rename from Demos/WebView/WebContentView.h rename to Libraries/LibWeb/WebContentView.h