summaryrefslogtreecommitdiff
path: root/Userland/Applications/Browser
diff options
context:
space:
mode:
authorDexesTTP <dexes.ttp@gmail.com>2022-04-30 10:46:33 +0200
committerAndreas Kling <kling@serenityos.org>2022-05-15 12:17:36 +0200
commitdcbbbf5b4a5dcb67184dc9f97c0f434aa301098c (patch)
tree3c4b47a4ea514104796f317f9bca349bab99b509 /Userland/Applications/Browser
parent31c00224295bfbe71e6533b447751d745c0f06cc (diff)
downloadserenity-dcbbbf5b4a5dcb67184dc9f97c0f434aa301098c.zip
LibWebView: Move OutOfProcessWebView to a new LibWebView library
Also moves WebContentClient and the references to the generated IPC descriptions, since they are all components of OutOfProcessWebView. This patch has no functional changes.
Diffstat (limited to 'Userland/Applications/Browser')
-rw-r--r--Userland/Applications/Browser/BrowserWindow.cpp2
-rw-r--r--Userland/Applications/Browser/CMakeLists.txt2
-rw-r--r--Userland/Applications/Browser/ConsoleWidget.cpp2
-rw-r--r--Userland/Applications/Browser/ConsoleWidget.h4
-rw-r--r--Userland/Applications/Browser/InspectorWidget.cpp2
-rw-r--r--Userland/Applications/Browser/InspectorWidget.h5
-rw-r--r--Userland/Applications/Browser/Tab.cpp4
-rw-r--r--Userland/Applications/Browser/Tab.h6
8 files changed, 14 insertions, 13 deletions
diff --git a/Userland/Applications/Browser/BrowserWindow.cpp b/Userland/Applications/Browser/BrowserWindow.cpp
index 47806aea86..65f8c1f74c 100644
--- a/Userland/Applications/Browser/BrowserWindow.cpp
+++ b/Userland/Applications/Browser/BrowserWindow.cpp
@@ -37,7 +37,7 @@
#include <LibWeb/Dump.h>
#include <LibWeb/Layout/InitialContainingBlock.h>
#include <LibWeb/Loader/ResourceLoader.h>
-#include <LibWeb/OutOfProcessWebView.h>
+#include <LibWebView/OutOfProcessWebView.h>
namespace Browser {
diff --git a/Userland/Applications/Browser/CMakeLists.txt b/Userland/Applications/Browser/CMakeLists.txt
index dbb02aa785..f703909a6e 100644
--- a/Userland/Applications/Browser/CMakeLists.txt
+++ b/Userland/Applications/Browser/CMakeLists.txt
@@ -33,5 +33,5 @@ set(SOURCES
)
serenity_app(Browser ICON app-browser)
-target_link_libraries(Browser LibWeb LibProtocol LibGUI LibDesktop LibConfig LibMain)
+target_link_libraries(Browser LibWebView LibWeb LibProtocol LibGUI LibDesktop LibConfig LibMain)
link_with_unicode_data(Browser)
diff --git a/Userland/Applications/Browser/ConsoleWidget.cpp b/Userland/Applications/Browser/ConsoleWidget.cpp
index 75f6b8e1fc..3603e856bb 100644
--- a/Userland/Applications/Browser/ConsoleWidget.cpp
+++ b/Userland/Applications/Browser/ConsoleWidget.cpp
@@ -24,7 +24,7 @@ ConsoleWidget::ConsoleWidget()
set_layout<GUI::VerticalBoxLayout>();
set_fill_with_background_color(true);
- m_output_view = add<Web::OutOfProcessWebView>();
+ m_output_view = add<WebView::OutOfProcessWebView>();
m_output_view->load("data:text/html,<html></html>");
// Wait until our output WebView is loaded, and then request any messages that occurred before we existed
m_output_view->on_load_finish = [this](auto&) {
diff --git a/Userland/Applications/Browser/ConsoleWidget.h b/Userland/Applications/Browser/ConsoleWidget.h
index aaa7a5d5c0..06930ccb50 100644
--- a/Userland/Applications/Browser/ConsoleWidget.h
+++ b/Userland/Applications/Browser/ConsoleWidget.h
@@ -11,7 +11,7 @@
#include "History.h"
#include <LibGUI/Widget.h>
-#include <LibWeb/OutOfProcessWebView.h>
+#include <LibWebView/OutOfProcessWebView.h>
namespace Browser {
@@ -38,7 +38,7 @@ private:
void end_group();
RefPtr<GUI::TextBox> m_input;
- RefPtr<Web::OutOfProcessWebView> m_output_view;
+ RefPtr<WebView::OutOfProcessWebView> m_output_view;
i32 m_highest_notified_message_index { -1 };
i32 m_highest_received_message_index { -1 };
diff --git a/Userland/Applications/Browser/InspectorWidget.cpp b/Userland/Applications/Browser/InspectorWidget.cpp
index 7b04ca5691..90b95205c2 100644
--- a/Userland/Applications/Browser/InspectorWidget.cpp
+++ b/Userland/Applications/Browser/InspectorWidget.cpp
@@ -16,8 +16,8 @@
#include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/Element.h>
#include <LibWeb/DOMTreeModel.h>
-#include <LibWeb/OutOfProcessWebView.h>
#include <LibWeb/StylePropertiesModel.h>
+#include <LibWebView/OutOfProcessWebView.h>
namespace Browser {
diff --git a/Userland/Applications/Browser/InspectorWidget.h b/Userland/Applications/Browser/InspectorWidget.h
index 348688714e..4ea84703b7 100644
--- a/Userland/Applications/Browser/InspectorWidget.h
+++ b/Userland/Applications/Browser/InspectorWidget.h
@@ -13,6 +13,7 @@
#include <LibWeb/CSS/Selector.h>
#include <LibWeb/Forward.h>
#include <LibWeb/Layout/BoxModelMetrics.h>
+#include <LibWebView/Forward.h>
namespace Browser {
@@ -38,7 +39,7 @@ public:
virtual ~InspectorWidget() = default;
- void set_web_view(NonnullRefPtr<Web::OutOfProcessWebView> web_view) { m_web_view = web_view; }
+ void set_web_view(NonnullRefPtr<WebView::OutOfProcessWebView> web_view) { m_web_view = web_view; }
void set_dom_json(String);
void clear_dom_json();
void set_dom_node_properties_json(Selection, String specified_values_json, String computed_values_json, String custom_properties_json, String node_box_sizing_json);
@@ -54,7 +55,7 @@ private:
void update_node_box_model(Optional<String> node_box_sizing_json);
void clear_style_json();
- RefPtr<Web::OutOfProcessWebView> m_web_view;
+ RefPtr<WebView::OutOfProcessWebView> m_web_view;
RefPtr<GUI::TreeView> m_dom_tree_view;
RefPtr<GUI::TableView> m_computed_style_table_view;
diff --git a/Userland/Applications/Browser/Tab.cpp b/Userland/Applications/Browser/Tab.cpp
index 2721bdf775..07355893f4 100644
--- a/Userland/Applications/Browser/Tab.cpp
+++ b/Userland/Applications/Browser/Tab.cpp
@@ -36,7 +36,7 @@
#include <LibWeb/Layout/BlockContainer.h>
#include <LibWeb/Layout/InitialContainingBlock.h>
#include <LibWeb/Loader/ResourceLoader.h>
-#include <LibWeb/OutOfProcessWebView.h>
+#include <LibWebView/OutOfProcessWebView.h>
namespace Browser {
@@ -112,7 +112,7 @@ Tab::Tab(BrowserWindow& window)
auto& webview_container = *find_descendant_of_type_named<GUI::Widget>("webview_container");
- m_web_content_view = webview_container.add<Web::OutOfProcessWebView>();
+ m_web_content_view = webview_container.add<WebView::OutOfProcessWebView>();
if (g_content_filters_enabled)
m_web_content_view->set_content_filters(g_content_filters);
else
diff --git a/Userland/Applications/Browser/Tab.h b/Userland/Applications/Browser/Tab.h
index c444f59274..3a93437b33 100644
--- a/Userland/Applications/Browser/Tab.h
+++ b/Userland/Applications/Browser/Tab.h
@@ -16,7 +16,7 @@
#include <LibHTTP/Job.h>
#include <LibWeb/Forward.h>
-namespace Web {
+namespace WebView {
class OutOfProcessWebView;
}
@@ -79,7 +79,7 @@ public:
String const& title() const { return m_title; }
Gfx::Bitmap const* icon() const { return m_icon; }
- Web::OutOfProcessWebView& view() { return *m_web_content_view; }
+ WebView::OutOfProcessWebView& view() { return *m_web_content_view; }
private:
explicit Tab(BrowserWindow&);
@@ -103,7 +103,7 @@ private:
History m_history;
- RefPtr<Web::OutOfProcessWebView> m_web_content_view;
+ RefPtr<WebView::OutOfProcessWebView> m_web_content_view;
RefPtr<GUI::UrlBox> m_location_box;
RefPtr<GUI::Button> m_bookmark_button;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 20:29:07 +0000