OSSForks/ladybird
1
0
Fork 0
mirror of https://github.com/zebrajr/ladybird.git synced 2025-12-06 00:19:53 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

LibWeb: Restore check to prevent closing a traversable twice

Browse Source 
We removed this check as a workaround for a spec issue that was resolved
in:

https://github.com/whatwg/html/commit/3a8303ece44ed509928be626a6a65639fd
This commit is contained in:
Timothy Flynn 2024-10-09 06:36:15 -04:00 committed by Tim Flynn
parent be13a0ec3f
commit d80d951991
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Userland/Libraries/LibWeb/HTML/TraversableNavigable.cpp
View File

@ -1174,22 +1174,28 @@ TraversableNavigable::HistoryStepResult TraversableNavigable::apply_the_traverse
// https://html.spec.whatwg.org/multipage/document-sequences.html#close-a-top-level-traversable
void TraversableNavigable::close_top_level_traversable()
{
// 1. If traversable's is closing is true, then return.
if (is_closing())
return;
// 2. Definitely close traversable.
definitely_close_top_level_traversable();
}
// https://html.spec.whatwg.org/multipage/document-sequences.html#definitely-close-a-top-level-traversable
void TraversableNavigable::definitely_close_top_level_traversable()
{
VERIFY(is_top_level_traversable());
// 1. If traversable's is closing is true, then return.
// FIXME: Spec-issue: The only place in the spec that sets the `is closing` flag to true is `window.close`, and it
// does so immediately before invoking this method. So it does not make sense to return early here.
// https://github.com/whatwg/html/issues/10678
// 2. Let toUnload be traversable's active document's inclusive descendant navigables.
// 1. Let toUnload be traversable's active document's inclusive descendant navigables.
auto to_unload = active_document()->inclusive_descendant_navigables();
// If the result of checking if unloading is canceled for toUnload is true, then return.
// 2. If the result of checking if unloading is canceled for toUnload is true, then return.
if (check_if_unloading_is_canceled(to_unload) != CheckIfUnloadingIsCanceledResult::Continue)
return;
// 4. Append the following session history traversal steps to traversable:
// 3. Append the following session history traversal steps to traversable:
append_session_history_traversal_steps(JS::create_heap_function(heap(), [this] {
// 1. Let afterAllUnloads be an algorithm step which destroys traversable.
auto after_all_unloads = JS::create_heap_function(heap(), [this] {

1
Userland/Libraries/LibWeb/HTML/TraversableNavigable.h
View File

@ -78,6 +78,7 @@ public:
void traverse_the_history_by_delta(int delta, Optional<DOM::Document&> source_document = {});
void close_top_level_traversable();
void definitely_close_top_level_traversable();
void destroy_top_level_traversable();
void append_session_history_traversal_steps(JS::NonnullGCPtr<JS::HeapFunction<void()>> steps)

4
Userland/Libraries/LibWeb/HTML/Window.cpp
View File

@ -826,9 +826,9 @@ void Window::close()
// 1. Set thisTraversable's is closing to true.
traversable->set_closing(true);
// 2. Queue a task on the DOM manipulation task source to close thisTraversable.
// 2. Queue a task on the DOM manipulation task source to definitely close thisTraversable.
HTML::queue_global_task(HTML::Task::Source::DOMManipulation, incumbent_global_object, JS::create_heap_function(heap(), [traversable] {
verify_cast<TraversableNavigable>(*traversable).close_top_level_traversable();
verify_cast<TraversableNavigable>(*traversable).definitely_close_top_level_traversable();
}));
}
}