RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 22:57:35 +00:00
Code Issues Activity Actions

LibWeb: Make Frame point weakly to Page

Browse source 
This patch makes Page weakable and allows page-less frames to exist.

Page is single-owner, and Frame is multiple-owner, so it's not sound
for Frame to assume its containing Page will stick around for its own
entire lifetime.

Fixes #3976.
This commit is contained in:
Andreas Kling 2020-11-12 18:23:05 +01:00
parent e445ff670d
commit 81add73955
12 changed files with 87 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Libraries/LibWeb/DOM/Document.cpp
View file

@ -343,8 +343,10 @@ void Document::layout()
m_layout_root->layout();
m_layout_root->set_needs_display();
if (frame()->is_main_frame())
frame()->page().client().page_did_layout();
if (frame()->is_main_frame()) {
if (auto* page = this->page())
page->client().page_did_layout();
}
}
void Document::update_style()
@ -446,27 +448,27 @@ Color Document::link_color() const
{
if (m_link_color.has_value())
return m_link_color.value();
if (!frame())
if (!page())
return Color::Blue;
return frame()->page().palette().link();
return page()->palette().link();
}
Color Document::active_link_color() const
{
if (m_active_link_color.has_value())
return m_active_link_color.value();
if (!frame())
if (!page())
return Color::Red;
return frame()->page().palette().active_link();
return page()->palette().active_link();
}
Color Document::visited_link_color() const
{
if (m_visited_link_color.has_value())
return m_visited_link_color.value();
if (!frame())
if (!page())
return Color::Magenta;
return frame()->page().palette().visited_link();
return page()->palette().visited_link();
}
static JS::VM& main_thread_vm()
@ -596,4 +598,14 @@ void Document::set_ready_state(const String& ready_state)
dispatch_event(Event::create("readystatechange"));
}
Page* Document::page()
{
return m_frame ? m_frame->page() : nullptr;
}
const Page* Document::page() const
{
return m_frame ? m_frame->page() : nullptr;
}
}