RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 03:47:34 +00:00
Code Issues Activity Actions

LibWeb: Make "top-level browsing context" concept more spec-compliant

Browse source 
Any browsing context that doesn't have a parent browsing context is now
considered a top-level browsing context. This matches the HTML spec.

This means we no longer keep a pointer to the top-level context, since
we can simply walk the parent chain until we find the topmost ancestor.
This commit is contained in:
Andreas Kling 2021-09-10 01:51:09 +02:00
parent 4e5becf36e
commit 8fabaaa2a8
3 changed files with 16 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Libraries/LibWeb/HTML/BrowsingContextContainer.cpp
View file

@ -27,7 +27,8 @@ void BrowsingContextContainer::inserted()
if (!is_connected()) if (!is_connected())
return; return;
if (auto* frame = document().browsing_context()) { if (auto* frame = document().browsing_context()) {
m_nested_browsing_context = BrowsingContext::create_nested(*this, frame->top_level_browsing_context()); VERIFY(frame->page());
m_nested_browsing_context = BrowsingContext::create_nested(*frame->page(), *this);
m_nested_browsing_context->set_frame_nesting_levels(frame->frame_nesting_levels()); m_nested_browsing_context->set_frame_nesting_levels(frame->frame_nesting_levels());
m_nested_browsing_context->register_frame_nesting(document().url()); m_nested_browsing_context->register_frame_nesting(document().url());
} }

13
Userland/Libraries/LibWeb/Page/BrowsingContext.cpp
View file

@ -18,9 +18,8 @@
namespace Web { namespace Web {
BrowsingContext::BrowsingContext(Page& page, HTML::BrowsingContextContainer* container, BrowsingContext& top_level_browsing_context) BrowsingContext::BrowsingContext(Page& page, HTML::BrowsingContextContainer* container)
: m_page(page) : m_page(page)
, m_top_level_browsing_context(top_level_browsing_context)
, m_loader(*this) , m_loader(*this)
, m_event_handler({}, *this) , m_event_handler({}, *this)
, m_container(container) , m_container(container)
@ -35,16 +34,6 @@ BrowsingContext::BrowsingContext(Page& page, HTML::BrowsingContextContainer* con
}); });
} }
BrowsingContext::BrowsingContext(HTML::BrowsingContextContainer& container, BrowsingContext& top_level_browsing_context)
: BrowsingContext(*top_level_browsing_context.page(), &container, top_level_browsing_context)
{
}
BrowsingContext::BrowsingContext(Page& page)
: BrowsingContext(page, nullptr, *this)
{
}
BrowsingContext::~BrowsingContext() BrowsingContext::~BrowsingContext()
{ {
} }

25
Userland/Libraries/LibWeb/Page/BrowsingContext.h
View file

@ -24,8 +24,8 @@ namespace Web {
class BrowsingContext : public TreeNode<BrowsingContext> { class BrowsingContext : public TreeNode<BrowsingContext> {
public: public:
static NonnullRefPtr<BrowsingContext> create_nested(HTML::BrowsingContextContainer& container, BrowsingContext& top_level_browsing_context) { return adopt_ref(*new BrowsingContext(container, top_level_browsing_context)); } static NonnullRefPtr<BrowsingContext> create_nested(Page& page, HTML::BrowsingContextContainer& container) { return adopt_ref(*new BrowsingContext(page, &container)); }
static NonnullRefPtr<BrowsingContext> create(Page& page) { return adopt_ref(*new BrowsingContext(page)); } static NonnullRefPtr<BrowsingContext> create(Page& page) { return adopt_ref(*new BrowsingContext(page, nullptr)); }
~BrowsingContext(); ~BrowsingContext();
class ViewportClient { class ViewportClient {
@ -36,7 +36,7 @@ public:
void register_viewport_client(ViewportClient&); void register_viewport_client(ViewportClient&);
void unregister_viewport_client(ViewportClient&); void unregister_viewport_client(ViewportClient&);
bool is_top_level() const { return this == &top_level_browsing_context(); } bool is_top_level() const { return !container(); }
bool is_focused_context() const; bool is_focused_context() const;
DOM::Document const* active_document() const { return m_active_document; } DOM::Document const* active_document() const { return m_active_document; }
@ -64,8 +64,15 @@ public:
void scroll_to_anchor(String const&); void scroll_to_anchor(String const&);
BrowsingContext& top_level_browsing_context() { return *m_top_level_browsing_context; } BrowsingContext& top_level_browsing_context()
BrowsingContext const& top_level_browsing_context() const { return *m_top_level_browsing_context; } {
BrowsingContext* context = this;
while (context->parent())
context = context->parent();
return *context;
}
BrowsingContext const& top_level_browsing_context() const { return const_cast<BrowsingContext*>(this)->top_level_browsing_context(); }
HTML::BrowsingContextContainer* container() { return m_container; } HTML::BrowsingContextContainer* container() { return m_container; }
HTML::BrowsingContextContainer const* container() const { return m_container; } HTML::BrowsingContextContainer const* container() const { return m_container; }
@ -95,18 +102,12 @@ public:
DOM::Document const* container_document() const; DOM::Document const* container_document() const;
private: private:
explicit BrowsingContext(Page&, HTML::BrowsingContextContainer*, BrowsingContext& top_level_browsing_context); explicit BrowsingContext(Page&, HTML::BrowsingContextContainer*);
explicit BrowsingContext(HTML::BrowsingContextContainer&, BrowsingContext& top_level_browsing_context);
explicit BrowsingContext(Page&);
void reset_cursor_blink_cycle(); void reset_cursor_blink_cycle();
WeakPtr<Page> m_page; WeakPtr<Page> m_page;
// NOTE: We expect there to always be a top-level browsing context as long as we exist.
// The use of WeakPtr is for safety in case we get something wrong.
WeakPtr<BrowsingContext> m_top_level_browsing_context;
FrameLoader m_loader; FrameLoader m_loader;
EventHandler m_event_handler; EventHandler m_event_handler;