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

LibWeb: Make SessionHistoryEntry GC-allocated

Browse source 
These will need to float around more than they're currently able to.
Put them on the GC heap to prepare for that.

Co-authored-by: Aliaksandr Kalenik <kalenik.aliaksandr@gmail.com>
This commit is contained in:
Andreas Kling 2022-12-12 10:58:30 +01:00 • committed by Linus Groh
parent 32557be930
commit 3b0e5a87db
7 changed files with 60 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

56
Userland/Libraries/LibWeb/HTML/BrowsingContext.cpp
View file

@ -209,15 +209,15 @@ JS::NonnullGCPtr<BrowsingContext> BrowsingContext::create_a_new_browsing_context
// FIXME: 21. If creator is non-null, then set document's policy container to a clone of creator's policy container.
// 22. Append a new session history entry to browsingContext's session history whose URL is about:blank and document is document.
browsing_context->m_session_history.append(HTML::SessionHistoryEntry {
.url = AK::URL("about:blank"),
.document = document.ptr(),
.serialized_state = {},
.policy_container = {},
.scroll_restoration_mode = {},
.browsing_context_name = {},
.original_source_browsing_context = {},
});
auto new_entry = browsing_context->heap().allocate_without_realm<SessionHistoryEntry>();
new_entry->url = AK::URL("about:blank");
new_entry->document = document.ptr();
new_entry->serialized_state = {};
new_entry->policy_container = {};
new_entry->scroll_restoration_mode = {};
new_entry->browsing_context_name = {};
new_entry->original_source_browsing_context = {};
browsing_context->m_session_history.append(*new_entry);
// 23. Completely finish loading document.
document->completely_finish_loading();
@ -249,7 +249,7 @@ void BrowsingContext::visit_edges(Cell::Visitor& visitor)
Base::visit_edges(visitor);
for (auto& entry : m_session_history)
visitor.visit(entry.document);
visitor.visit(entry);
visitor.visit(m_container);
visitor.visit(m_window_proxy);
visitor.visit(m_opener_browsing_context);
@ -774,8 +774,8 @@ bool BrowsingContext::still_on_its_initial_about_blank_document() const
// if browsingContext's session history's size is 1
// and browsingContext's session history[0]'s document's is initial about:blank is true.
return m_session_history.size() == 1
&& m_session_history[0].document
&& m_session_history[0].document->is_initial_about_blank();
&& m_session_history[0]->document
&& m_session_history[0]->document->is_initial_about_blank();
}
DOM::Document const* BrowsingContext::active_document() const
@ -1009,15 +1009,15 @@ WebIDL::ExceptionOr<void> BrowsingContext::navigate_to_a_fragment(AK::URL const&
// document is the current entry's document,
// policy container is the current entry's policy-container
// and scroll restoration mode is the current entry's scroll restoration mode.
m_session_history.append(SessionHistoryEntry {
.url = url,
.document = current_entry().document,
.serialized_state = {},
.policy_container = current_entry().policy_container,
.scroll_restoration_mode = current_entry().scroll_restoration_mode,
.browsing_context_name = {},
.original_source_browsing_context = {},
});
auto new_entry = heap().allocate_without_realm<SessionHistoryEntry>();
new_entry->url = url;
new_entry->document = current_entry().document;
new_entry->serialized_state = {};
new_entry->policy_container = current_entry().policy_container;
new_entry->scroll_restoration_mode = current_entry().scroll_restoration_mode;
new_entry->browsing_context_name = {};
new_entry->original_source_browsing_context = {};
m_session_history.append(*new_entry);
// 4. Traverse the history to the new entry, with historyHandling set to historyHandling.
// This will scroll to the fragment given in what is now the document's URL.
@ -1033,7 +1033,7 @@ WebIDL::ExceptionOr<void> BrowsingContext::navigate_to_a_fragment(AK::URL const&
// https://html.spec.whatwg.org/multipage/browsing-the-web.html#traverse-the-history
WebIDL::ExceptionOr<void> BrowsingContext::traverse_the_history(size_t entry_index, HistoryHandlingBehavior history_handling, bool explicit_history_navigation)
{
auto* entry = &m_session_history[entry_index];
auto entry = m_session_history[entry_index];
// 1. If entry's document is null, then:
if (!entry->document) {
@ -1152,7 +1152,7 @@ WebIDL::ExceptionOr<void> BrowsingContext::traverse_the_history(size_t entry_ind
// FIXME: This is gnarly.
m_session_history.remove(entry_index - 1);
entry_index--;
entry = &m_session_history[entry_index];
entry = m_session_history[entry_index];
}
// 10. If entry's persisted user state is null, and its URL's fragment is non-null, then scroll to the fragment.
@ -1260,11 +1260,11 @@ Vector<JS::Handle<DOM::Document>> BrowsingContext::document_family() const
{
HashTable<DOM::Document*> documents;
for (auto& entry : m_session_history) {
if (!entry.document)
if (!entry->document)
continue;
if (documents.set(const_cast<DOM::Document*>(entry.document.ptr())) == AK::HashSetResult::ReplacedExistingEntry)
if (documents.set(const_cast<DOM::Document*>(entry->document.ptr())) == AK::HashSetResult::ReplacedExistingEntry)
continue;
for (auto& context : entry.document->list_of_descendant_browsing_contexts()) {
for (auto& context : entry->document->list_of_descendant_browsing_contexts()) {
for (auto& document : context->document_family()) {
documents.set(document.ptr());
}
@ -1320,8 +1320,8 @@ void BrowsingContext::discard()
// 1. Discard all Document objects for all the entries in browsingContext's session history.
for (auto& entry : m_session_history) {
if (entry.document)
entry.document->discard();
if (entry->document)
entry->document->discard();
}
// AD-HOC: