Skip to content

Commit

Permalink
LibWeb: Rename PageView => InProcessWebView
Browse files Browse the repository at this point in the history
  • Loading branch information
awesomekling committed Aug 17, 2020
1 parent ba856c7 commit 56c3748
Show file tree
Hide file tree
Showing 31 changed files with 88 additions and 88 deletions.
2 changes: 1 addition & 1 deletion Applications/Browser/BrowserConsoleClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <LibGUI/Widget.h>
#include <LibJS/Console.h>
#include <LibJS/Forward.h>
#include <LibWeb/PageView.h>
#include <LibWeb/InProcessWebView.h>

namespace Browser {

Expand Down
2 changes: 1 addition & 1 deletion Applications/Browser/ConsoleWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ ConsoleWidget::ConsoleWidget()
html_element->append_child(body_element);
m_output_container = body_element;

m_output_view = add<Web::PageView>();
m_output_view = add<Web::InProcessWebView>();
m_output_view->set_document(base_document);

auto& bottom_container = add<GUI::Widget>();
Expand Down
4 changes: 2 additions & 2 deletions Applications/Browser/ConsoleWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "History.h"
#include <LibGUI/Widget.h>
#include <LibJS/Forward.h>
#include <LibWeb/PageView.h>
#include <LibWeb/InProcessWebView.h>

namespace Browser {

Expand All @@ -51,7 +51,7 @@ class ConsoleWidget final : public GUI::Widget {
virtual void focusin_event(GUI::FocusEvent&) override;

RefPtr<GUI::TextBox> m_input;
RefPtr<Web::PageView> m_output_view;
RefPtr<Web::InProcessWebView> m_output_view;
RefPtr<Web::DOM::Element> m_output_container;
WeakPtr<JS::Interpreter> m_interpreter;
OwnPtr<BrowserConsoleClient> m_console_client;
Expand Down
4 changes: 2 additions & 2 deletions Applications/Browser/Tab.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
#include <LibWeb/Layout/LayoutNode.h>
#include <LibWeb/Loader/ResourceLoader.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
#include <LibWeb/InProcessWebView.h>
#include <LibWeb/WebContentView.h>

namespace Browser {
Expand All @@ -83,7 +83,7 @@ Tab::Tab(Type type)
auto& toolbar = m_toolbar_container->add<GUI::ToolBar>();

if (m_type == Type::InProcessWebView)
m_page_view = widget.add<Web::PageView>();
m_page_view = widget.add<Web::InProcessWebView>();
else
m_web_content_view = widget.add<WebContentView>();

Expand Down
2 changes: 1 addition & 1 deletion Applications/Browser/Tab.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class Tab final : public GUI::Widget {

History m_history;

RefPtr<Web::PageView> m_page_view;
RefPtr<Web::InProcessWebView> m_page_view;
RefPtr<WebContentView> m_web_content_view;

RefPtr<GUI::Action> m_go_back_action;
Expand Down
4 changes: 2 additions & 2 deletions Applications/Help/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include <LibGUI/Window.h>
#include <LibMarkdown/Document.h>
#include <LibWeb/Layout/LayoutNode.h>
#include <LibWeb/PageView.h>
#include <LibWeb/InProcessWebView.h>
#include <libgen.h>
#include <stdio.h>
#include <string.h>
Expand Down Expand Up @@ -150,7 +150,7 @@ int main(int argc, char* argv[])
left_tab_bar.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
left_tab_bar.set_preferred_size(200, 500);

auto& page_view = splitter.add<Web::PageView>();
auto& page_view = splitter.add<Web::InProcessWebView>();

History history;

Expand Down
4 changes: 2 additions & 2 deletions Applications/IRCClient/IRCWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include <LibGUI/TextBox.h>
#include <LibGUI/TextEditor.h>
#include <LibGUI/Window.h>
#include <LibWeb/PageView.h>
#include <LibWeb/InProcessWebView.h>

IRCWindow::IRCWindow(IRCClient& client, void* owner, Type type, const String& name)
: m_client(client)
Expand All @@ -52,7 +52,7 @@ IRCWindow::IRCWindow(IRCClient& client, void* owner, Type type, const String& na
// Make a container for the log buffer view + (optional) member list.
auto& container = add<GUI::HorizontalSplitter>();

m_page_view = container.add<Web::PageView>();
m_page_view = container.add<Web::InProcessWebView>();

if (m_type == Channel) {
auto& member_view = container.add<GUI::TableView>();
Expand Down
2 changes: 1 addition & 1 deletion Applications/IRCClient/IRCWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class IRCWindow : public GUI::Widget {
void* m_owner { nullptr };
Type m_type;
String m_name;
RefPtr<Web::PageView> m_page_view;
RefPtr<Web::InProcessWebView> m_page_view;
RefPtr<GUI::TextBox> m_text_box;
RefPtr<IRCLogBuffer> m_log_buffer;
RefPtr<GUI::Menu> m_context_menu;
Expand Down
4 changes: 2 additions & 2 deletions Applications/TextEditor/TextEditorWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
#include <LibGUI/ToolBarContainer.h>
#include <LibGfx/Font.h>
#include <LibMarkdown/Document.h>
#include <LibWeb/PageView.h>
#include <LibWeb/InProcessWebView.h>
#include <string.h>

TextEditorWidget::TextEditorWidget()
Expand Down Expand Up @@ -92,7 +92,7 @@ TextEditorWidget::TextEditorWidget()
m_statusbar->set_text(builder.to_string());
};

m_page_view = splitter.add<Web::PageView>();
m_page_view = splitter.add<Web::InProcessWebView>();
m_page_view->set_visible(false);
m_page_view->on_link_hover = [this, update_statusbar_cursor_position = move(update_statusbar_cursor_position)](auto& url) {
if (url.is_valid())
Expand Down
2 changes: 1 addition & 1 deletion Applications/TextEditor/TextEditorWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class TextEditorWidget final : public GUI::Widget {
RefPtr<GUI::Action> m_js_highlight;
RefPtr<GUI::Action> m_ini_highlight;

RefPtr<Web::PageView> m_page_view;
RefPtr<Web::InProcessWebView> m_page_view;

GUI::ActionGroup font_actions;

Expand Down
4 changes: 2 additions & 2 deletions DevTools/HackStudio/Editor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include <LibWeb/DOM/ElementFactory.h>
#include <LibWeb/DOM/Text.h>
#include <LibWeb/HTML/HTMLHeadElement.h>
#include <LibWeb/PageView.h>
#include <LibWeb/InProcessWebView.h>

// #define EDITOR_DEBUG

Expand All @@ -51,7 +51,7 @@ Editor::Editor()
m_documentation_tooltip_window = GUI::Window::construct();
m_documentation_tooltip_window->set_rect(0, 0, 500, 400);
m_documentation_tooltip_window->set_window_type(GUI::WindowType::Tooltip);
m_documentation_page_view = m_documentation_tooltip_window->set_main_widget<Web::PageView>();
m_documentation_page_view = m_documentation_tooltip_window->set_main_widget<Web::InProcessWebView>();
}

Editor::~Editor()
Expand Down
2 changes: 1 addition & 1 deletion DevTools/HackStudio/Editor.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class Editor final : public GUI::TextEditor {
explicit Editor();

RefPtr<GUI::Window> m_documentation_tooltip_window;
RefPtr<Web::PageView> m_documentation_page_view;
RefPtr<Web::InProcessWebView> m_documentation_page_view;
String m_last_parsed_token;
GUI::TextPosition m_previous_text_position { 0, 0 };
bool m_hovering_editor { false };
Expand Down
2 changes: 1 addition & 1 deletion Libraries/LibWeb/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ set(SOURCES
HTML/Parser/HTMLTokenizer.cpp
HTML/Parser/ListOfActiveFormattingElements.cpp
HTML/Parser/StackOfOpenElements.cpp
InProcessWebView.cpp
Layout/BoxModelMetrics.cpp
Layout/LayoutBlock.cpp
Layout/LayoutBox.cpp
Expand Down Expand Up @@ -157,7 +158,6 @@ set(SOURCES
Page/EventHandler.cpp
Page/Frame.cpp
Page/Page.cpp
PageView.cpp
Painting/StackingContext.cpp
SVG/SVGElement.cpp
SVG/SVGGeometryElement.cpp
Expand Down
2 changes: 1 addition & 1 deletion Libraries/LibWeb/CSS/StyleValue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include <LibWeb/Loader/LoadRequest.h>
#include <LibWeb/Loader/ResourceLoader.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
#include <LibWeb/InProcessWebView.h>

namespace Web::CSS {

Expand Down
2 changes: 1 addition & 1 deletion Libraries/LibWeb/DOM/Document.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
#include <LibWeb/Layout/LayoutTreeBuilder.h>
#include <LibWeb/Origin.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
#include <LibWeb/InProcessWebView.h>
#include <LibWeb/SVG/TagNames.h>
#include <stdio.h>

Expand Down
2 changes: 1 addition & 1 deletion Libraries/LibWeb/DOM/Window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <LibWeb/DOM/Timer.h>
#include <LibWeb/DOM/Window.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
#include <LibWeb/InProcessWebView.h>

namespace Web::DOM {

Expand Down
2 changes: 1 addition & 1 deletion Libraries/LibWeb/Forward.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ class LoadRequest;
class Origin;
class Page;
class PageClient;
class PageView;
class InProcessWebView;
class PaintContext;
class Resource;
class ResourceLoader;
Expand Down
2 changes: 1 addition & 1 deletion Libraries/LibWeb/HTML/HTMLFormElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <LibWeb/HTML/HTMLFormElement.h>
#include <LibWeb/HTML/HTMLInputElement.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
#include <LibWeb/InProcessWebView.h>
#include <LibWeb/URLEncoder.h>

namespace Web::HTML {
Expand Down
2 changes: 1 addition & 1 deletion Libraries/LibWeb/HTML/HTMLIFrameElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <LibWeb/Layout/LayoutWidget.h>
#include <LibWeb/Loader/ResourceLoader.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
#include <LibWeb/InProcessWebView.h>

namespace Web::HTML {

Expand Down
4 changes: 2 additions & 2 deletions Libraries/LibWeb/HTML/HTMLInputElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <LibWeb/HTML/HTMLInputElement.h>
#include <LibWeb/Layout/LayoutWidget.h>
#include <LibWeb/Page/Frame.h>
#include <LibWeb/PageView.h>
#include <LibWeb/InProcessWebView.h>

namespace Web::HTML {

Expand All @@ -50,7 +50,7 @@ RefPtr<LayoutNode> HTMLInputElement::create_layout_node(const CSS::StyleProperti
{
ASSERT(document().frame());
auto& frame = *document().frame();
auto& page_view = const_cast<PageView&>(static_cast<const PageView&>(frame.page().client()));
auto& page_view = const_cast<InProcessWebView&>(static_cast<const InProcessWebView&>(frame.page().client()));

if (type() == "hidden")
return nullptr;
Expand Down
Loading

0 comments on commit 56c3748

Please sign in to comment.