mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 21:07:35 +00:00
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.
This commit is contained in:
parent
31c0022429
commit
dcbbbf5b4a
41 changed files with 97 additions and 73 deletions
|
@ -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 {
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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&) {
|
||||
|
|
|
@ -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 };
|
||||
|
|
|
@ -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 {
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue