mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-12-07 21:59:54 +00:00
50a79c6af8
If multiple cross-document navigations are queued on SessionHistoryTraversalQueue, running the next entry before the current document load is finished may result in a deadlock. If the new document has a navigable element of its own, it will append steps to SHTQ and hang in nested spin_until. This change uses promises to ensure that the current document loads before the next entry is executed. Fixes timeouts in the imported tests. Co-authored-by: Sam Atkins <sam@ladybird.org>
68 lines
2.4 KiB
C++
68 lines
2.4 KiB
C++
/*
|
|
* Copyright (c) 2023, Aliaksandr Kalenik <kalenik.aliaksandr@gmail.com>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <AK/Vector.h>
|
|
#include <LibCore/Promise.h>
|
|
#include <LibCore/Timer.h>
|
|
#include <LibGC/CellAllocator.h>
|
|
#include <LibGC/Function.h>
|
|
#include <LibGC/Ptr.h>
|
|
#include <LibJS/Forward.h>
|
|
#include <LibJS/Heap/Cell.h>
|
|
#include <LibWeb/Export.h>
|
|
#include <LibWeb/Forward.h>
|
|
|
|
namespace Web::HTML {
|
|
|
|
struct SessionHistoryTraversalQueueEntry : public JS::Cell {
|
|
GC_CELL(SessionHistoryTraversalQueueEntry, JS::Cell);
|
|
GC_DECLARE_ALLOCATOR(SessionHistoryTraversalQueueEntry);
|
|
|
|
public:
|
|
static GC::Ref<SessionHistoryTraversalQueueEntry> create(JS::VM& vm, GC::Ref<GC::Function<NonnullRefPtr<Core::Promise<Empty>>()>> steps, GC::Ptr<HTML::Navigable> target_navigable);
|
|
|
|
GC::Ptr<HTML::Navigable> target_navigable() const { return m_target_navigable; }
|
|
NonnullRefPtr<Core::Promise<Empty>> execute_steps() const { return m_steps->function()(); }
|
|
|
|
private:
|
|
SessionHistoryTraversalQueueEntry(GC::Ref<GC::Function<NonnullRefPtr<Core::Promise<Empty>>()>> steps, GC::Ptr<HTML::Navigable> target_navigable)
|
|
: m_steps(steps)
|
|
, m_target_navigable(target_navigable)
|
|
{
|
|
}
|
|
|
|
virtual void visit_edges(Cell::Visitor&) override;
|
|
|
|
GC::Ref<GC::Function<NonnullRefPtr<Core::Promise<Empty>>()>> m_steps;
|
|
GC::Ptr<HTML::Navigable> m_target_navigable;
|
|
};
|
|
|
|
// https://html.spec.whatwg.org/multipage/document-sequences.html#tn-session-history-traversal-queue
|
|
class WEB_API SessionHistoryTraversalQueue : public JS::Cell {
|
|
GC_CELL(SessionHistoryTraversalQueue, JS::Cell);
|
|
GC_DECLARE_ALLOCATOR(SessionHistoryTraversalQueue);
|
|
|
|
public:
|
|
SessionHistoryTraversalQueue();
|
|
|
|
void append(GC::Ref<GC::Function<NonnullRefPtr<Core::Promise<Empty>>()>> steps);
|
|
void append_sync(GC::Ref<GC::Function<NonnullRefPtr<Core::Promise<Empty>>()>> steps, GC::Ptr<Navigable> target_navigable);
|
|
|
|
// https://html.spec.whatwg.org/multipage/browsing-the-web.html#sync-navigations-jump-queue
|
|
GC::Ptr<SessionHistoryTraversalQueueEntry> first_synchronous_navigation_steps_with_target_navigable_not_contained_in(HashTable<GC::Ref<Navigable>> const&);
|
|
|
|
private:
|
|
virtual void visit_edges(Cell::Visitor&) override;
|
|
|
|
Vector<GC::Ref<SessionHistoryTraversalQueueEntry>> m_queue;
|
|
RefPtr<Core::Timer> m_timer;
|
|
bool m_is_task_running { false };
|
|
WeakPtr<Core::Promise<Empty>> m_current_promise;
|
|
};
|
|
|
|
}
|