LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-10 13:00:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Exit navigation process if navigation id has changed

Browse Source 
Change of navigation id means that it has been aborted, and we should
return early.
This commit is contained in:
Aliaksandr Kalenik 2023-09-09 22:58:26 +02:00 committed by Andreas Kling
parent b7c93cae7f
commit 7ad2dd2693
Notes: sideshowbarker 2024-07-16 18:06:41 +09:00 
Author: https://github.com/kalenikaliaksandr
Commit: https://github.com/SerenityOS/serenity/commit/7ad2dd2693
Pull-request: https://github.com/SerenityOS/serenity/pull/21093
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Userland/Libraries/LibWeb/HTML/Navigable.cpp
View File

@ -1052,6 +1052,10 @@ WebIDL::ExceptionOr<void> Navigable::navigate(
// NOTE: This check is not in the spec but we should not continue navigation if navigable has been destroyed.
return;
}
if (this->ongoing_navigation() != navigation_id) {
// NOTE: This check is not in the spec but we should not continue navigation if ongoing navigation id has changed.
return;
}
finalize_a_cross_document_navigation(*this, to_history_handling_behavior(history_handling), history_entry);
});
}).release_value_but_fixme_should_propagate_errors();
@ -1113,7 +1117,12 @@ WebIDL::ExceptionOr<void> Navigable::navigate_to_a_fragment(AK::URL const& url,
auto traversable = traversable_navigable();
// 17. Append the following session history synchronous navigation steps involving navigable to traversable:
traversable->append_session_history_traversal_steps([this, traversable, history_entry, entry_to_replace] {
traversable->append_session_history_traversal_steps([this, traversable, history_entry, entry_to_replace, navigation_id] {
if (this->ongoing_navigation() != navigation_id) {
// NOTE: This check is not in the spec but we should not continue navigation if ongoing navigation id has changed.
return;
}
// 1. Finalize a same-document navigation given traversable, navigable, historyEntry, and entryToReplace.
finalize_a_same_document_navigation(*traversable, *this, history_entry, entry_to_replace);