mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 03:27:34 +00:00
LibWeb: Rename Web::Frame to Web::BrowsingContext
Our "frame" concept very closely matches what the web specs call a "browsing context", so let's rename it to that. :^) The "main frame" becomes the "top-level browsing context", and "sub-frames" are now "nested browsing contexts".
This commit is contained in:
parent
8be98af77c
commit
4190fd2199
43 changed files with 241 additions and 241 deletions
|
@ -8,7 +8,7 @@
|
|||
#include <LibWeb/DOM/Event.h>
|
||||
#include <LibWeb/HTML/FrameHostElement.h>
|
||||
#include <LibWeb/Origin.h>
|
||||
#include <LibWeb/Page/Frame.h>
|
||||
#include <LibWeb/Page/BrowsingContext.h>
|
||||
|
||||
namespace Web::HTML {
|
||||
|
||||
|
@ -26,18 +26,18 @@ void FrameHostElement::inserted()
|
|||
HTMLElement::inserted();
|
||||
if (!is_connected())
|
||||
return;
|
||||
if (auto* frame = document().frame()) {
|
||||
m_content_frame = Frame::create_subframe(*this, frame->main_frame());
|
||||
m_content_frame->set_frame_nesting_levels(frame->frame_nesting_levels());
|
||||
m_content_frame->register_frame_nesting(document().url());
|
||||
if (auto* frame = document().browsing_context()) {
|
||||
m_nested_browsing_context = BrowsingContext::create_nested(*this, frame->top_level_browsing_context());
|
||||
m_nested_browsing_context->set_frame_nesting_levels(frame->frame_nesting_levels());
|
||||
m_nested_browsing_context->register_frame_nesting(document().url());
|
||||
}
|
||||
}
|
||||
|
||||
Origin FrameHostElement::content_origin() const
|
||||
{
|
||||
if (!m_content_frame || !m_content_frame->document())
|
||||
if (!m_nested_browsing_context || !m_nested_browsing_context->document())
|
||||
return {};
|
||||
return m_content_frame->document()->origin();
|
||||
return m_nested_browsing_context->document()->origin();
|
||||
}
|
||||
|
||||
bool FrameHostElement::may_access_from_origin(const Origin& origin) const
|
||||
|
@ -47,10 +47,10 @@ bool FrameHostElement::may_access_from_origin(const Origin& origin) const
|
|||
|
||||
const DOM::Document* FrameHostElement::content_document() const
|
||||
{
|
||||
return m_content_frame ? m_content_frame->document() : nullptr;
|
||||
return m_nested_browsing_context ? m_nested_browsing_context->document() : nullptr;
|
||||
}
|
||||
|
||||
void FrameHostElement::content_frame_did_load(Badge<FrameLoader>)
|
||||
void FrameHostElement::nested_browsing_context_did_load(Badge<FrameLoader>)
|
||||
{
|
||||
dispatch_event(DOM::Event::create(EventNames::load));
|
||||
}
|
||||
|
|
|
@ -15,20 +15,20 @@ public:
|
|||
FrameHostElement(DOM::Document&, QualifiedName);
|
||||
virtual ~FrameHostElement() override;
|
||||
|
||||
Frame* content_frame() { return m_content_frame; }
|
||||
const Frame* content_frame() const { return m_content_frame; }
|
||||
BrowsingContext* nested_browsing_context() { return m_nested_browsing_context; }
|
||||
const BrowsingContext* nested_browsing_context() const { return m_nested_browsing_context; }
|
||||
|
||||
const DOM::Document* content_document() const;
|
||||
|
||||
Origin content_origin() const;
|
||||
bool may_access_from_origin(const Origin&) const;
|
||||
|
||||
void content_frame_did_load(Badge<FrameLoader>);
|
||||
void nested_browsing_context_did_load(Badge<FrameLoader>);
|
||||
|
||||
virtual void inserted() override;
|
||||
|
||||
protected:
|
||||
RefPtr<Frame> m_content_frame;
|
||||
RefPtr<BrowsingContext> m_nested_browsing_context;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include <LibWeb/HTML/HTMLInputElement.h>
|
||||
#include <LibWeb/HTML/SubmitEvent.h>
|
||||
#include <LibWeb/InProcessWebView.h>
|
||||
#include <LibWeb/Page/Frame.h>
|
||||
#include <LibWeb/Page/BrowsingContext.h>
|
||||
#include <LibWeb/URLEncoder.h>
|
||||
|
||||
namespace Web::HTML {
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <LibWeb/HTML/HTMLIFrameElement.h>
|
||||
#include <LibWeb/Layout/FrameBox.h>
|
||||
#include <LibWeb/Origin.h>
|
||||
#include <LibWeb/Page/Frame.h>
|
||||
#include <LibWeb/Page/BrowsingContext.h>
|
||||
|
||||
namespace Web::HTML {
|
||||
|
||||
|
@ -43,7 +43,7 @@ void HTMLIFrameElement::inserted()
|
|||
|
||||
void HTMLIFrameElement::load_src(const String& value)
|
||||
{
|
||||
if (!m_content_frame)
|
||||
if (!m_nested_browsing_context)
|
||||
return;
|
||||
|
||||
if (value.is_null())
|
||||
|
@ -60,7 +60,7 @@ void HTMLIFrameElement::load_src(const String& value)
|
|||
}
|
||||
|
||||
dbgln("Loading iframe document from {}", value);
|
||||
m_content_frame->loader().load(url, FrameLoader::Type::IFrame);
|
||||
m_nested_browsing_context->loader().load(url, FrameLoader::Type::IFrame);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include <LibWeb/Layout/ButtonBox.h>
|
||||
#include <LibWeb/Layout/CheckBox.h>
|
||||
#include <LibWeb/Layout/RadioButton.h>
|
||||
#include <LibWeb/Page/Frame.h>
|
||||
#include <LibWeb/Page/BrowsingContext.h>
|
||||
|
||||
namespace Web::HTML {
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ void HTMLTitleElement::children_changed()
|
|||
{
|
||||
HTMLElement::children_changed();
|
||||
if (auto* page = document().page()) {
|
||||
if (document().frame() == &page->main_frame())
|
||||
if (document().browsing_context() == &page->top_level_browsing_context())
|
||||
page->client().page_did_change_title(document().title());
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue