mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-07 08:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Move ariaActiveDescendantElement to ARIAMixin

Browse source 
Not an issue right now, but all IDL types that include the ARIA mixin
will need this.
This commit is contained in:
Timothy Flynn 2025-04-24 11:22:52 -04:00 • committed by Tim Ledbetter
commit 0289df9357
Notes: github-actions[bot] 2025-04-25 00:21:29 +00:00
4 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Libraries/LibWeb/ARIA/ARIAMixin.cpp
View file

@ -11,6 +11,14 @@
namespace Web::ARIA {
ARIAMixin::ARIAMixin() = default;
ARIAMixin::~ARIAMixin() = default;
void ARIAMixin::visit_edges(GC::Cell::Visitor& visitor)
{
visitor.visit(m_aria_active_descendant_element);
}
// https://www.w3.org/TR/wai-aria-1.2/#introroles
Optional<Role> ARIAMixin::role_from_role_attribute_value() const
{

12
Libraries/LibWeb/ARIA/ARIAMixin.h
View file

@ -17,7 +17,7 @@ namespace Web::ARIA {
class ARIAMixin {
public:
virtual ~ARIAMixin() = default;
virtual ~ARIAMixin();
#define __ENUMERATE_ARIA_ATTRIBUTE(name, attribute) \
virtual Optional<String> name() const = 0; \
@ -48,10 +48,18 @@ public:
// https://www.w3.org/TR/wai-aria-1.2/#valuetype_idref_list
Vector<String> parse_id_reference_list(Optional<String> const&) const;
GC::Ptr<DOM::Element> aria_active_descendant_element() { return m_aria_active_descendant_element; }
void set_aria_active_descendant_element(GC::Ptr<DOM::Element> value) { m_aria_active_descendant_element = value; }
protected:
ARIAMixin() = default;
ARIAMixin();
void visit_edges(GC::Cell::Visitor&);
virtual bool id_reference_exists(String const&) const = 0;
private:
GC::Ptr<DOM::Element> m_aria_active_descendant_element;
};
}

4
Libraries/LibWeb/DOM/Element.cpp
View file

@ -105,8 +105,8 @@ void Element::visit_edges(Cell::Visitor& visitor)
Base::visit_edges(visitor);
SlottableMixin::visit_edges(visitor);
Animatable::visit_edges(visitor);
ARIAMixin::visit_edges(visitor);
visitor.visit(m_aria_active_descendant_element);
visitor.visit(m_attributes);
visitor.visit(m_inline_style);
visitor.visit(m_class_list);
@ -3607,7 +3607,7 @@ void Element::attribute_changed(FlyString const& local_name, Optional<String> co
} else if (local_name == ARIA::AttributeNames::aria_active_descendant) {
// https://html.spec.whatwg.org/multipage/common-dom-interfaces.html#reflecting-content-attributes-in-idl-attributes:concept-element-attributes-change-ext
// Set element's explicitly set attr-element to null.
m_aria_active_descendant_element = nullptr;
set_aria_active_descendant_element({});
}
}

5
Libraries/LibWeb/DOM/Element.h
View file

@ -323,9 +323,6 @@ public:
ENUMERATE_ARIA_ATTRIBUTES
#undef __ENUMERATE_ARIA_ATTRIBUTE
GC::Ptr<DOM::Element> aria_active_descendant_element() { return m_aria_active_descendant_element; }
void set_aria_active_descendant_element(GC::Ptr<DOM::Element> value) { m_aria_active_descendant_element = value; }
virtual bool exclude_from_accessibility_tree() const override;
virtual bool include_in_accessibility_tree() const override;
@ -579,8 +576,6 @@ private:
OwnPtr<CSS::CountersSet> m_counters_set;
GC::Ptr<DOM::Element> m_aria_active_descendant_element;
// https://drafts.csswg.org/css-contain/#proximity-to-the-viewport
ProximityToTheViewport m_proximity_to_the_viewport { ProximityToTheViewport::NotDetermined };
};