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

LibWeb: Make History GC-allocated

Browse source
This commit is contained in:
Andreas Kling 2022-09-02 13:50:24 +02:00
parent abfb73f2e7
commit 16fbb91aa1
7 changed files with 40 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Userland/Libraries/LibWeb/HTML/History.cpp
View file

@ -4,18 +4,32 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibWeb/Bindings/HistoryPrototype.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/HTML/History.h>
namespace Web::HTML {
History::History(DOM::Document& document)
: m_associated_document(document)
JS::NonnullGCPtr<History> History::create(HTML::Window& window, DOM::Document& document)
{
return *window.heap().allocate<History>(window.realm(), window, document);
}
History::History(HTML::Window& window, DOM::Document& document)
: PlatformObject(window.realm())
, m_associated_document(document)
{
set_prototype(&window.ensure_web_prototype<Bindings::HistoryPrototype>("History"));
}
History::~History() = default;
void History::visit_edges(Cell::Visitor& visitor)
{
Base::visit_edges(visitor);
visitor.visit(m_associated_document.ptr());
}
// https://html.spec.whatwg.org/multipage/history.html#dom-history-pushstate
DOM::ExceptionOr<void> History::push_state(JS::Value data, String const&, String const& url)
{
@ -36,7 +50,7 @@ DOM::ExceptionOr<void> History::shared_history_push_replace_state(JS::Value, Str
// 1. Let document be history's associated Document. (NOTE: Not necessary)
// 2. If document is not fully active, then throw a "SecurityError" DOMException.
if (!m_associated_document.is_fully_active())
if (!m_associated_document->is_fully_active())
return DOM::SecurityError::create("Cannot perform pushState or replaceState on a document that isn't fully active.");
// 3. Optionally, return. (For example, the user agent might disallow calls to these methods that are invoked on a timer,

28
Userland/Libraries/LibWeb/HTML/History.h
View file

@ -1,31 +1,23 @@
/*
* Copyright (c) 2021, Luke Wilde <lukew@serenityos.org>
* Copyright (c) 2022, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/RefCounted.h>
#include <AK/Weakable.h>
#include <LibJS/Heap/Handle.h>
#include <LibWeb/Bindings/Wrappable.h>
#include <LibWeb/Bindings/PlatformObject.h>
#include <LibWeb/DOM/ExceptionOr.h>
#include <LibWeb/Forward.h>
namespace Web::HTML {
class History final
: public RefCounted<History>
, public Weakable<History>
, public Bindings::Wrappable {
public:
using WrapperType = Bindings::HistoryWrapper;
class History final : public Bindings::PlatformObject {
WEB_PLATFORM_OBJECT(History, Bindings::PlatformObject);
static NonnullRefPtr<History> create(DOM::Document& document)
{
return adopt_ref(*new History(document));
}
public:
static JS::NonnullGCPtr<History> create(HTML::Window&, DOM::Document&);
virtual ~History() override;
@ -33,7 +25,9 @@ public:
DOM::ExceptionOr<void> replace_state(JS::Value data, String const& unused, String const& url);
private:
explicit History(DOM::Document&);
explicit History(HTML::Window&, DOM::Document&);
virtual void visit_edges(Cell::Visitor&) override;
enum class IsPush {
No,
@ -41,7 +35,9 @@ private:
};
DOM::ExceptionOr<void> shared_history_push_replace_state(JS::Value data, String const& url, IsPush is_push);
DOM::Document& m_associated_document;
JS::NonnullGCPtr<DOM::Document> m_associated_document;
};
}
WRAPPER_HACK(History, Web::HTML)

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

@ -19,7 +19,6 @@
#include <LibWeb/Bindings/EventTargetConstructor.h>
#include <LibWeb/Bindings/EventTargetPrototype.h>
#include <LibWeb/Bindings/ExceptionOrUtils.h>
#include <LibWeb/Bindings/HistoryWrapper.h>
#include <LibWeb/Bindings/IDLAbstractOperations.h>
#include <LibWeb/Bindings/IdleDeadlineWrapper.h>
#include <LibWeb/Bindings/LocationObject.h>