RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 07:08:10 +00:00
Code Issues Activity Actions

LibWeb: Add Page abstraction between PageView and main Frame

Browse source 
* A PageView is a view onto a Page object.
* A Page always has a main Frame (root of Frame tree.)
* Page has a PageClient. PageView is a PageClient.

The goal here is to allow building another kind of view onto
a Page while keeping the rest of LibWeb intact.
This commit is contained in:
Andreas Kling 2020-06-08 20:31:49 +02:00
parent 5072d4e02d
commit 92392398a2
16 changed files with 351 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Libraries/LibWeb/Frame/Frame.cpp
View file

@ -33,18 +33,19 @@
namespace Web {
Frame::Frame(Element& host_element, Frame& main_frame)
: m_main_frame(main_frame)
: m_page(main_frame.page())
, m_main_frame(main_frame)
, m_loader(*this)
, m_event_handler({}, *this)
, m_host_element(host_element.make_weak_ptr())
{
}
Frame::Frame(PageView& page_view)
: m_main_frame(*this)
Frame::Frame(Page& page)
: m_page(page)
, m_main_frame(*this)
, m_loader(*this)
, m_event_handler({}, *this)
, m_page_view(page_view.make_weak_ptr())
{
}
@ -94,8 +95,7 @@ void Frame::set_needs_display(const Gfx::Rect& rect)
return;
if (is_main_frame()) {
if (page_view())
page_view()->notify_needs_display({}, *this, rect);
page().client().page_did_invalidate(to_main_frame_rect(rect));
return;
}
@ -117,12 +117,31 @@ void Frame::did_scroll(Badge<PageView>)
void Frame::scroll_to_anchor(const String& fragment)
{
// FIXME: We should be able to scroll iframes to an anchor, too!
if (!m_page_view)
return;
// FIXME: This logic is backwards, the work should be done in here,
// and then we just request that the "view" scrolls to a certain content offset.
m_page_view->scroll_to_anchor(fragment);
page().client().page_did_request_scroll_to_anchor(fragment);
}
Gfx::Rect Frame::to_main_frame_rect(const Gfx::Rect& a_rect)
{
auto rect = a_rect;
rect.set_location(to_main_frame_position(a_rect.location()));
return rect;
}
Gfx::Point Frame::to_main_frame_position(const Gfx::Point& a_position)
{
auto position = a_position;
for (auto* ancestor = parent(); ancestor; ancestor = ancestor->parent()) {
if (ancestor->is_main_frame())
break;
if (!ancestor->host_element())
return {};
if (!ancestor->host_element()->layout_node())
return {};
position.move_by(ancestor->host_element()->layout_node()->box_type_agnostic_position().to_int_point());
}
return position;
}
}