mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-08-15 23:09:05 +00:00
LibWeb: Implement caching of reflected element array attributes
Some checks are pending
CI / Lagom (arm64, Sanitizer_CI, false, macos-15, macOS, Clang) (push) Waiting to run
CI / Lagom (x86_64, Fuzzers_CI, false, ubuntu-24.04, Linux, Clang) (push) Waiting to run
CI / Lagom (x86_64, Sanitizer_CI, false, ubuntu-24.04, Linux, GNU) (push) Waiting to run
CI / Lagom (x86_64, Sanitizer_CI, true, ubuntu-24.04, Linux, Clang) (push) Waiting to run
Package the js repl as a binary artifact / build-and-package (arm64, macos-15, macOS, macOS-universal2) (push) Waiting to run
Package the js repl as a binary artifact / build-and-package (x86_64, ubuntu-24.04, Linux, Linux-x86_64) (push) Waiting to run
Run test262 and test-wasm / run_and_update_results (push) Waiting to run
Lint Code / lint (push) Waiting to run
Label PRs with merge conflicts / auto-labeler (push) Waiting to run
Push notes / build (push) Waiting to run
Some checks are pending
CI / Lagom (arm64, Sanitizer_CI, false, macos-15, macOS, Clang) (push) Waiting to run
CI / Lagom (x86_64, Fuzzers_CI, false, ubuntu-24.04, Linux, Clang) (push) Waiting to run
CI / Lagom (x86_64, Sanitizer_CI, false, ubuntu-24.04, Linux, GNU) (push) Waiting to run
CI / Lagom (x86_64, Sanitizer_CI, true, ubuntu-24.04, Linux, Clang) (push) Waiting to run
Package the js repl as a binary artifact / build-and-package (arm64, macos-15, macOS, macOS-universal2) (push) Waiting to run
Package the js repl as a binary artifact / build-and-package (x86_64, ubuntu-24.04, Linux, Linux-x86_64) (push) Waiting to run
Run test262 and test-wasm / run_and_update_results (push) Waiting to run
Lint Code / lint (push) Waiting to run
Label PRs with merge conflicts / auto-labeler (push) Waiting to run
Push notes / build (push) Waiting to run
For attributes like Element.ariaControlsElements, which are a reflection of FrozenArray<Element>, we must return the same JS::Array object every time the attribute is invoked - until its contents have changed. This patch implements caching of the reflected array in accordance with the spec.
This commit is contained in:
parent
6f894ccd77
commit
ac1c2a956a
Notes:
github-actions[bot]
2025-04-26 21:30:33 +00:00
Author: https://github.com/trflynn89
Commit: ac1c2a956a
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/4477
7 changed files with 93 additions and 14 deletions
|
@ -4,6 +4,7 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <LibJS/Runtime/Array.h>
|
||||||
#include <LibWeb/ARIA/ARIAMixin.h>
|
#include <LibWeb/ARIA/ARIAMixin.h>
|
||||||
#include <LibWeb/ARIA/Roles.h>
|
#include <LibWeb/ARIA/Roles.h>
|
||||||
#include <LibWeb/DOM/Element.h>
|
#include <LibWeb/DOM/Element.h>
|
||||||
|
@ -14,6 +15,13 @@ namespace Web::ARIA {
|
||||||
ARIAMixin::ARIAMixin() = default;
|
ARIAMixin::ARIAMixin() = default;
|
||||||
ARIAMixin::~ARIAMixin() = default;
|
ARIAMixin::~ARIAMixin() = default;
|
||||||
|
|
||||||
|
void ARIAMixin::visit_edges(GC::Cell::Visitor& visitor) {
|
||||||
|
#define __ENUMERATE_ARIA_ATTRIBUTE(attribute, referencing_attribute) \
|
||||||
|
visitor.visit(m_cached_##attribute);
|
||||||
|
ENUMERATE_ARIA_ELEMENT_LIST_REFERENCING_ATTRIBUTES
|
||||||
|
#undef __ENUMERATE_ARIA_ATTRIBUTE
|
||||||
|
}
|
||||||
|
|
||||||
// https://www.w3.org/TR/wai-aria-1.2/#introroles
|
// https://www.w3.org/TR/wai-aria-1.2/#introroles
|
||||||
Optional<Role> ARIAMixin::role_from_role_attribute_value() const
|
Optional<Role> ARIAMixin::role_from_role_attribute_value() const
|
||||||
{
|
{
|
||||||
|
@ -247,6 +255,16 @@ ENUMERATE_ARIA_ELEMENT_REFERENCING_ATTRIBUTES
|
||||||
void ARIAMixin::set_##attribute(Optional<Vector<WeakPtr<DOM::Element>>> value) \
|
void ARIAMixin::set_##attribute(Optional<Vector<WeakPtr<DOM::Element>>> value) \
|
||||||
{ \
|
{ \
|
||||||
m_##attribute = move(value); \
|
m_##attribute = move(value); \
|
||||||
|
} \
|
||||||
|
\
|
||||||
|
GC::Ptr<JS::Array> ARIAMixin::cached_##attribute() const \
|
||||||
|
{ \
|
||||||
|
return m_cached_##attribute; \
|
||||||
|
} \
|
||||||
|
\
|
||||||
|
void ARIAMixin::set_cached_##attribute(GC::Ptr<JS::Array> value) \
|
||||||
|
{ \
|
||||||
|
m_cached_##attribute = value; \
|
||||||
}
|
}
|
||||||
ENUMERATE_ARIA_ELEMENT_LIST_REFERENCING_ATTRIBUTES
|
ENUMERATE_ARIA_ELEMENT_LIST_REFERENCING_ATTRIBUTES
|
||||||
#undef __ENUMERATE_ARIA_ATTRIBUTE
|
#undef __ENUMERATE_ARIA_ATTRIBUTE
|
||||||
|
|
|
@ -68,13 +68,18 @@ public:
|
||||||
|
|
||||||
#define __ENUMERATE_ARIA_ATTRIBUTE(attribute, referencing_attribute) \
|
#define __ENUMERATE_ARIA_ATTRIBUTE(attribute, referencing_attribute) \
|
||||||
Optional<Vector<WeakPtr<DOM::Element>>> const& attribute() const; \
|
Optional<Vector<WeakPtr<DOM::Element>>> const& attribute() const; \
|
||||||
void set_##attribute(Optional<Vector<WeakPtr<DOM::Element>>> value);
|
void set_##attribute(Optional<Vector<WeakPtr<DOM::Element>>>); \
|
||||||
|
\
|
||||||
|
GC::Ptr<JS::Array> cached_##attribute() const; \
|
||||||
|
void set_cached_##attribute(GC::Ptr<JS::Array>);
|
||||||
ENUMERATE_ARIA_ELEMENT_LIST_REFERENCING_ATTRIBUTES
|
ENUMERATE_ARIA_ELEMENT_LIST_REFERENCING_ATTRIBUTES
|
||||||
#undef __ENUMERATE_ARIA_ATTRIBUTE
|
#undef __ENUMERATE_ARIA_ATTRIBUTE
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
ARIAMixin();
|
ARIAMixin();
|
||||||
|
|
||||||
|
void visit_edges(GC::Cell::Visitor&);
|
||||||
|
|
||||||
virtual bool id_reference_exists(String const&) const = 0;
|
virtual bool id_reference_exists(String const&) const = 0;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -84,7 +89,8 @@ private:
|
||||||
#undef __ENUMERATE_ARIA_ATTRIBUTE
|
#undef __ENUMERATE_ARIA_ATTRIBUTE
|
||||||
|
|
||||||
#define __ENUMERATE_ARIA_ATTRIBUTE(attribute, referencing_attribute) \
|
#define __ENUMERATE_ARIA_ATTRIBUTE(attribute, referencing_attribute) \
|
||||||
Optional<Vector<WeakPtr<DOM::Element>>> m_##attribute;
|
Optional<Vector<WeakPtr<DOM::Element>>> m_##attribute; \
|
||||||
|
GC::Ptr<JS::Array> m_cached_##attribute;
|
||||||
ENUMERATE_ARIA_ELEMENT_LIST_REFERENCING_ATTRIBUTES
|
ENUMERATE_ARIA_ELEMENT_LIST_REFERENCING_ATTRIBUTES
|
||||||
#undef __ENUMERATE_ARIA_ATTRIBUTE
|
#undef __ENUMERATE_ARIA_ATTRIBUTE
|
||||||
};
|
};
|
||||||
|
|
|
@ -106,6 +106,7 @@ void Element::visit_edges(Cell::Visitor& visitor)
|
||||||
Base::visit_edges(visitor);
|
Base::visit_edges(visitor);
|
||||||
SlottableMixin::visit_edges(visitor);
|
SlottableMixin::visit_edges(visitor);
|
||||||
Animatable::visit_edges(visitor);
|
Animatable::visit_edges(visitor);
|
||||||
|
ARIAMixin::visit_edges(visitor);
|
||||||
|
|
||||||
visitor.visit(m_attributes);
|
visitor.visit(m_attributes);
|
||||||
visitor.visit(m_inline_style);
|
visitor.visit(m_inline_style);
|
||||||
|
|
|
@ -528,4 +528,25 @@ template JS::ThrowCompletionOr<UnsignedLong> convert_to_int(JS::VM& vm, JS::Valu
|
||||||
template JS::ThrowCompletionOr<LongLong> convert_to_int(JS::VM& vm, JS::Value, EnforceRange, Clamp);
|
template JS::ThrowCompletionOr<LongLong> convert_to_int(JS::VM& vm, JS::Value, EnforceRange, Clamp);
|
||||||
template JS::ThrowCompletionOr<UnsignedLongLong> convert_to_int(JS::VM& vm, JS::Value, EnforceRange, Clamp);
|
template JS::ThrowCompletionOr<UnsignedLongLong> convert_to_int(JS::VM& vm, JS::Value, EnforceRange, Clamp);
|
||||||
|
|
||||||
|
// AD-HOC: For same-object caching purposes, this can be used to compare a cached JS array of DOM::Elements with another
|
||||||
|
// list. Either list can be null, in which case they are considered the same only if they are both null.
|
||||||
|
bool lists_contain_same_elements(GC::Ptr<JS::Array> array, Optional<GC::RootVector<GC::Ref<DOM::Element>>> const& elements)
|
||||||
|
{
|
||||||
|
if (!array || !elements.has_value())
|
||||||
|
return !array && !elements.has_value();
|
||||||
|
|
||||||
|
bool is_equivalent = array->indexed_properties().array_like_size() == elements->size();
|
||||||
|
|
||||||
|
for (size_t i = 0; is_equivalent && i < elements->size(); ++i) {
|
||||||
|
auto cached_value = array->get_without_side_effects(JS::PropertyKey { i });
|
||||||
|
auto const& cached_element = as<DOM::Element>(cached_value.as_object());
|
||||||
|
|
||||||
|
auto it = elements->find_if([&](auto const& element) { return element.ptr() == &cached_element; });
|
||||||
|
if (it == elements->end())
|
||||||
|
is_equivalent = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return is_equivalent;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
|
|
||||||
#include <AK/Forward.h>
|
#include <AK/Forward.h>
|
||||||
#include <LibGC/Ptr.h>
|
#include <LibGC/Ptr.h>
|
||||||
|
#include <LibGC/RootVector.h>
|
||||||
#include <LibJS/Forward.h>
|
#include <LibJS/Forward.h>
|
||||||
#include <LibWeb/Forward.h>
|
#include <LibWeb/Forward.h>
|
||||||
|
|
||||||
|
@ -54,4 +55,6 @@ enum class Clamp {
|
||||||
template<Integral T>
|
template<Integral T>
|
||||||
JS::ThrowCompletionOr<T> convert_to_int(JS::VM& vm, JS::Value, EnforceRange enforce_range = EnforceRange::No, Clamp clamp = Clamp::No);
|
JS::ThrowCompletionOr<T> convert_to_int(JS::VM& vm, JS::Value, EnforceRange enforce_range = EnforceRange::No, Clamp clamp = Clamp::No);
|
||||||
|
|
||||||
|
bool lists_contain_same_elements(GC::Ptr<JS::Array> array, Optional<GC::RootVector<GC::Ref<DOM::Element>>> const& elements);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -3748,6 +3748,9 @@ static void generate_prototype_or_global_mixin_definitions(IDL::Interface const&
|
||||||
for (auto& attribute : interface.attributes) {
|
for (auto& attribute : interface.attributes) {
|
||||||
if (attribute.extended_attributes.contains("FIXME"))
|
if (attribute.extended_attributes.contains("FIXME"))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
bool generated_reflected_element_array = false;
|
||||||
|
|
||||||
auto attribute_generator = generator.fork();
|
auto attribute_generator = generator.fork();
|
||||||
attribute_generator.set("attribute.name", attribute.name);
|
attribute_generator.set("attribute.name", attribute.name);
|
||||||
attribute_generator.set("attribute.getter_callback", attribute.getter_callback_name);
|
attribute_generator.set("attribute.getter_callback", attribute.getter_callback_name);
|
||||||
|
@ -4054,18 +4057,14 @@ JS_DEFINE_NATIVE_FUNCTION(@class_name@::@attribute.getter_callback@)
|
||||||
// inherits from Element, then with attr being the reflected content attribute name:
|
// inherits from Element, then with attr being the reflected content attribute name:
|
||||||
// FIXME: Handle "an interface that inherits from Element".
|
// FIXME: Handle "an interface that inherits from Element".
|
||||||
else if (is_nullable_frozen_array_of_single_type(attribute.type, "Element"sv)) {
|
else if (is_nullable_frozen_array_of_single_type(attribute.type, "Element"sv)) {
|
||||||
|
generated_reflected_element_array = true;
|
||||||
|
|
||||||
// 1. Let elements be the result of running this's get the attr-associated elements.
|
// 1. Let elements be the result of running this's get the attr-associated elements.
|
||||||
attribute_generator.append(R"~~~(
|
attribute_generator.append(R"~~~(
|
||||||
static auto content_attribute = "@attribute.reflect_name@"_fly_string;
|
static auto content_attribute = "@attribute.reflect_name@"_fly_string;
|
||||||
|
|
||||||
auto retval = impl->get_the_attribute_associated_elements(content_attribute, TRY(throw_dom_exception_if_needed(vm, [&] { return impl->@attribute.cpp_name@(); })));
|
auto retval = impl->get_the_attribute_associated_elements(content_attribute, TRY(throw_dom_exception_if_needed(vm, [&] { return impl->@attribute.cpp_name@(); })));
|
||||||
)~~~");
|
)~~~");
|
||||||
|
|
||||||
// FIXME: 2. If the contents of elements is equal to the contents of this's cached attr-associated elements, then return
|
|
||||||
// this's cached attr-associated elements object.
|
|
||||||
// FIXME: 3. Let elementsAsFrozenArray be elements, converted to a FrozenArray<T>?.
|
|
||||||
// FIXME: 4. Set this's cached attr-associated elements to elements.
|
|
||||||
// FIXME: 5. Set this's cached attr-associated elements object to elementsAsFrozenArray.
|
|
||||||
} else {
|
} else {
|
||||||
attribute_generator.append(R"~~~(
|
attribute_generator.append(R"~~~(
|
||||||
auto retval = impl->get_attribute_value("@attribute.reflect_name@"_fly_string);
|
auto retval = impl->get_attribute_value("@attribute.reflect_name@"_fly_string);
|
||||||
|
@ -4083,6 +4082,19 @@ JS_DEFINE_NATIVE_FUNCTION(@class_name@::@attribute.getter_callback@)
|
||||||
Bindings::invoke_custom_element_reactions(queue);
|
Bindings::invoke_custom_element_reactions(queue);
|
||||||
)~~~");
|
)~~~");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (generated_reflected_element_array) {
|
||||||
|
// 2. If the contents of elements is equal to the contents of this's cached attr-associated elements,
|
||||||
|
// then return this's cached attr-associated elements object.
|
||||||
|
attribute_generator.append(R"~~~(
|
||||||
|
auto cached_@attribute.cpp_name@ = TRY(throw_dom_exception_if_needed(vm, [&] { return impl->cached_@attribute.cpp_name@(); }));
|
||||||
|
if (WebIDL::lists_contain_same_elements(cached_@attribute.cpp_name@, retval))
|
||||||
|
return cached_@attribute.cpp_name@;
|
||||||
|
|
||||||
|
auto result = TRY([&]() -> JS::ThrowCompletionOr<JS::Value> {
|
||||||
|
)~~~");
|
||||||
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if (!attribute.extended_attributes.contains("CEReactions")) {
|
if (!attribute.extended_attributes.contains("CEReactions")) {
|
||||||
attribute_generator.append(R"~~~(
|
attribute_generator.append(R"~~~(
|
||||||
|
@ -4127,6 +4139,24 @@ JS_DEFINE_NATIVE_FUNCTION(@class_name@::@attribute.getter_callback@)
|
||||||
|
|
||||||
generate_return_statement(generator, *attribute.type, interface);
|
generate_return_statement(generator, *attribute.type, interface);
|
||||||
|
|
||||||
|
if (generated_reflected_element_array) {
|
||||||
|
// 3. Let elementsAsFrozenArray be elements, converted to a FrozenArray<T>?.
|
||||||
|
// 4. Set this's cached attr-associated elements to elements.
|
||||||
|
// 5. Set this's cached attr-associated elements object to elementsAsFrozenArray.
|
||||||
|
attribute_generator.append(R"~~~(
|
||||||
|
}());
|
||||||
|
|
||||||
|
if (result.is_null()) {
|
||||||
|
TRY(throw_dom_exception_if_needed(vm, [&] { impl->set_cached_@attribute.cpp_name@({}); }));
|
||||||
|
} else {
|
||||||
|
auto& array = as<JS::Array>(result.as_object());
|
||||||
|
TRY(throw_dom_exception_if_needed(vm, [&] { impl->set_cached_@attribute.cpp_name@(&array); }));
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
)~~~");
|
||||||
|
}
|
||||||
|
|
||||||
attribute_generator.append(R"~~~(
|
attribute_generator.append(R"~~~(
|
||||||
}
|
}
|
||||||
)~~~");
|
)~~~");
|
||||||
|
|
|
@ -2,8 +2,8 @@ Harness status: OK
|
||||||
|
|
||||||
Found 27 tests
|
Found 27 tests
|
||||||
|
|
||||||
22 Pass
|
25 Pass
|
||||||
5 Fail
|
2 Fail
|
||||||
Pass aria-activedescendant element reflection
|
Pass aria-activedescendant element reflection
|
||||||
Pass aria-activedescendant If the content attribute is set directly, the IDL attribute getter always returns the first element whose ID matches the content attribute.
|
Pass aria-activedescendant If the content attribute is set directly, the IDL attribute getter always returns the first element whose ID matches the content attribute.
|
||||||
Pass aria-activedescendant Setting the IDL attribute to an element which is not the first element in DOM order with its ID causes the content attribute to be an empty string
|
Pass aria-activedescendant Setting the IDL attribute to an element which is not the first element in DOM order with its ID causes the content attribute to be an empty string
|
||||||
|
@ -16,7 +16,7 @@ Pass aria-activedescendant Changing the ID of an element doesn't lose the refere
|
||||||
Pass aria-activedescendant Reparenting an element into a descendant shadow scope hides the element reference.
|
Pass aria-activedescendant Reparenting an element into a descendant shadow scope hides the element reference.
|
||||||
Pass aria-activedescendant Reparenting referenced element cannot cause retargeting of reference.
|
Pass aria-activedescendant Reparenting referenced element cannot cause retargeting of reference.
|
||||||
Pass aria-activedescendant Element reference set in invalid scope remains intact throughout move to valid scope.
|
Pass aria-activedescendant Element reference set in invalid scope remains intact throughout move to valid scope.
|
||||||
Fail aria-labelledby.
|
Pass aria-labelledby.
|
||||||
Pass aria-controls.
|
Pass aria-controls.
|
||||||
Pass aria-describedby.
|
Pass aria-describedby.
|
||||||
Pass aria-flowto.
|
Pass aria-flowto.
|
||||||
|
@ -28,6 +28,6 @@ Pass aria-activedescendant Reparenting.
|
||||||
Pass aria-activedescendant Attaching element reference before it's inserted into the DOM.
|
Pass aria-activedescendant Attaching element reference before it's inserted into the DOM.
|
||||||
Pass aria-activedescendant Cross-document references and moves.
|
Pass aria-activedescendant Cross-document references and moves.
|
||||||
Pass aria-activedescendant Adopting element keeps references.
|
Pass aria-activedescendant Adopting element keeps references.
|
||||||
Fail Caching invariant different attributes.
|
Pass Caching invariant different attributes.
|
||||||
Fail Caching invariant different elements.
|
Pass Caching invariant different elements.
|
||||||
Pass Passing values of the wrong type should throw a TypeError
|
Pass Passing values of the wrong type should throw a TypeError
|
Loading…
Add table
Add a link
Reference in a new issue