eliott/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird synced 2026-04-27 10:07:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Make the static IndexedDB Databases rooted

Browse Source 
These should persist for the duration of the program, at least until we
have persistent storage to restore from if a database needs to be used
again.

This fixes a flake in indexeddb-queued-delete-after-open that turns
into a consistent failure (or an assertion failure in GC::Weak in
debug builds) when running the test with the -g flag.
This commit is contained in:
Zaggy1024
2026-03-06 01:30:22 -06:00
committed by Gregory Bertilson
parent 2ab80c9e47
commit aebc4e4a8e
Notes: github-actions[bot] 2026-03-21 05:01:36 +00:00 
Author: https://github.com/Zaggy1024
Commit: https://github.com/LadybirdBrowser/ladybird/commit/aebc4e4a8ec
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/8295
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Libraries/LibWeb/IndexedDB/Internal/Database.cpp
View File

@@ -12,7 +12,7 @@
namespace Web::IndexedDB {
using IDBDatabaseMapping = HashMap<StorageAPI::StorageKey, HashMap<String, GC::Weak<Database>>>;
using IDBDatabaseMapping = HashMap<StorageAPI::StorageKey, HashMap<String, GC::Root<Database>>>;
static IDBDatabaseMapping m_databases;
void Database::for_each_database(AK::Function<void(Database&)> const& visitor)
@@ -62,7 +62,7 @@ Vector<GC::Weak<Database>> Database::for_key(StorageAPI::StorageKey const& key)
{
Vector<GC::Weak<Database>> databases;
for (auto const& database_mapping : m_databases.get(key).value_or({})) {
databases.append(database_mapping.value);
databases.append(*database_mapping.value);
}
return databases;
@@ -85,20 +85,16 @@ RequestList& ConnectionQueueHandler::for_key_and_name(StorageAPI::StorageKey con
Optional<Database&> Database::for_key_and_name(StorageAPI::StorageKey const& key, String const& name)
{
auto database_mapping = m_databases.ensure(key, [] { return HashMap<String, GC::Weak<Database>>(); });
if (auto maybe_database = database_mapping.get(name); maybe_database.has_value()) {
if (auto database = maybe_database.value().ptr())
return *database;
database_mapping.remove(name);
m_databases.set(key, database_mapping);
}
auto database_mapping = m_databases.ensure(key, [] { return HashMap<String, GC::Root<Database>>(); });
if (auto maybe_database = database_mapping.get(name); maybe_database.has_value())
return *maybe_database.value();
return {};
}
ErrorOr<GC::Root<Database>> Database::create_for_key_and_name(JS::Realm& realm, StorageAPI::StorageKey const& key, String const& name)
ErrorOr<GC::Ref<Database>> Database::create_for_key_and_name(JS::Realm& realm, StorageAPI::StorageKey const& key, String const& name)
{
auto database_mapping = TRY(m_databases.try_ensure(key, [] {
return HashMap<String, GC::Weak<Database>>();
return HashMap<String, GC::Root<Database>>();
}));
auto value = Database::create(realm, name);