RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-15 03:54:58 +00:00
Code Issues Activity Actions

LibWeb: Use document from DocumentState in navigation

Browse source 
New navigables spec assumes that document pointer is located in
DocumentState instead of SessionHistoryEntry like it was in the
old navigation spec.
This commit is contained in:
Aliaksandr Kalenik 2023-01-01 18:25:01 +01:00 • committed by Andreas Kling
parent ee50d9b2b5
commit ce9af96f78
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,6 +14,7 @@
#include <LibWeb/HTML/BrowsingContext.h> #include <LibWeb/HTML/BrowsingContext.h>
#include <LibWeb/HTML/BrowsingContextGroup.h> #include <LibWeb/HTML/BrowsingContextGroup.h>
#include <LibWeb/HTML/CrossOrigin/CrossOriginOpenerPolicy.h> #include <LibWeb/HTML/CrossOrigin/CrossOriginOpenerPolicy.h>
#include <LibWeb/HTML/DocumentState.h>
#include <LibWeb/HTML/EventLoop/EventLoop.h> #include <LibWeb/HTML/EventLoop/EventLoop.h>
#include <LibWeb/HTML/HTMLAnchorElement.h> #include <LibWeb/HTML/HTMLAnchorElement.h>
#include <LibWeb/HTML/HTMLDocument.h> #include <LibWeb/HTML/HTMLDocument.h>
@ -241,7 +242,8 @@ JS::NonnullGCPtr<BrowsingContext> BrowsingContext::create_a_new_browsing_context
// 22. Append a new session history entry to browsingContext's session history whose URL is about:blank and document is document. // 22. Append a new session history entry to browsingContext's session history whose URL is about:blank and document is document.
auto new_entry = browsing_context->heap().allocate_without_realm<SessionHistoryEntry>(); auto new_entry = browsing_context->heap().allocate_without_realm<SessionHistoryEntry>();
new_entry->url = AK::URL("about:blank"); new_entry->url = AK::URL("about:blank");
new_entry->document = document.ptr(); new_entry->document_state = *browsing_context->heap().allocate_without_realm<DocumentState>();
new_entry->document_state->set_document(document.ptr());
new_entry->policy_container = {}; new_entry->policy_container = {};
new_entry->scroll_restoration_mode = {}; new_entry->scroll_restoration_mode = {};
new_entry->browsing_context_name = {}; new_entry->browsing_context_name = {};
@ -986,8 +988,8 @@ bool BrowsingContext::still_on_its_initial_about_blank_document() const
// if browsingContext's session history's size is 1 // if browsingContext's session history's size is 1
// and browsingContext's session history[0]'s document's is initial about:blank is true. // and browsingContext's session history[0]'s document's is initial about:blank is true.
return m_session_history.size() == 1 return m_session_history.size() == 1
&& m_session_history[0]->document && m_session_history[0]->document_state->document()
&& m_session_history[0]->document->is_initial_about_blank(); && m_session_history[0]->document_state->document()->is_initial_about_blank();
} }
DOM::Document const* BrowsingContext::active_document() const DOM::Document const* BrowsingContext::active_document() const
@ -1242,7 +1244,8 @@ WebIDL::ExceptionOr<void> BrowsingContext::navigate_to_a_fragment(AK::URL const&
// and scroll restoration mode is the current entry's scroll restoration mode. // and scroll restoration mode is the current entry's scroll restoration mode.
auto new_entry = heap().allocate_without_realm<SessionHistoryEntry>(); auto new_entry = heap().allocate_without_realm<SessionHistoryEntry>();
new_entry->url = url; new_entry->url = url;
new_entry->document = current_entry().document; new_entry->document_state = *heap().allocate_without_realm<DocumentState>();
new_entry->document_state->set_document(current_entry().document_state->document());
new_entry->policy_container = current_entry().policy_container; new_entry->policy_container = current_entry().policy_container;
new_entry->scroll_restoration_mode = current_entry().scroll_restoration_mode; new_entry->scroll_restoration_mode = current_entry().scroll_restoration_mode;
new_entry->browsing_context_name = {}; new_entry->browsing_context_name = {};
@ -1266,7 +1269,7 @@ WebIDL::ExceptionOr<void> BrowsingContext::traverse_the_history(size_t entry_ind
auto entry = m_session_history[entry_index]; auto entry = m_session_history[entry_index];
// 1. If entry's document is null, then: // 1. If entry's document is null, then:
if (!entry->document) { if (!entry->document_state->document()) {
// 1. Assert: historyHandling is "default". // 1. Assert: historyHandling is "default".
VERIFY(history_handling == HistoryHandlingBehavior::Default); VERIFY(history_handling == HistoryHandlingBehavior::Default);
@ -1292,14 +1295,14 @@ WebIDL::ExceptionOr<void> BrowsingContext::traverse_the_history(size_t entry_ind
// FIXME: 2. Save persisted state to the current entry. // FIXME: 2. Save persisted state to the current entry.
// 3. Let newDocument be entry's document. // 3. Let newDocument be entry's document.
JS::GCPtr<DOM::Document> new_document = entry->document.ptr(); JS::GCPtr<DOM::Document> new_document = entry->document_state->document().ptr();
// 4. Assert: newDocument's is initial about:blank is false, // 4. Assert: newDocument's is initial about:blank is false,
// i.e., we never traverse back to the initial about:blank Document because it always gets replaced when we navigate away from it. // i.e., we never traverse back to the initial about:blank Document because it always gets replaced when we navigate away from it.
VERIFY(!new_document->is_initial_about_blank()); VERIFY(!new_document->is_initial_about_blank());
// 5. If newDocument is different than the current entry's document, or historyHandling is "entry update" or "reload", then: // 5. If newDocument is different than the current entry's document, or historyHandling is "entry update" or "reload", then:
if (new_document.ptr() != current_entry().document.ptr() if (new_document.ptr() != current_entry().document_state->document().ptr()
|| history_handling == HistoryHandlingBehavior::EntryUpdate) { || history_handling == HistoryHandlingBehavior::EntryUpdate) {
// FIXME: 1. If newDocument's suspended timer handles is not empty: // FIXME: 1. If newDocument's suspended timer handles is not empty:
// FIXME: 1. Assert: newDocument's suspension time is not zero. // FIXME: 1. Assert: newDocument's suspension time is not zero.
@ -1317,7 +1320,7 @@ WebIDL::ExceptionOr<void> BrowsingContext::traverse_the_history(size_t entry_ind
}); });
// 3. If newDocument's origin is not same origin with the current entry's document's origin, then: // 3. If newDocument's origin is not same origin with the current entry's document's origin, then:
if (!new_document->origin().is_same_origin(current_entry().document->origin())) { if (!new_document->origin().is_same_origin(current_entry().document_state->document()->origin())) {
// FIXME: 1. Let entriesToUpdate be all entries in the session history whose document's origin is same origin as the active document // FIXME: 1. Let entriesToUpdate be all entries in the session history whose document's origin is same origin as the active document
// and that are contiguous with the current entry. // and that are contiguous with the current entry.
// FIXME: 2. For each entryToUpdate of entriesToUpdate, set entryToUpdate's browsing context name to the current browsing context name. // FIXME: 2. For each entryToUpdate of entriesToUpdate, set entryToUpdate's browsing context name to the current browsing context name.
@ -1370,7 +1373,7 @@ WebIDL::ExceptionOr<void> BrowsingContext::traverse_the_history(size_t entry_ind
// 8. If entry's URL's fragment is not identical to the current entry's URL's fragment, // 8. If entry's URL's fragment is not identical to the current entry's URL's fragment,
// and entry's document equals the current entry's document, // and entry's document equals the current entry's document,
if (entry->url.fragment() != current_entry().url.fragment() if (entry->url.fragment() != current_entry().url.fragment()
&& entry->document.ptr() == current_entry().document.ptr()) { && entry->document_state->document().ptr() == current_entry().document_state->document().ptr()) {
// then set hashChanged to true, set oldURL to the current entry's URL, and set newURL to entry's URL. // then set hashChanged to true, set oldURL to the current entry's URL, and set newURL to entry's URL.
hash_changed = true; hash_changed = true;
old_url = current_entry().url; old_url = current_entry().url;
@ -1487,11 +1490,11 @@ Vector<JS::Handle<DOM::Document>> BrowsingContext::document_family() const
{ {
HashTable<DOM::Document*> documents; HashTable<DOM::Document*> documents;
for (auto& entry : m_session_history) { for (auto& entry : m_session_history) {
if (!entry->document) if (!entry->document_state->document())
continue; continue;
if (documents.set(const_cast<DOM::Document*>(entry->document.ptr())) == AK::HashSetResult::ReplacedExistingEntry) if (documents.set(const_cast<DOM::Document*>(entry->document_state->document().ptr())) == AK::HashSetResult::ReplacedExistingEntry)
continue; continue;
for (auto& context : entry->document->list_of_descendant_browsing_contexts()) { for (auto& context : entry->document_state->document()->list_of_descendant_browsing_contexts()) {
for (auto& document : context->document_family()) { for (auto& document : context->document_family()) {
documents.set(document.ptr()); documents.set(document.ptr());
} }
@ -1547,8 +1550,8 @@ void BrowsingContext::discard()
// 1. Discard all Document objects for all the entries in browsingContext's session history. // 1. Discard all Document objects for all the entries in browsingContext's session history.
for (auto& entry : m_session_history) { for (auto& entry : m_session_history) {
if (entry->document) if (entry->document_state->document())
entry->document->discard(); entry->document_state->document()->discard();
} }
// AD-HOC: // AD-HOC:

5
Userland/Libraries/LibWeb/HTML/SessionHistoryEntry.h
View file

@ -43,13 +43,10 @@ struct SessionHistoryEntry final : public JS::Cell {
// step, a non-negative integer or "pending", initially "pending". // step, a non-negative integer or "pending", initially "pending".
Variant<int, Pending> step { Pending::Tag }; Variant<int, Pending> step { Pending::Tag };
// https://html.spec.whatwg.org/multipage/browsing-the-web.html#she-url
// URL, a URL // URL, a URL
AK::URL url; AK::URL url;
// document, a Document or null
// FIXME: this property is not present in the spec anymore and should be gone after introducing navigables
JS::GCPtr<DOM::Document> document;
// https://html.spec.whatwg.org/multipage/browsing-the-web.html#she-document-state // https://html.spec.whatwg.org/multipage/browsing-the-web.html#she-document-state
JS::GCPtr<HTML::DocumentState> document_state; JS::GCPtr<HTML::DocumentState> document_state;