RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 16:17:45 +00:00
Code Issues Activity Actions

LibWeb: Move OutOfProcessWebView into the Web namespace

Browse source
This commit is contained in:
AnotherTest 2020-08-24 15:33:18 +04:30 • committed by Andreas Kling
parent 09ccb46980
commit 682b2fdb75
9 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Applications/Browser/Tab.cpp
View file

@ -50,14 +50,14 @@
#include <LibWeb/DOM/Element.h>
#include <LibWeb/DOMTreeModel.h>
#include <LibWeb/Dump.h>
#include <LibWeb/InProcessWebView.h>
#include <LibWeb/Layout/LayoutBlock.h>
#include <LibWeb/Layout/LayoutDocument.h>
#include <LibWeb/Layout/LayoutInline.h>
#include <LibWeb/Layout/LayoutNode.h>
#include <LibWeb/Loader/ResourceLoader.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/InProcessWebView.h>
#include <LibWeb/OutOfProcessWebView.h>
#include <LibWeb/Page/Frame.h>
namespace Browser {
@ -85,7 +85,7 @@ Tab::Tab(Type type)
if (m_type == Type::InProcessWebView)
m_page_view = widget.add<Web::InProcessWebView>();
else
m_web_content_view = widget.add<OutOfProcessWebView>();
m_web_content_view = widget.add<Web::OutOfProcessWebView>();
m_go_back_action = GUI::CommonActions::make_go_back_action([this](auto&) { go_back(); }, this);
m_go_forward_action = GUI::CommonActions::make_go_forward_action([this](auto&) { go_forward(); }, this);

5
Applications/Browser/Tab.h
View file

@ -32,9 +32,8 @@
#include <LibHTTP/HttpJob.h>
#include <LibWeb/Forward.h>
class OutOfProcessWebView;
namespace Web {
class OutOfProcessWebView;
class WebViewHooks;
}
@ -88,7 +87,7 @@ private:
History m_history;
RefPtr<Web::InProcessWebView> m_page_view;
RefPtr<OutOfProcessWebView> m_web_content_view;
RefPtr<Web::OutOfProcessWebView> m_web_content_view;
RefPtr<GUI::Action> m_go_back_action;
RefPtr<GUI::Action> m_go_forward_action;

3
Applications/Spreadsheet/HelpWindow.cpp
View file

@ -95,8 +95,7 @@ HelpWindow::HelpWindow(GUI::Window* parent)
m_listview = &list_view;
list_view.set_model(HelpListModel::create());
// FIXME: This should be in the Web namespace!
m_webview = &splitter.add<OutOfProcessWebView>();
m_webview = &splitter.add<Web::OutOfProcessWebView>();
list_view.on_activation = [this](auto& index) {
if (!m_webview)

2
Applications/Spreadsheet/HelpWindow.h
View file

@ -55,7 +55,7 @@ private:
HelpWindow(GUI::Window* parent = nullptr);
JsonObject m_docs;
OutOfProcessWebView* m_webview { nullptr };
Web::OutOfProcessWebView* m_webview { nullptr };
GUI::ListView* m_listview { nullptr };
};