RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 23:17:45 +00:00
Code Issues Activity Actions

LibWeb: Restore proper functionality of legacy platform objects

Browse source 
With the GC heap conversion, the functionality of legacy platform
objects was broken. This is because the generated implementation of one
of them was used for all of them, removing functionality such as
deletion.

This re-adds all functionality, where questions such as "does the
object support indexed properties?" is instead answered by virtual
functions instead of by the IDL generator checking the presence of
certain keywords/attributes.
This commit is contained in:
Luke Wilde 2023-02-28 00:05:39 +00:00 • committed by Andreas Kling
parent 7e76a51cb0
commit 54f58e2662
23 changed files with 450 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibWeb/DOM/DOMTokenList.cpp
View file

@ -268,7 +268,7 @@ void DOMTokenList::run_update_steps()
MUST(associated_element->set_attribute(m_associated_attribute, value()));
}
JS::Value DOMTokenList::item_value(size_t index) const
WebIDL::ExceptionOr<JS::Value> DOMTokenList::item_value(size_t index) const
{
auto const& string = item(index);
if (string.is_null())

16
Userland/Libraries/LibWeb/DOM/DOMTokenList.h
View file

@ -1,6 +1,7 @@
/*
* Copyright (c) 2021, Tim Flynn <trflynn89@serenityos.org>
* Copyright (c) 2022, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2023, Luke Wilde <lukew@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -29,7 +30,7 @@ public:
void associated_attribute_changed(StringView value);
virtual bool is_supported_property_index(u32 index) const override;
virtual JS::Value item_value(size_t index) const override;
virtual WebIDL::ExceptionOr<JS::Value> item_value(size_t index) const override;
size_t length() const { return m_token_set.size(); }
DeprecatedString const& item(size_t index) const;
@ -48,6 +49,19 @@ private:
virtual JS::ThrowCompletionOr<void> initialize(JS::Realm&) override;
virtual void visit_edges(Cell::Visitor&) override;
// ^Bindings::LegacyPlatformObject
virtual bool supports_indexed_properties() const override { return true; }
virtual bool supports_named_properties() const override { return false; }
virtual bool has_indexed_property_setter() const override { return false; }
virtual bool has_named_property_setter() const override { return false; }
virtual bool has_named_property_deleter() const override { return false; }
virtual bool has_legacy_override_built_ins_interface_extended_attribute() const override { return false; }
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 false; }
virtual bool named_property_deleter_has_identifier() const override { return false; }
WebIDL::ExceptionOr<void> validate_token(StringView token) const;
void run_update_steps();

4
Userland/Libraries/LibWeb/DOM/HTMLCollection.cpp
View file

@ -130,7 +130,7 @@ bool HTMLCollection::is_supported_property_index(u32 index) const
return index < elements.size();
}
JS::Value HTMLCollection::item_value(size_t index) const
WebIDL::ExceptionOr<JS::Value> HTMLCollection::item_value(size_t index) const
{
auto* element = item(index);
if (!element)
@ -138,7 +138,7 @@ JS::Value HTMLCollection::item_value(size_t index) const
return const_cast<Element*>(element);
}
JS::Value HTMLCollection::named_item_value(DeprecatedFlyString const& index) const
WebIDL::ExceptionOr<JS::Value> HTMLCollection::named_item_value(DeprecatedFlyString const& index) const
{
auto* element = named_item(index);
if (!element)

18
Userland/Libraries/LibWeb/DOM/HTMLCollection.h
View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2021-2022, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2023, Luke Wilde <lukew@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -39,8 +40,8 @@ public:
JS::MarkedVector<Element*> collect_matching_elements() const;
virtual JS::Value item_value(size_t index) const override;
virtual JS::Value named_item_value(DeprecatedFlyString const& name) const override;
virtual WebIDL::ExceptionOr<JS::Value> item_value(size_t index) const override;
virtual WebIDL::ExceptionOr<JS::Value> named_item_value(DeprecatedFlyString const& name) const override;
virtual Vector<DeprecatedString> supported_property_names() const override;
virtual bool is_supported_property_index(u32) const override;
@ -54,6 +55,19 @@ protected:
private:
virtual void visit_edges(Cell::Visitor&) override;
// ^Bindings::LegacyPlatformObject
virtual bool supports_indexed_properties() const override { return true; }
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 false; }
virtual bool has_named_property_deleter() const override { return false; }
virtual bool has_legacy_override_built_ins_interface_extended_attribute() const override { return false; }
virtual bool has_legacy_unenumerable_named_properties_interface_extended_attribute() const override { return true; }
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 false; }
virtual bool named_property_deleter_has_identifier() const override { return false; }
JS::NonnullGCPtr<ParentNode> m_root;
Function<bool(Element const&)> m_filter;
};

4
Userland/Libraries/LibWeb/DOM/NamedNodeMap.cpp
View file

@ -301,7 +301,7 @@ Attr const* NamedNodeMap::remove_attribute_ns(StringView namespace_, StringView
return attribute;
}
JS::Value NamedNodeMap::item_value(size_t index) const
WebIDL::ExceptionOr<JS::Value> NamedNodeMap::item_value(size_t index) const
{
auto const* node = item(index);
if (!node)
@ -309,7 +309,7 @@ JS::Value NamedNodeMap::item_value(size_t index) const
return node;
}
JS::Value NamedNodeMap::named_item_value(DeprecatedFlyString const& name) const
WebIDL::ExceptionOr<JS::Value> NamedNodeMap::named_item_value(DeprecatedFlyString const& name) const
{
auto const* node = get_named_item(name);
if (!node)

18
Userland/Libraries/LibWeb/DOM/NamedNodeMap.h
View file

@ -2,6 +2,7 @@
* Copyright (c) 2021, Tim Flynn <trflynn89@serenityos.org>
* Copyright (c) 2022, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2022, Alexander Narsudinov <a.narsudinov@gmail.com>
* Copyright (c) 2023, Luke Wilde <lukew@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -27,8 +28,8 @@ public:
virtual bool is_supported_property_index(u32 index) const override;
virtual Vector<DeprecatedString> supported_property_names() const override;
virtual JS::Value item_value(size_t index) const override;
virtual JS::Value named_item_value(DeprecatedFlyString const& name) const override;
virtual WebIDL::ExceptionOr<JS::Value> item_value(size_t index) const override;
virtual WebIDL::ExceptionOr<JS::Value> named_item_value(DeprecatedFlyString const& name) const override;
size_t length() const { return m_attributes.size(); }
bool is_empty() const { return m_attributes.is_empty(); }
@ -59,6 +60,19 @@ private:
virtual JS::ThrowCompletionOr<void> initialize(JS::Realm&) override;
virtual void visit_edges(Cell::Visitor&) override;
// ^Bindings::LegacyPlatformObject
virtual bool supports_indexed_properties() const override { return true; }
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 false; }
virtual bool has_named_property_deleter() const override { return false; }
virtual bool has_legacy_override_built_ins_interface_extended_attribute() const override { return false; }
virtual bool has_legacy_unenumerable_named_properties_interface_extended_attribute() const override { return true; }
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 false; }
virtual bool named_property_deleter_has_identifier() const override { return false; }
Element& associated_element() { return *m_element; }
Element const& associated_element() const { return *m_element; }

2
Userland/Libraries/LibWeb/DOM/NodeList.cpp
View file

@ -25,7 +25,7 @@ JS::ThrowCompletionOr<void> NodeList::initialize(JS::Realm& realm)
return {};
}
JS::Value NodeList::item_value(size_t index) const
WebIDL::ExceptionOr<JS::Value> NodeList::item_value(size_t index) const
{
auto* node = item(index);
if (!node)

17
Userland/Libraries/LibWeb/DOM/NodeList.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, Luke Wilde <lukew@serenityos.org>
* Copyright (c) 2021-2023, Luke Wilde <lukew@serenityos.org>
* Copyright (c) 2022, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
@ -21,13 +21,26 @@ public:
virtual u32 length() const = 0;
virtual Node const* item(u32 index) const = 0;
virtual JS::Value item_value(size_t index) const override;
virtual WebIDL::ExceptionOr<JS::Value> item_value(size_t index) const override;
virtual bool is_supported_property_index(u32) const override;
protected:
explicit NodeList(JS::Realm&);
virtual JS::ThrowCompletionOr<void> initialize(JS::Realm&) override;
// ^Bindings::LegacyPlatformObject
virtual bool supports_indexed_properties() const final override { return true; }
virtual bool supports_named_properties() const final override { return false; }
virtual bool has_indexed_property_setter() const final override { return false; }
virtual bool has_named_property_setter() const final override { return false; }
virtual bool has_named_property_deleter() const final override { return false; }
virtual bool has_legacy_override_built_ins_interface_extended_attribute() const final override { return false; }
virtual bool has_legacy_unenumerable_named_properties_interface_extended_attribute() const final override { return false; }
virtual bool has_global_interface_extended_attribute() const final override { return false; }
virtual bool indexed_property_setter_has_identifier() const final override { return false; }
virtual bool named_property_setter_has_identifier() const final override { return false; }
virtual bool named_property_deleter_has_identifier() const final override { return false; }
};
}