Stowage/ladybird
2
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-12-07 21:59:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

LibWeb/HTML: Split out "abort a NavigateEvent" method

Browse source 
I missed where this change happened in the spec. The second half of
abort_the_ongoing_navigation() becomes a separate method, which is
slightly rearranged. I've placed this in Navigation instead of
NavigateEvent because of how many steps poke at the Navigation's
internals.

The text here includes the amendments I made in
https://github.com/whatwg/html/pull/11967 to correct a variable name.

A bonus is that we now actually populate the ErrorEvent instead of
leaving it blank.
This commit is contained in:
Sam Atkins 2025-11-27 14:48:48 +00:00 • committed by Andreas Kling
parent 218e646e72
commit c1e4024eca
Notes: github-actions[bot] 2025-11-30 10:48:10 +00:00
2 changed files with 39 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

61
Libraries/LibWeb/HTML/Navigation.cpp
View file

@ -14,6 +14,7 @@
#include <LibWeb/DOM/Document.h>
#include <LibWeb/HTML/DocumentState.h>
#include <LibWeb/HTML/ErrorEvent.h>
#include <LibWeb/HTML/ErrorInformation.h>
#include <LibWeb/HTML/History.h>
#include <LibWeb/HTML/NavigateEvent.h>
#include <LibWeb/HTML/Navigation.h>
@ -767,37 +768,51 @@ void Navigation::abort_the_ongoing_navigation(GC::Ptr<WebIDL::DOMException> erro
if (event->dispatched())
event->set_cancelled(true);
// 7. Signal abort on event's abort controller given error.
event->abort_controller()->abort(error);
// 7. Abort event given error.
abort_a_navigate_event(*event, *error);
}
// 8. Set navigation's ongoing navigate event to null.
// https://html.spec.whatwg.org/multipage/nav-history-apis.html#abort-a-navigateevent
void Navigation::abort_a_navigate_event(GC::Ref<NavigateEvent> event, GC::Ref<WebIDL::DOMException> reason)
{
// 1. Let navigation be event's relevant global object's navigation API.
// NB: Navigation is `this`.
// 2. Signal abort on event's abort controller given reason.
event->abort_controller()->abort(reason);
// 3. Let errorInfo be the result of extracting error information from reason.
auto error_info = extract_error_information(vm(), reason);
// 4. Set navigation's ongoing navigate event to null.
m_ongoing_navigate_event = nullptr;
// 9. Fire an event named navigateerror at navigation using ErrorEvent, with error initialized to error,
// and message, filename, lineno, and colno initialized to appropriate values that can be extracted
// from error and the current JavaScript stack in the same underspecified way that the report the exception algorithm does.
// 5. If navigation's ongoing API method tracker is non-null, then reject the finished promise for apiMethodTracker with reason.
if (m_ongoing_api_method_tracker)
WebIDL::reject_promise(realm(), m_ongoing_api_method_tracker->finished_promise, reason);
// 6. Fire an event named navigateerror at navigation using ErrorEvent, with additional attributes initialized
// according to errorInfo.
ErrorEventInit event_init = {};
event_init.error = error;
// FIXME: Extract information from the exception and the JS context in the wishy-washy way the spec says here.
event_init.filename = String {};
event_init.colno = 0;
event_init.lineno = 0;
event_init.message = String {};
event_init.filename = error_info.filename;
event_init.message = error_info.message;
event_init.lineno = error_info.lineno;
event_init.colno = error_info.colno;
event_init.error = error_info.error;
dispatch_event(ErrorEvent::create(realm, EventNames::navigateerror, event_init));
dispatch_event(ErrorEvent::create(realm(), EventNames::navigateerror, event_init));
// 10. If navigation's ongoing API method tracker is non-null, then reject the finished promise for apiMethodTracker with error.
if (m_ongoing_api_method_tracker != nullptr)
WebIDL::reject_promise(realm, m_ongoing_api_method_tracker->finished_promise, error);
// 7. If navigation's transition is null, then return.
if (!m_transition)
return;
// 11. If navigation's transition is not null, then:
if (m_transition != nullptr) {
// 1. Reject navigation's transition's finished promise with error.
WebIDL::reject_promise(realm, m_transition->finished(), error);
// FIXME: 8. Reject navigation's transition's committed promise with error.
// 2. Set navigation's transition to null.
m_transition = nullptr;
}
// 9. Reject navigation's transition's finished promise with reason.
WebIDL::reject_promise(realm(), m_transition->finished(), reason);
// 10. Set navigation's transition to null.
m_transition = nullptr;
}
// https://html.spec.whatwg.org/multipage/nav-history-apis.html#promote-an-upcoming-api-method-tracker-to-ongoing

1
Libraries/LibWeb/HTML/Navigation.h
View file

@ -110,6 +110,7 @@ public:
bool has_entries_and_events_disabled() const;
i64 get_the_navigation_api_entry_index(SessionHistoryEntry const&) const;
void abort_the_ongoing_navigation(GC::Ptr<WebIDL::DOMException> error = {});
void abort_a_navigate_event(GC::Ref<NavigateEvent>, GC::Ref<WebIDL::DOMException> reason);
bool fire_a_traverse_navigate_event(GC::Ref<SessionHistoryEntry> destination_she, UserNavigationInvolvement = UserNavigationInvolvement::None);
bool fire_a_push_replace_reload_navigate_event(
Bindings::NavigationType,