LibWeb: Restore Storage as a legacy platform object

This commit is contained in:
Luke Wilde 2023-02-28 00:06:10 +00:00 committed by Andreas Kling
parent 54f58e2662
commit 57d28c57f7
Notes: sideshowbarker 2024-07-17 01:53:23 +09:00
2 changed files with 46 additions and 6 deletions

View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2022, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2023, Luke Wilde <lukew@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -16,7 +17,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<Storage>> Storage::create(JS::Realm& realm)
}
Storage::Storage(JS::Realm& realm)
: PlatformObject(realm)
: Bindings::LegacyPlatformObject(realm)
{
}
@ -154,6 +155,28 @@ Vector<DeprecatedString> Storage::supported_property_names() const
return m_map.keys();
}
WebIDL::ExceptionOr<JS::Value> Storage::named_item_value(DeprecatedFlyString const& name) const
{
auto value = get_item(name);
if (value.is_null())
return JS::js_null();
return JS::PrimitiveString::create(vm(), value);
}
WebIDL::ExceptionOr<Bindings::LegacyPlatformObject::DidDeletionFail> Storage::delete_value(DeprecatedString const& name)
{
remove_item(name);
return DidDeletionFail::NotRelevant;
}
WebIDL::ExceptionOr<void> Storage::set_value_of_named_property(DeprecatedString const& key, JS::Value unconverted_value)
{
// NOTE: Since LegacyPlatformObject does not know the type of value, we must convert it ourselves.
// The type of `value` is `DOMString`.
auto value = TRY(unconverted_value.to_deprecated_string(vm()));
return set_item(key, value);
}
void Storage::dump() const
{
dbgln("Storage ({} key(s))", m_map.size());

View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2022, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2023, Luke Wilde <lukew@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -7,13 +8,13 @@
#pragma once
#include <AK/HashMap.h>
#include <LibWeb/Bindings/PlatformObject.h>
#include <LibWeb/Bindings/LegacyPlatformObject.h>
#include <LibWeb/WebIDL/ExceptionOr.h>
namespace Web::HTML {
class Storage : public Bindings::PlatformObject {
WEB_PLATFORM_OBJECT(Storage, Bindings::PlatformObject);
class Storage : public Bindings::LegacyPlatformObject {
WEB_PLATFORM_OBJECT(Storage, Bindings::LegacyPlatformObject);
public:
static WebIDL::ExceptionOr<JS::NonnullGCPtr<Storage>> create(JS::Realm&);
@ -26,8 +27,6 @@ public:
void remove_item(DeprecatedString const& key);
void clear();
Vector<DeprecatedString> supported_property_names() const;
auto const& map() const { return m_map; }
void dump() const;
@ -37,6 +36,24 @@ private:
virtual JS::ThrowCompletionOr<void> initialize(JS::Realm&) override;
// ^LegacyPlatformObject
virtual WebIDL::ExceptionOr<JS::Value> named_item_value(DeprecatedFlyString const&) const override;
virtual WebIDL::ExceptionOr<DidDeletionFail> delete_value(DeprecatedString const&) override;
virtual Vector<DeprecatedString> supported_property_names() const override;
virtual WebIDL::ExceptionOr<void> set_value_of_named_property(DeprecatedString const& key, JS::Value value) override;
virtual bool supports_indexed_properties() const override { return false; }
virtual bool supports_named_properties() const override { return true; }
virtual bool has_indexed_property_setter() const override { return false; }
virtual bool has_named_property_setter() const override { return true; }
virtual bool has_named_property_deleter() const override { return true; }
virtual bool has_legacy_override_built_ins_interface_extended_attribute() const override { return true; }
virtual bool has_legacy_unenumerable_named_properties_interface_extended_attribute() const override { return false; }
virtual bool has_global_interface_extended_attribute() const override { return false; }
virtual bool indexed_property_setter_has_identifier() const override { return false; }
virtual bool named_property_setter_has_identifier() const override { return true; }
virtual bool named_property_deleter_has_identifier() const override { return true; }
void reorder();
void broadcast(DeprecatedString const& key, DeprecatedString const& old_value, DeprecatedString const& new_value);