LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-21 02:08:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Make module maps GC-allocated

Browse Source 
This allows them to mark JS modules, and fixes a crash seen on
https://shopify.com/
This commit is contained in:
Andreas Kling 2023-05-04 09:49:56 +02:00
parent 853ecb8d8e
commit 3811be2f7c
Notes: sideshowbarker 2024-07-17 18:23:22 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/3811be2f7c
Pull-request: https://github.com/SerenityOS/serenity/pull/18634
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Userland/Libraries/LibWeb/HTML/Scripting/Environments.cpp
View File

@ -33,10 +33,18 @@ EnvironmentSettingsObject::~EnvironmentSettingsObject()
responsible_event_loop().unregister_environment_settings_object({}, *this);
}
JS::ThrowCompletionOr<void> EnvironmentSettingsObject::initialize(JS::Realm& realm)
{
MUST_OR_THROW_OOM(Base::initialize(realm));
m_module_map = realm.heap().allocate_without_realm<ModuleMap>();
return {};
}
void EnvironmentSettingsObject::visit_edges(Cell::Visitor& visitor)
{
Base::visit_edges(visitor);
visitor.visit(target_browsing_context);
visitor.visit(m_module_map);
visitor.ignore(m_outstanding_rejected_promises_weak_set);
}
@ -48,7 +56,7 @@ JS::ExecutionContext& EnvironmentSettingsObject::realm_execution_context()
ModuleMap& EnvironmentSettingsObject::module_map()
{
return m_module_map;
return *m_module_map;
}
// https://html.spec.whatwg.org/multipage/webappapis.html#environment-settings-object%27s-realm

3
Userland/Libraries/LibWeb/HTML/Scripting/Environments.h
View File

@ -60,6 +60,7 @@ struct EnvironmentSettingsObject
JS_CELL(EnvironmentSettingsObject, JS::Cell);
virtual ~EnvironmentSettingsObject() override;
virtual JS::ThrowCompletionOr<void> initialize(JS::Realm&) override;
// https://html.spec.whatwg.org/multipage/webappapis.html#concept-environment-target-browsing-context
JS::ExecutionContext& realm_execution_context();
@ -124,7 +125,7 @@ protected:
private:
NonnullOwnPtr<JS::ExecutionContext> m_realm_execution_context;
ModuleMap m_module_map;
JS::GCPtr<ModuleMap> m_module_map;
EventLoop* m_responsible_event_loop { nullptr };

8
Userland/Libraries/LibWeb/HTML/Scripting/ModuleMap.cpp
View File

@ -8,6 +8,14 @@
namespace Web::HTML {
void ModuleMap::visit_edges(Visitor& visitor)
{
Base::visit_edges(visitor);
for (auto& it : m_values) {
visitor.visit(it.value.module_script);
}
}
bool ModuleMap::is_fetching(AK::URL const& url, DeprecatedString const& type) const
{
return is(url, type, EntryType::Fetching);

7
Userland/Libraries/LibWeb/HTML/Scripting/ModuleMap.h
View File

@ -7,6 +7,7 @@
#pragma once
#include <AK/URL.h>
#include <LibJS/Heap/Cell.h>
#include <LibWeb/HTML/Scripting/ModuleScript.h>
namespace Web::HTML {
@ -33,8 +34,8 @@ private:
};
// https://html.spec.whatwg.org/multipage/webappapis.html#module-map
class ModuleMap {
AK_MAKE_NONCOPYABLE(ModuleMap);
class ModuleMap final : public JS::Cell {
JS_CELL(ModuleMap, Cell);
public:
ModuleMap() = default;
@ -63,6 +64,8 @@ public:
void wait_for_change(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<Function<void(Entry)>>> m_callbacks;
};