mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-04-27 14:58:46 +00:00
e28ac74e0b
We were doing this synchronously, which was unsafe in that caused us to re-enter the module map entry setting code while iterating over the map's entries. The fix is simply to do what the spec says and queue up a task. This way the processing gets deferred to a later time. To avoid stepping into this problem again, I've also added a reentrancy check in ModuleMap. This fixes a sporadic crash in HTML::ModuleMap::add() caught by ASAN. In particular, this was happening regularly on https://shopify.com/
91 lines
2.3 KiB
C++
91 lines
2.3 KiB
C++
/*
|
|
* Copyright (c) 2022-2023, networkException <networkexception@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <AK/URL.h>
|
|
#include <LibJS/Heap/Cell.h>
|
|
#include <LibJS/Heap/HeapFunction.h>
|
|
#include <LibWeb/HTML/Scripting/ModuleScript.h>
|
|
|
|
namespace Web::HTML {
|
|
|
|
class ModuleLocationTuple {
|
|
public:
|
|
ModuleLocationTuple(AK::URL url, DeprecatedString type)
|
|
: m_url(move(url))
|
|
, m_type(move(type))
|
|
{
|
|
}
|
|
|
|
AK::URL const& url() const { return m_url; }
|
|
DeprecatedString const& type() const { return m_type; }
|
|
|
|
bool operator==(ModuleLocationTuple const& other) const
|
|
{
|
|
return other.url() == m_url && other.type() == m_type;
|
|
}
|
|
|
|
private:
|
|
AK::URL m_url;
|
|
DeprecatedString m_type;
|
|
};
|
|
|
|
// https://html.spec.whatwg.org/multipage/webappapis.html#module-map
|
|
class ModuleMap final : public JS::Cell {
|
|
JS_CELL(ModuleMap, Cell);
|
|
JS_DECLARE_ALLOCATOR(ModuleMap);
|
|
|
|
public:
|
|
ModuleMap() = default;
|
|
~ModuleMap() = default;
|
|
|
|
enum class EntryType {
|
|
Fetching,
|
|
Failed,
|
|
ModuleScript
|
|
};
|
|
|
|
struct Entry {
|
|
EntryType type;
|
|
JS::GCPtr<JavaScriptModuleScript> module_script;
|
|
};
|
|
|
|
using CallbackFunction = JS::NonnullGCPtr<JS::HeapFunction<void(Entry)>>;
|
|
|
|
bool is_fetching(AK::URL const& url, DeprecatedString const& type) const;
|
|
bool is_failed(AK::URL const& url, DeprecatedString const& type) const;
|
|
|
|
bool is(AK::URL const& url, DeprecatedString const& type, EntryType) const;
|
|
|
|
Optional<Entry> get(AK::URL const& url, DeprecatedString const& type) const;
|
|
|
|
AK::HashSetResult set(AK::URL const& url, DeprecatedString const& type, Entry);
|
|
|
|
void wait_for_change(JS::Heap&, AK::URL const& url, DeprecatedString const& type, Function<void(Entry)> callback);
|
|
|
|
private:
|
|
virtual void visit_edges(JS::Cell::Visitor&) override;
|
|
|
|
HashMap<ModuleLocationTuple, Entry> m_values;
|
|
HashMap<ModuleLocationTuple, Vector<CallbackFunction>> m_callbacks;
|
|
|
|
bool m_firing_callbacks { false };
|
|
};
|
|
|
|
}
|
|
|
|
namespace AK {
|
|
|
|
template<>
|
|
struct Traits<Web::HTML::ModuleLocationTuple> : public DefaultTraits<Web::HTML::ModuleLocationTuple> {
|
|
static unsigned hash(Web::HTML::ModuleLocationTuple const& tuple)
|
|
{
|
|
return pair_int_hash(tuple.url().to_deprecated_string().hash(), tuple.type().hash());
|
|
}
|
|
};
|
|
|
|
}
|