diff options
author | Andreas Kling <kling@serenityos.org> | 2020-08-17 15:58:29 +0200 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2020-08-17 18:05:35 +0200 |
commit | 56c3748dcc8d6faf3815bbde29df741cb7b8ffc7 (patch) | |
tree | f1033cd0ad428d92cf9b7573cbc1bdd044436278 | |
parent | ba856c7ebe1507773cabc2d4ec90bdd904ca1e59 (diff) | |
download | serenity-56c3748dcc8d6faf3815bbde29df741cb7b8ffc7.zip |
LibWeb: Rename PageView => InProcessWebView
31 files changed, 88 insertions, 88 deletions
diff --git a/Applications/Browser/BrowserConsoleClient.h b/Applications/Browser/BrowserConsoleClient.h index dd419009fb..e87f6e32b0 100644 --- a/Applications/Browser/BrowserConsoleClient.h +++ b/Applications/Browser/BrowserConsoleClient.h @@ -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 { diff --git a/Applications/Browser/ConsoleWidget.cpp b/Applications/Browser/ConsoleWidget.cpp index 23e43be4c0..803efa6b54 100644 --- a/Applications/Browser/ConsoleWidget.cpp +++ b/Applications/Browser/ConsoleWidget.cpp @@ -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>(); diff --git a/Applications/Browser/ConsoleWidget.h b/Applications/Browser/ConsoleWidget.h index afc6178ffc..dc52ce57d7 100644 --- a/Applications/Browser/ConsoleWidget.h +++ b/Applications/Browser/ConsoleWidget.h @@ -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 { @@ -51,7 +51,7 @@ private: 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; diff --git a/Applications/Browser/Tab.cpp b/Applications/Browser/Tab.cpp index 4c415325d9..f313e58d5b 100644 --- a/Applications/Browser/Tab.cpp +++ b/Applications/Browser/Tab.cpp @@ -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 { @@ -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>(); diff --git a/Applications/Browser/Tab.h b/Applications/Browser/Tab.h index d4adae00cd..b689a7756d 100644 --- a/Applications/Browser/Tab.h +++ b/Applications/Browser/Tab.h @@ -87,7 +87,7 @@ private: 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; diff --git a/Applications/Help/main.cpp b/Applications/Help/main.cpp index 40a4f1244c..97aad02f30 100644 --- a/Applications/Help/main.cpp +++ b/Applications/Help/main.cpp @@ -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> @@ -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; diff --git a/Applications/IRCClient/IRCWindow.cpp b/Applications/IRCClient/IRCWindow.cpp index 4272dbbb71..60e2ab839e 100644 --- a/Applications/IRCClient/IRCWindow.cpp +++ b/Applications/IRCClient/IRCWindow.cpp @@ -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) @@ -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>(); diff --git a/Applications/IRCClient/IRCWindow.h b/Applications/IRCClient/IRCWindow.h index bd60df54a3..6cb00235f8 100644 --- a/Applications/IRCClient/IRCWindow.h +++ b/Applications/IRCClient/IRCWindow.h @@ -74,7 +74,7 @@ private: 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; diff --git a/Applications/TextEditor/TextEditorWidget.cpp b/Applications/TextEditor/TextEditorWidget.cpp index 6745f270a9..a69a8797c9 100644 --- a/Applications/TextEditor/TextEditorWidget.cpp +++ b/Applications/TextEditor/TextEditorWidget.cpp @@ -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() @@ -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()) diff --git a/Applications/TextEditor/TextEditorWidget.h b/Applications/TextEditor/TextEditorWidget.h index 856ca15e11..54be8fcff1 100644 --- a/Applications/TextEditor/TextEditorWidget.h +++ b/Applications/TextEditor/TextEditorWidget.h @@ -104,7 +104,7 @@ private: 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; diff --git a/DevTools/HackStudio/Editor.cpp b/DevTools/HackStudio/Editor.cpp index 2406738064..1374bd35e3 100644 --- a/DevTools/HackStudio/Editor.cpp +++ b/DevTools/HackStudio/Editor.cpp @@ -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 @@ -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() diff --git a/DevTools/HackStudio/Editor.h b/DevTools/HackStudio/Editor.h index dc7813e7a5..e5f1cf335d 100644 --- a/DevTools/HackStudio/Editor.h +++ b/DevTools/HackStudio/Editor.h @@ -81,7 +81,7 @@ private: 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 }; diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt index 4ceb3a1b84..b1e8baf9d0 100644 --- a/Libraries/LibWeb/CMakeLists.txt +++ b/Libraries/LibWeb/CMakeLists.txt @@ -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 @@ -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 diff --git a/Libraries/LibWeb/CSS/StyleValue.cpp b/Libraries/LibWeb/CSS/StyleValue.cpp index fe23dbd636..952bb8b68e 100644 --- a/Libraries/LibWeb/CSS/StyleValue.cpp +++ b/Libraries/LibWeb/CSS/StyleValue.cpp @@ -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 { diff --git a/Libraries/LibWeb/DOM/Document.cpp b/Libraries/LibWeb/DOM/Document.cpp index 488bcde030..ebd6466456 100644 --- a/Libraries/LibWeb/DOM/Document.cpp +++ b/Libraries/LibWeb/DOM/Document.cpp @@ -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> diff --git a/Libraries/LibWeb/DOM/Window.cpp b/Libraries/LibWeb/DOM/Window.cpp index 4314432c09..0c09fe5bd7 100644 --- a/Libraries/LibWeb/DOM/Window.cpp +++ b/Libraries/LibWeb/DOM/Window.cpp @@ -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 { diff --git a/Libraries/LibWeb/Forward.h b/Libraries/LibWeb/Forward.h index 0474900063..ee53b36647 100644 --- a/Libraries/LibWeb/Forward.h +++ b/Libraries/LibWeb/Forward.h @@ -143,7 +143,7 @@ class LoadRequest; class Origin; class Page; class PageClient; -class PageView; +class InProcessWebView; class PaintContext; class Resource; class ResourceLoader; diff --git a/Libraries/LibWeb/HTML/HTMLFormElement.cpp b/Libraries/LibWeb/HTML/HTMLFormElement.cpp index 421339673e..22ebc7a546 100644 --- a/Libraries/LibWeb/HTML/HTMLFormElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLFormElement.cpp @@ -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 { diff --git a/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp b/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp index c32cab398b..7e3e7850db 100644 --- a/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLIFrameElement.cpp @@ -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 { diff --git a/Libraries/LibWeb/HTML/HTMLInputElement.cpp b/Libraries/LibWeb/HTML/HTMLInputElement.cpp index cdcb305292..82ca2e81a1 100644 --- a/Libraries/LibWeb/HTML/HTMLInputElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLInputElement.cpp @@ -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 { @@ -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; diff --git a/Libraries/LibWeb/PageView.cpp b/Libraries/LibWeb/InProcessWebView.cpp index 1f8877cb4d..4b9a9f87b0 100644 --- a/Libraries/LibWeb/PageView.cpp +++ b/Libraries/LibWeb/InProcessWebView.cpp @@ -50,7 +50,7 @@ #include <LibWeb/Loader/ResourceLoader.h> #include <LibWeb/Page/EventHandler.h> #include <LibWeb/Page/Frame.h> -#include <LibWeb/PageView.h> +#include <LibWeb/InProcessWebView.h> #include <LibWeb/Painting/PaintContext.h> #include <LibWeb/UIEvents/MouseEvent.h> #include <stdio.h> @@ -59,7 +59,7 @@ namespace Web { -PageView::PageView() +InProcessWebView::InProcessWebView() : m_page(make<Page>(*this)) { set_should_hide_unnecessary_scrollbars(true); @@ -74,11 +74,11 @@ PageView::PageView() }); } -PageView::~PageView() +InProcessWebView::~InProcessWebView() { } -void PageView::select_all() +void InProcessWebView::select_all() { auto* layout_root = this->layout_root(); if (!layout_root) @@ -113,25 +113,25 @@ void PageView::select_all() update(); } -String PageView::selected_text() const +String InProcessWebView::selected_text() const { // FIXME: Use focused frame return page().main_frame().selected_text(); } -void PageView::page_did_layout() +void InProcessWebView::page_did_layout() { ASSERT(layout_root()); set_content_size(layout_root()->size().to_type<int>()); } -void PageView::page_did_change_title(const String& title) +void InProcessWebView::page_did_change_title(const String& title) { if (on_title_change) on_title_change(title); } -void PageView::page_did_set_document_in_main_frame(DOM::Document* document) +void InProcessWebView::page_did_set_document_in_main_frame(DOM::Document* document) { if (on_set_document) on_set_document(document); @@ -140,81 +140,81 @@ void PageView::page_did_set_document_in_main_frame(DOM::Document* document) update(); } -void PageView::page_did_start_loading(const URL& url) +void InProcessWebView::page_did_start_loading(const URL& url) { if (on_load_start) on_load_start(url); } -void PageView::page_did_change_selection() +void InProcessWebView::page_did_change_selection() { update(); } -void PageView::page_did_request_cursor_change(GUI::StandardCursor cursor) +void InProcessWebView::page_did_request_cursor_change(GUI::StandardCursor cursor) { if (window()) window()->set_override_cursor(cursor); } -void PageView::page_did_request_context_menu(const Gfx::IntPoint& content_position) +void InProcessWebView::page_did_request_context_menu(const Gfx::IntPoint& content_position) { if (on_context_menu_request) on_context_menu_request(screen_relative_rect().location().translated(to_widget_position(content_position))); } -void PageView::page_did_request_link_context_menu(const Gfx::IntPoint& content_position, const URL& url, [[maybe_unused]] const String& target, [[maybe_unused]] unsigned modifiers) +void InProcessWebView::page_did_request_link_context_menu(const Gfx::IntPoint& content_position, const URL& url, [[maybe_unused]] const String& target, [[maybe_unused]] unsigned modifiers) { if (on_link_context_menu_request) on_link_context_menu_request(url, screen_relative_rect().location().translated(to_widget_position(content_position))); } -void PageView::page_did_click_link(const URL& url, const String& target, unsigned modifiers) +void InProcessWebView::page_did_click_link(const URL& url, const String& target, unsigned modifiers) { if (on_link_click) on_link_click(url, target, modifiers); } -void PageView::page_did_middle_click_link(const URL& url, const String& target, unsigned modifiers) +void InProcessWebView::page_did_middle_click_link(const URL& url, const String& target, unsigned modifiers) { if (on_link_middle_click) on_link_middle_click(url, target, modifiers); } -void PageView::page_did_enter_tooltip_area(const Gfx::IntPoint& content_position, const String& title) +void InProcessWebView::page_did_enter_tooltip_area(const Gfx::IntPoint& content_position, const String& title) { GUI::Application::the()->show_tooltip(title, screen_relative_rect().location().translated(to_widget_position(content_position)), nullptr); } -void PageView::page_did_leave_tooltip_area() +void InProcessWebView::page_did_leave_tooltip_area() { GUI::Application::the()->hide_tooltip(); } -void PageView::page_did_hover_link(const URL& url) +void InProcessWebView::page_did_hover_link(const URL& url) { if (on_link_hover) on_link_hover(url); } -void PageView::page_did_unhover_link() +void InProcessWebView::page_did_unhover_link() { if (on_link_hover) on_link_hover({}); } -void PageView::page_did_invalidate(const Gfx::IntRect&) +void InProcessWebView::page_did_invalidate(const Gfx::IntRect&) { update(); } -void PageView::page_did_change_favicon(const Gfx::Bitmap& bitmap) +void InProcessWebView::page_did_change_favicon(const Gfx::Bitmap& bitmap) { if (on_favicon_change) on_favicon_change(bitmap); } -void PageView::layout_and_sync_size() +void InProcessWebView::layout_and_sync_size() { if (!document()) return; @@ -242,13 +242,13 @@ void PageView::layout_and_sync_size() #endif } -void PageView::resize_event(GUI::ResizeEvent& event) +void InProcessWebView::resize_event(GUI::ResizeEvent& event) { GUI::ScrollableWidget::resize_event(event); layout_and_sync_size(); } -void PageView::paint_event(GUI::PaintEvent& event) +void InProcessWebView::paint_event(GUI::PaintEvent& event) { GUI::Frame::paint_event(event); @@ -277,25 +277,25 @@ void PageView::paint_event(GUI::PaintEvent& event) layout_root()->paint_all_phases(context); } -void PageView::mousemove_event(GUI::MouseEvent& event) +void InProcessWebView::mousemove_event(GUI::MouseEvent& event) { page().handle_mousemove(to_content_position(event.position()), event.buttons(), event.modifiers()); GUI::ScrollableWidget::mousemove_event(event); } -void PageView::mousedown_event(GUI::MouseEvent& event) +void InProcessWebView::mousedown_event(GUI::MouseEvent& event) { page().handle_mousedown(to_content_position(event.position()), event.button(), event.modifiers()); GUI::ScrollableWidget::mousedown_event(event); } -void PageView::mouseup_event(GUI::MouseEvent& event) +void InProcessWebView::mouseup_event(GUI::MouseEvent& event) { page().handle_mouseup(to_content_position(event.position()), event.button(), event.modifiers()); GUI::ScrollableWidget::mouseup_event(event); } -void PageView::keydown_event(GUI::KeyEvent& event) +void InProcessWebView::keydown_event(GUI::KeyEvent& event) { bool page_accepted_event = page().handle_keydown(event.key(), event.modifiers(), event.code_point()); @@ -337,26 +337,26 @@ void PageView::keydown_event(GUI::KeyEvent& event) event.accept(); } -URL PageView::url() const +URL InProcessWebView::url() const { if (!page().main_frame().document()) return {}; return page().main_frame().document()->url(); } -void PageView::reload() +void InProcessWebView::reload() { load(url()); } -void PageView::load_html(const StringView& html, const URL& url) +void InProcessWebView::load_html(const StringView& html, const URL& url) { HTML::HTMLDocumentParser parser(html, "utf-8"); parser.run(url); set_document(&parser.document()); } -bool PageView::load(const URL& url) +bool InProcessWebView::load(const URL& url) { if (window()) window()->set_override_cursor(GUI::StandardCursor::None); @@ -364,51 +364,51 @@ bool PageView::load(const URL& url) return page().main_frame().loader().load(url, FrameLoader::Type::Navigation); } -const LayoutDocument* PageView::layout_root() const +const LayoutDocument* InProcessWebView::layout_root() const { return document() ? document()->layout_node() : nullptr; } -LayoutDocument* PageView::layout_root() +LayoutDocument* InProcessWebView::layout_root() { if (!document()) return nullptr; return const_cast<LayoutDocument*>(document()->layout_node()); } -void PageView::page_did_request_scroll_into_view(const Gfx::IntRect& rect) +void InProcessWebView::page_did_request_scroll_into_view(const Gfx::IntRect& rect) { scroll_into_view(rect, true, true); window()->set_override_cursor(GUI::StandardCursor::None); } -void PageView::load_empty_document() +void InProcessWebView::load_empty_document() { page().main_frame().set_document(nullptr); } -DOM::Document* PageView::document() +DOM::Document* InProcessWebView::document() { return page().main_frame().document(); } -const DOM::Document* PageView::document() const +const DOM::Document* InProcessWebView::document() const { return page().main_frame().document(); } -void PageView::set_document(DOM::Document* document) +void InProcessWebView::set_document(DOM::Document* document) { page().main_frame().set_document(document); } -void PageView::did_scroll() +void InProcessWebView::did_scroll() { page().main_frame().set_viewport_rect(viewport_rect_in_content_coordinates()); page().main_frame().did_scroll({}); } -void PageView::drop_event(GUI::DropEvent& event) +void InProcessWebView::drop_event(GUI::DropEvent& event) { if (event.mime_data().has_urls()) { if (on_url_drop) { diff --git a/Libraries/LibWeb/PageView.h b/Libraries/LibWeb/InProcessWebView.h index e3747a7cc6..c8a78dd6b5 100644 --- a/Libraries/LibWeb/PageView.h +++ b/Libraries/LibWeb/InProcessWebView.h @@ -34,14 +34,14 @@ namespace Web { -class PageView final +class InProcessWebView final : public GUI::ScrollableWidget , public WebViewHooks , public PageClient { - C_OBJECT(PageView); + C_OBJECT(InProcessWebView); public: - virtual ~PageView() override; + virtual ~InProcessWebView() override; void load_html(const StringView&, const URL&); void load_empty_document(); @@ -70,7 +70,7 @@ public: void select_all(); private: - PageView(); + InProcessWebView(); Page& page() { return *m_page; } const Page& page() const { return *m_page; } diff --git a/Libraries/LibWeb/Layout/LayoutFrame.cpp b/Libraries/LibWeb/Layout/LayoutFrame.cpp index a7392dd6b4..e7a999f368 100644 --- a/Libraries/LibWeb/Layout/LayoutFrame.cpp +++ b/Libraries/LibWeb/Layout/LayoutFrame.cpp @@ -33,7 +33,7 @@ #include <LibWeb/Layout/LayoutDocument.h> #include <LibWeb/Layout/LayoutFrame.h> #include <LibWeb/Page/Frame.h> -#include <LibWeb/PageView.h> +#include <LibWeb/InProcessWebView.h> //#define DEBUG_HIGHLIGHT_FOCUSED_FRAME diff --git a/Libraries/LibWeb/Layout/LayoutWidget.cpp b/Libraries/LibWeb/Layout/LayoutWidget.cpp index f55828c748..b4a8d5def5 100644 --- a/Libraries/LibWeb/Layout/LayoutWidget.cpp +++ b/Libraries/LibWeb/Layout/LayoutWidget.cpp @@ -32,7 +32,7 @@ #include <LibWeb/DOM/Document.h> #include <LibWeb/Layout/LayoutWidget.h> #include <LibWeb/Page/Frame.h> -#include <LibWeb/PageView.h> +#include <LibWeb/InProcessWebView.h> namespace Web { @@ -60,7 +60,7 @@ void LayoutWidget::did_set_rect() void LayoutWidget::update_widget() { auto adjusted_widget_position = absolute_rect().location().to_type<int>(); - auto& page_view = static_cast<const PageView&>(frame().page().client()); + auto& page_view = static_cast<const InProcessWebView&>(frame().page().client()); adjusted_widget_position.move_by(-page_view.horizontal_scrollbar().value(), -page_view.vertical_scrollbar().value()); widget().move_to(adjusted_widget_position); } diff --git a/Libraries/LibWeb/Page/EventHandler.cpp b/Libraries/LibWeb/Page/EventHandler.cpp index 045f63ec86..38a8bfb8cb 100644 --- a/Libraries/LibWeb/Page/EventHandler.cpp +++ b/Libraries/LibWeb/Page/EventHandler.cpp @@ -34,7 +34,7 @@ #include <LibWeb/Layout/LayoutDocument.h> #include <LibWeb/Page/EventHandler.h> #include <LibWeb/Page/Frame.h> -#include <LibWeb/PageView.h> +#include <LibWeb/InProcessWebView.h> #include <LibWeb/UIEvents/MouseEvent.h> namespace Web { @@ -196,7 +196,7 @@ bool EventHandler::handle_mousemove(const Gfx::IntPoint& position, unsigned butt hovered_link_element = node->enclosing_link_element(); if (hovered_link_element) { #ifdef HTML_DEBUG - dbg() << "PageView: hovering over a link to " << hovered_link_element->href(); + dbg() << "InProcessWebView: hovering over a link to " << hovered_link_element->href(); #endif is_hovering_link = true; } diff --git a/Libraries/LibWeb/Page/Frame.cpp b/Libraries/LibWeb/Page/Frame.cpp index 9d4225bc43..826b5c510f 100644 --- a/Libraries/LibWeb/Page/Frame.cpp +++ b/Libraries/LibWeb/Page/Frame.cpp @@ -31,7 +31,7 @@ #include <LibWeb/Layout/LayoutText.h> #include <LibWeb/Layout/LayoutWidget.h> #include <LibWeb/Page/Frame.h> -#include <LibWeb/PageView.h> +#include <LibWeb/InProcessWebView.h> namespace Web { @@ -124,7 +124,7 @@ void Frame::set_needs_display(const Gfx::IntRect& rect) host_element()->layout_node()->set_needs_display(); } -void Frame::did_scroll(Badge<PageView>) +void Frame::did_scroll(Badge<InProcessWebView>) { if (!m_document) return; diff --git a/Libraries/LibWeb/Page/Frame.h b/Libraries/LibWeb/Page/Frame.h index 9f790e2bf2..bb0145d540 100644 --- a/Libraries/LibWeb/Page/Frame.h +++ b/Libraries/LibWeb/Page/Frame.h @@ -66,7 +66,7 @@ public: void set_viewport_rect(const Gfx::IntRect&); Gfx::IntRect viewport_rect() const { return m_viewport_rect; } - void did_scroll(Badge<PageView>); + void did_scroll(Badge<InProcessWebView>); FrameLoader& loader() { return m_loader; } const FrameLoader& loader() const { return m_loader; } diff --git a/Libraries/LibWeb/Page/Page.cpp b/Libraries/LibWeb/Page/Page.cpp index ed8f6d2d23..e986dd45ba 100644 --- a/Libraries/LibWeb/Page/Page.cpp +++ b/Libraries/LibWeb/Page/Page.cpp @@ -26,7 +26,7 @@ #include <LibWeb/Page/Frame.h> #include <LibWeb/Page/Page.h> -#include <LibWeb/PageView.h> +#include <LibWeb/InProcessWebView.h> namespace Web { diff --git a/Services/WebContent/Documentation.txt b/Services/WebContent/Documentation.txt index 0194923bed..9f21848001 100644 --- a/Services/WebContent/Documentation.txt +++ b/Services/WebContent/Documentation.txt @@ -19,7 +19,7 @@ WebContent::ClientConnection <---> WebContentClient Single process model: ===================== -Web::PageView (this is a GUI::Widget, and also a Web::PageClient) +Web::InProcessWebView (this is a GUI::Widget, and also a Web::PageClient) Web::Page Web::Frame Web::Document diff --git a/Userland/html.cpp b/Userland/html.cpp index 3f1418fbf8..34b5339102 100644 --- a/Userland/html.cpp +++ b/Userland/html.cpp @@ -32,7 +32,7 @@ #include <LibGUI/Menu.h> #include <LibGUI/MenuBar.h> #include <LibGUI/Window.h> -#include <LibWeb/PageView.h> +#include <LibWeb/InProcessWebView.h> #include <stdio.h> int main(int argc, char** argv) @@ -55,7 +55,7 @@ int main(int argc, char** argv) auto html = f->read_all(); auto window = GUI::Window::construct(); - auto& widget = window->set_main_widget<Web::PageView>(); + auto& widget = window->set_main_widget<Web::InProcessWebView>(); widget.load_html(html, URL()); if (!widget.document()->title().is_null()) window->set_title(String::format("%s - HTML", widget.document()->title().characters())); diff --git a/Userland/test-web.cpp b/Userland/test-web.cpp index e8082483ca..bdf011e625 100644 --- a/Userland/test-web.cpp +++ b/Userland/test-web.cpp @@ -44,7 +44,7 @@ #include <LibJS/Runtime/MarkedValueList.h> #include <LibWeb/HTML/Parser/HTMLDocumentParser.h> #include <LibWeb/Loader/ResourceLoader.h> -#include <LibWeb/PageView.h> +#include <LibWeb/InProcessWebView.h> #include <sys/time.h> #define TOP_LEVEL_TEST_NAME "__$$TOP_LEVEL$$__" @@ -136,7 +136,7 @@ JS_DEFINE_NATIVE_FUNCTION(TestRunnerObject::change_page) class TestRunner { public: - TestRunner(String web_test_root, String js_test_root, Web::PageView& page_view, bool print_times) + TestRunner(String web_test_root, String js_test_root, Web::InProcessWebView& page_view, bool print_times) : m_web_test_root(move(web_test_root)) , m_js_test_root(move(js_test_root)) , m_print_times(print_times) @@ -158,7 +158,7 @@ private: double m_total_elapsed_time_in_ms { 0 }; JSTestRunnerCounts m_counts; - RefPtr<Web::PageView> m_page_view; + RefPtr<Web::InProcessWebView> m_page_view; RefPtr<JS::Program> m_js_test_common; RefPtr<JS::Program> m_web_test_common; @@ -643,7 +643,7 @@ int main(int argc, char** argv) auto& main_widget = window->set_main_widget<GUI::Widget>(); main_widget.set_fill_with_background_color(true); main_widget.set_layout<GUI::VerticalBoxLayout>(); - auto& view = main_widget.add<Web::PageView>(); + auto& view = main_widget.add<Web::InProcessWebView>(); view.set_document(adopt(*new Web::DOM::Document)); |