diff options
| -rw-r--r-- | Demos/WebView/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | Demos/WebView/main.cpp | 2 | ||||
| -rw-r--r-- | Libraries/LibWeb/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Libraries/LibWeb/WebContentClient.cpp (renamed from Demos/WebView/WebContentClient.cpp) | 0 | ||||
| -rw-r--r-- | Libraries/LibWeb/WebContentClient.h (renamed from Demos/WebView/WebContentClient.h) | 0 | ||||
| -rw-r--r-- | Libraries/LibWeb/WebContentView.cpp (renamed from Demos/WebView/WebContentView.cpp) | 0 | ||||
| -rw-r--r-- | Libraries/LibWeb/WebContentView.h (renamed from Demos/WebView/WebContentView.h) | 0 |
7 files changed, 6 insertions, 9 deletions
diff --git a/Demos/WebView/CMakeLists.txt b/Demos/WebView/CMakeLists.txt index cf139cff1a..51489682f3 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 4fe29c725f..d3c8d7e24a 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 <AK/URL.h> #include <LibGUI/Application.h> #include <LibGUI/BoxLayout.h> #include <LibGUI/StatusBar.h> #include <LibGUI/Widget.h> #include <LibGUI/Window.h> +#include <LibWeb/WebContentView.h> int main(int argc, char** argv) { diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt index 815119997d..30e79d5c3e 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 index 0042cc14db..0042cc14db 100644 --- a/Demos/WebView/WebContentClient.cpp +++ b/Libraries/LibWeb/WebContentClient.cpp diff --git a/Demos/WebView/WebContentClient.h b/Libraries/LibWeb/WebContentClient.h index 638cf22b40..638cf22b40 100644 --- a/Demos/WebView/WebContentClient.h +++ b/Libraries/LibWeb/WebContentClient.h diff --git a/Demos/WebView/WebContentView.cpp b/Libraries/LibWeb/WebContentView.cpp index 67ceffecd8..67ceffecd8 100644 --- a/Demos/WebView/WebContentView.cpp +++ b/Libraries/LibWeb/WebContentView.cpp diff --git a/Demos/WebView/WebContentView.h b/Libraries/LibWeb/WebContentView.h index 6af604a31c..6af604a31c 100644 --- a/Demos/WebView/WebContentView.h +++ b/Libraries/LibWeb/WebContentView.h |