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

LibWeb/HTML: Make Window::m{location,navigator} lazily allocated

Browse source 
This now matches the other window-owned objects, which already do this:
m_crypto, m_performance, m_screen.
This commit is contained in:
Linus Groh 2023-03-11 17:40:54 +00:00
parent 22552382ff
commit 4da68384e6
4 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibWeb/DOM/Document.cpp
View file

@ -1673,7 +1673,7 @@ bool Document::is_active() const
}
// https://html.spec.whatwg.org/multipage/history.html#dom-document-location
HTML::Location* Document::location()
WebIDL::ExceptionOr<JS::GCPtr<HTML::Location>> Document::location()
{
// The Document object's location attribute's getter must return this Document object's relevant global object's Location object,
// if this Document object is fully active, and null otherwise.
@ -1681,7 +1681,7 @@ HTML::Location* Document::location()
if (!is_fully_active())
return nullptr;
return window().location();
return TRY(window().location());
}
// https://html.spec.whatwg.org/multipage/interaction.html#dom-document-hidden

2
Userland/Libraries/LibWeb/DOM/Document.h
View file

@ -343,7 +343,7 @@ public:
JS::NonnullGCPtr<HTML::History> history();
JS::NonnullGCPtr<HTML::History> history() const;
HTML::Location* location();
WebIDL::ExceptionOr<JS::GCPtr<HTML::Location>> location();
size_t number_of_things_delaying_the_load_event() { return m_number_of_things_delaying_the_load_event; }
void increment_number_of_things_delaying_the_load_event(Badge<DocumentLoadEventDelayer>);

26
Userland/Libraries/LibWeb/HTML/Window.cpp
View file

@ -858,9 +858,6 @@ WebIDL::ExceptionOr<void> Window::initialize_web_interfaces(Badge<WindowEnvironm
Object::set_prototype(&Bindings::ensure_web_prototype<Bindings::WindowPrototype>(realm, "Window"));
m_location = MUST_OR_THROW_OOM(heap().allocate<Location>(realm, realm));
m_navigator = MUST_OR_THROW_OOM(heap().allocate<Navigator>(realm, realm));
MUST_OR_THROW_OOM(Bindings::WindowGlobalMixin::initialize(realm, *this));
// FIXME: These should be native accessors, not properties
@ -959,10 +956,14 @@ void Window::set_name(String const& name)
}
// https://html.spec.whatwg.org/multipage/nav-history-apis.html#dom-location
JS::NonnullGCPtr<Location> Window::location() const
WebIDL::ExceptionOr<JS::NonnullGCPtr<Location>> Window::location()
{
auto& realm = this->realm();
// The Window object's location getter steps are to return this's Location object.
return *m_location;
if (!m_location)
m_location = MUST_OR_THROW_OOM(heap().allocate<Location>(realm, realm));
return JS::NonnullGCPtr { *m_location };
}
// https://html.spec.whatwg.org/multipage/nav-history-apis.html#dom-history
@ -1068,10 +1069,14 @@ WebIDL::ExceptionOr<JS::GCPtr<HTML::WindowProxy>> Window::open(Optional<String>
}
// https://html.spec.whatwg.org/multipage/system-state.html#dom-navigator
JS::NonnullGCPtr<Navigator> Window::navigator() const
WebIDL::ExceptionOr<JS::NonnullGCPtr<Navigator>> Window::navigator()
{
auto& realm = this->realm();
// The navigator and clientInformation getter steps are to return this's associated Navigator.
return *m_navigator;
if (!m_navigator)
m_navigator = MUST_OR_THROW_OOM(heap().allocate<Navigator>(realm, realm));
return JS::NonnullGCPtr { *m_navigator };
}
// https://html.spec.whatwg.org/multipage/timers-and-user-prompts.html#dom-alert
@ -1470,8 +1475,10 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<HighResolutionTime::Performance>> Window::p
// https://w3c.github.io/webcrypto/#dom-windoworworkerglobalscope-crypto
WebIDL::ExceptionOr<JS::NonnullGCPtr<Crypto::Crypto>> Window::crypto()
{
auto& realm = this->realm();
if (!m_crypto)
m_crypto = MUST_OR_THROW_OOM(heap().allocate<Crypto::Crypto>(realm(), realm()));
m_crypto = MUST_OR_THROW_OOM(heap().allocate<Crypto::Crypto>(realm, realm));
return JS::NonnullGCPtr { *m_crypto };
}
@ -1567,7 +1574,8 @@ size_t Window::document_tree_child_browsing_context_count() const
JS_DEFINE_NATIVE_FUNCTION(Window::location_setter)
{
auto* impl = TRY(impl_from(vm));
TRY(impl->m_location->set(JS::PropertyKey("href"), vm.argument(0), JS::Object::ShouldThrowExceptions::Yes));
auto location = TRY(Bindings::throw_dom_exception_if_needed(vm, [&] { return impl->location(); }));
TRY(location->set(JS::PropertyKey("href"), vm.argument(0), JS::Object::ShouldThrowExceptions::Yes));
return JS::js_undefined();
}

4
Userland/Libraries/LibWeb/HTML/Window.h
View file

@ -139,7 +139,7 @@ public:
JS::NonnullGCPtr<DOM::Document const> document() const;
String name() const;
void set_name(String const&);
JS::NonnullGCPtr<Location> location() const;
WebIDL::ExceptionOr<JS::NonnullGCPtr<Location>> location();
JS::NonnullGCPtr<History> history() const;
void focus();
@ -150,7 +150,7 @@ public:
JS::GCPtr<DOM::Element const> frame_element() const;
WebIDL::ExceptionOr<JS::GCPtr<HTML::WindowProxy>> open(Optional<String> const& url, Optional<String> const& target, Optional<String> const& features);
JS::NonnullGCPtr<Navigator> navigator() const;
WebIDL::ExceptionOr<JS::NonnullGCPtr<Navigator>> navigator();
void alert(String const& message = {});
bool confirm(Optional<String> const& message);