mirror of
https://github.com/RGBCube/serenity
synced 2025-06-01 07:38:10 +00:00
LibWeb: Rename PageView => InProcessWebView
This commit is contained in:
parent
ba856c7ebe
commit
56c3748dcc
31 changed files with 88 additions and 88 deletions
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
||||
|
|
|
@ -143,7 +143,7 @@ class LoadRequest;
|
|||
class Origin;
|
||||
class Page;
|
||||
class PageClient;
|
||||
class PageView;
|
||||
class InProcessWebView;
|
||||
class PaintContext;
|
||||
class Resource;
|
||||
class ResourceLoader;
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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) {
|
|
@ -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; }
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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; }
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include <LibWeb/Page/Frame.h>
|
||||
#include <LibWeb/Page/Page.h>
|
||||
#include <LibWeb/PageView.h>
|
||||
#include <LibWeb/InProcessWebView.h>
|
||||
|
||||
namespace Web {
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue