LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-19 17:27:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Move ARIA-related code into the Web::ARIA namespace

Browse Source 
ARIA has its own spec and is not part of the DOM spec, which is what the
Web::DOM namespace is for (https://www.w3.org/TR/wai-aria-1.2/).

This allows us to stay closer to the spec with function names and don't
have to add the word "ARIA" to identifiers constantly - the namespace
now provides that clarity.
This commit is contained in:
Linus Groh 2023-01-28 22:23:16 +00:00
parent 8414734a2d
commit 8556d47240
Notes: sideshowbarker 2024-07-17 14:33:07 +09:00 
Author: https://github.com/linusg
Commit: https://github.com/SerenityOS/serenity/commit/8556d47240
Pull-request: https://github.com/SerenityOS/serenity/pull/17227
61 changed files with 179 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Userland/Libraries/LibWeb/DOM/ARIAMixin.cpp → Userland/Libraries/LibWeb/ARIA/ARIAMixin.cpp
View File

@ -4,14 +4,14 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibWeb/DOM/ARIAMixin.h>
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/ARIAMixin.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/Infra/CharacterTypes.h>
namespace Web::DOM {
namespace Web::ARIA {
// https://www.w3.org/TR/wai-aria-1.2/#introroles
Optional<ARIARoles::Role> ARIAMixin::role_or_default() const
Optional<Role> ARIAMixin::role_or_default() const
{
// 1. Use the rules of the host language to detect that an element has a role attribute and to identify the attribute value string for it.
auto role_string = role();
@ -22,10 +22,10 @@ Optional<ARIARoles::Role> ARIAMixin::role_or_default() const
// 3. Compare the substrings to all the names of the non-abstract WAI-ARIA roles. Case-sensitivity of the comparison inherits from the case-sensitivity of the host language.
for (auto const& role_name : role_list) {
// 4. Use the first such substring in textual order that matches the name of a non-abstract WAI-ARIA role.
auto role = ARIARoles::from_string(role_name);
auto role = role_from_string(role_name);
if (!role.has_value())
continue;
if (ARIARoles::is_non_abstract_aria_role(*role))
if (is_non_abstract_role(*role))
return *role;
}

8
Userland/Libraries/LibWeb/DOM/ARIAMixin.h → Userland/Libraries/LibWeb/ARIA/ARIAMixin.h
View File

@ -7,10 +7,10 @@
#pragma once
#include <AK/DeprecatedFlyString.h>
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/WebIDL/ExceptionOr.h>
namespace Web::DOM {
namespace Web::ARIA {
class ARIAMixin {
@ -133,9 +133,9 @@ public:
virtual WebIDL::ExceptionOr<void> set_aria_value_text(DeprecatedString const&) = 0;
// https://www.w3.org/TR/html-aria/#docconformance
virtual Optional<ARIARoles::Role> default_role() const { return {}; };
virtual Optional<Role> default_role() const { return {}; };
Optional<ARIARoles::Role> role_or_default() const;
Optional<Role> role_or_default() const;
// https://www.w3.org/TR/wai-aria-1.2/#tree_exclusion
virtual bool exclude_from_accessibility_tree() const = 0;

0
Userland/Libraries/LibWeb/DOM/ARIAMixin.idl → Userland/Libraries/LibWeb/ARIA/ARIAMixin.idl
View File

30
Userland/Libraries/LibWeb/DOM/ARIARoles.cpp → Userland/Libraries/LibWeb/ARIA/Roles.cpp
View File

@ -5,9 +5,9 @@
*/
#include <AK/GenericShorthands.h>
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
namespace Web::DOM::ARIARoles {
namespace Web::ARIA {
StringView role_name(Role role)
{
@ -22,7 +22,7 @@ StringView role_name(Role role)
}
}
Optional<Role> from_string(StringView role_name)
Optional<Role> role_from_string(StringView role_name)
{
#define __ENUMERATE_ARIA_ROLE(name) \
if (role_name.equals_ignoring_case(#name##sv)) \
@ -33,7 +33,7 @@ Optional<Role> from_string(StringView role_name)
}
// https://www.w3.org/TR/wai-aria-1.2/#abstract_roles
bool is_abstract_aria_role(Role role)
bool is_abstract_role(Role role)
{
return first_is_one_of(role,
Role::command,
@ -51,7 +51,7 @@ bool is_abstract_aria_role(Role role)
}
// https://www.w3.org/TR/wai-aria-1.2/#widget_roles
bool is_widget_aria_role(Role role)
bool is_widget_role(Role role)
{
return first_is_one_of(role,
Role::button,
@ -85,7 +85,7 @@ bool is_widget_aria_role(Role role)
}
// https://www.w3.org/TR/wai-aria-1.2/#document_structure_roles
bool is_document_structure_aria_role(Role role)
bool is_document_structure_role(Role role)
{
return first_is_one_of(role,
Role::application,
@ -128,7 +128,7 @@ bool is_document_structure_aria_role(Role role)
}
// https://www.w3.org/TR/wai-aria-1.2/#landmark_roles
bool is_landmark_aria_role(Role role)
bool is_landmark_role(Role role)
{
return first_is_one_of(role,
Role::banner,
@ -142,7 +142,7 @@ bool is_landmark_aria_role(Role role)
}
// https://www.w3.org/TR/wai-aria-1.2/#live_region_roles
bool is_live_region_aria_role(Role role)
bool is_live_region_role(Role role)
{
return first_is_one_of(role,
Role::alert,
@ -153,20 +153,20 @@ bool is_live_region_aria_role(Role role)
}
// https://www.w3.org/TR/wai-aria-1.2/#window_roles
bool is_windows_aria_role(Role role)
bool is_windows_role(Role role)
{
return first_is_one_of(role,
Role::alertdialog,
Role::dialog);
}
bool is_non_abstract_aria_role(Role role)
bool is_non_abstract_role(Role role)
{
return is_widget_aria_role(role)
|| is_document_structure_aria_role(role)
|| is_landmark_aria_role(role)
|| is_live_region_aria_role(role)
|| is_windows_aria_role(role);
return is_widget_role(role)
|| is_document_structure_role(role)
|| is_landmark_role(role)
|| is_live_region_role(role)
|| is_windows_role(role);
}
}

18
Userland/Libraries/LibWeb/DOM/ARIARoles.h → Userland/Libraries/LibWeb/ARIA/Roles.h
View File

@ -8,7 +8,7 @@
#include <AK/DeprecatedFlyString.h>
namespace Web::DOM::ARIARoles {
namespace Web::ARIA {
#define ENUMERATE_ARIA_ROLES \
__ENUMERATE_ARIA_ROLE(alert) \
@ -113,15 +113,15 @@ enum class Role {
};
StringView role_name(Role);
Optional<Role> from_string(StringView role_name);
Optional<Role> role_from_string(StringView role_name);
bool is_abstract_aria_role(Role);
bool is_widget_aria_role(Role);
bool is_document_structure_aria_role(Role);
bool is_landmark_aria_role(Role);
bool is_live_region_aria_role(Role);
bool is_windows_aria_role(Role);
bool is_abstract_role(Role);
bool is_widget_role(Role);
bool is_document_structure_role(Role);
bool is_landmark_role(Role);
bool is_live_region_role(Role);
bool is_windows_role(Role);
bool is_non_abstract_aria_role(Role);
bool is_non_abstract_role(Role);
}

6
Userland/Libraries/LibWeb/CMakeLists.txt
View File

@ -1,6 +1,9 @@
include(libweb_generators)
set(SOURCES
ARIA/ARIAMixin.cpp
ARIA/ARIAMixin.idl
ARIA/Roles.cpp
Bindings/AudioConstructor.cpp
Bindings/CSSNamespace.cpp
Bindings/FetchMethod.cpp
@ -75,9 +78,6 @@ set(SOURCES
DOM/AccessibilityTreeNode.cpp
DOM/Attr.cpp
DOM/Attr.idl
DOM/ARIAMixin.cpp
DOM/ARIAMixin.idl
DOM/ARIARoles.cpp
DOM/CDATASection.cpp
DOM/CharacterData.cpp
DOM/CharacterData.idl

4
Userland/Libraries/LibWeb/DOM/AccessibilityTreeNode.cpp
View File

@ -35,10 +35,10 @@ void AccessibilityTreeNode::serialize_tree_as_json(JsonObjectSerializer<StringBu
MUST(object.add("type"sv, "element"sv));
auto role = element->role_or_default();
bool has_role = role.has_value() && !ARIARoles::is_abstract_aria_role(*role);
bool has_role = role.has_value() && !ARIA::is_abstract_role(*role);
if (has_role)
MUST(object.add("role"sv, ARIARoles::role_name(*role)));
MUST(object.add("role"sv, ARIA::role_name(*role)));
else
MUST(object.add("role"sv, ""sv));
} else {

2
Userland/Libraries/LibWeb/DOM/Element.cpp
View File

@ -1285,7 +1285,7 @@ bool Element::exclude_from_accessibility_tree() const
// Elements with none or presentation as the first role in the role attribute. However, their exclusion is conditional. In addition, the element's descendants and text content are generally included. These exceptions and conditions are documented in the presentation (role) section.
// FIXME: Handle exceptions to excluding presentation role
auto role = role_or_default();
if (role == ARIARoles::Role::none || role == ARIARoles::Role::presentation)
if (role == ARIA::Role::none || role == ARIA::Role::presentation)
return true;
// TODO: If not already excluded from the accessibility tree per the above rules, user agents SHOULD NOT include the following elements in the accessibility tree:

4
Userland/Libraries/LibWeb/DOM/Element.h
View File

@ -8,10 +8,10 @@
#include <AK/DeprecatedFlyString.h>
#include <AK/DeprecatedString.h>
#include <LibWeb/ARIA/ARIAMixin.h>
#include <LibWeb/Bindings/ElementPrototype.h>
#include <LibWeb/CSS/CSSStyleDeclaration.h>
#include <LibWeb/CSS/StyleComputer.h>
#include <LibWeb/DOM/ARIAMixin.h>
#include <LibWeb/DOM/Attr.h>
#include <LibWeb/DOM/ChildNode.h>
#include <LibWeb/DOM/NamedNodeMap.h>
@ -42,7 +42,7 @@ class Element
: public ParentNode
, public ChildNode<Element>
, public NonDocumentTypeChildNode<Element>
, public ARIAMixin {
, public ARIA::ARIAMixin {
WEB_PLATFORM_OBJECT(Element, ParentNode);
public:

2
Userland/Libraries/LibWeb/DOM/Element.idl
View File

@ -1,6 +1,6 @@
#import <ARIA/ARIAMixin.idl>
#import <CSS/CSSStyleDeclaration.idl>
#import <DOM/Attr.idl>
#import <DOM/ARIAMixin.idl>
#import <DOM/ChildNode.idl>
#import <DOM/DOMTokenList.idl>
#import <DOM/InnerHTML.idl>

1
Userland/Libraries/LibWeb/DOM/Node.h
View File

@ -12,7 +12,6 @@
#include <AK/RefPtr.h>
#include <AK/TypeCasts.h>
#include <AK/Vector.h>
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/DOM/AccessibilityTreeNode.h>
#include <LibWeb/DOM/EventTarget.h>
#include <LibWeb/DOMParsing/XMLSerializer.h>

8
Userland/Libraries/LibWeb/HTML/HTMLAnchorElement.cpp
View File

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLAnchorElement.h>
#include <LibWeb/HTML/Window.h>
@ -91,13 +91,13 @@ i32 HTMLAnchorElement::default_tab_index_value() const
return 0;
}
Optional<DOM::ARIARoles::Role> HTMLAnchorElement::default_role() const
Optional<ARIA::Role> HTMLAnchorElement::default_role() const
{
// https://www.w3.org/TR/html-aria/#el-a-no-href
if (!href().is_null())
return DOM::ARIARoles::Role::link;
return ARIA::Role::link;
// https://www.w3.org/TR/html-aria/#el-a
return DOM::ARIARoles::Role::generic;
return ARIA::Role::generic;
}
}

2
Userland/Libraries/LibWeb/HTML/HTMLAnchorElement.h
View File

@ -53,7 +53,7 @@ private:
queue_an_element_task(source, move(steps));
}
virtual Optional<DOM::ARIARoles::Role> default_role() const override;
virtual Optional<ARIA::Role> default_role() const override;
};
}

8
Userland/Libraries/LibWeb/HTML/HTMLAreaElement.cpp
View File

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLAreaElement.h>
#include <LibWeb/HTML/Window.h>
@ -50,13 +50,13 @@ i32 HTMLAreaElement::default_tab_index_value() const
return 0;
}
Optional<DOM::ARIARoles::Role> HTMLAreaElement::default_role() const
Optional<ARIA::Role> HTMLAreaElement::default_role() const
{
// https://www.w3.org/TR/html-aria/#el-area-no-href
if (!href().is_null())
return DOM::ARIARoles::Role::link;
return ARIA::Role::link;
// https://www.w3.org/TR/html-aria/#el-area
return DOM::ARIARoles::Role::generic;
return ARIA::Role::generic;
}
}

2
Userland/Libraries/LibWeb/HTML/HTMLAreaElement.h
View File

@ -42,7 +42,7 @@ private:
queue_an_element_task(source, move(steps));
}
virtual Optional<DOM::ARIARoles::Role> default_role() const override;
virtual Optional<ARIA::Role> default_role() const override;
};
}

4
Userland/Libraries/LibWeb/HTML/HTMLBodyElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
#include <LibWeb/HTML/WindowEventHandlers.h>
@ -24,7 +24,7 @@ public:
virtual void apply_presentational_hints(CSS::StyleProperties&) const override;
// https://www.w3.org/TR/html-aria/#el-body
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::generic; };
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::generic; };
private:
HTMLBodyElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLButtonElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/FormAssociatedElement.h>
#include <LibWeb/HTML/HTMLElement.h>
@ -57,7 +57,7 @@ public:
virtual bool is_labelable() const override { return true; }
// https://www.w3.org/TR/html-aria/#el-button
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::button; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::button; }
private:
HTMLButtonElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLDataElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -18,7 +18,7 @@ public:
virtual ~HTMLDataElement() override;
// https://www.w3.org/TR/html-aria/#el-data
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::generic; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::generic; }
private:
HTMLDataElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLDataListElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -17,7 +17,7 @@ class HTMLDataListElement final : public HTMLElement {
public:
virtual ~HTMLDataListElement() override;
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::listbox; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::listbox; }
private:
HTMLDataListElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLDetailsElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -18,7 +18,7 @@ public:
virtual ~HTMLDetailsElement() override;
// https://www.w3.org/TR/html-aria/#el-details
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::group; };
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::group; };
private:
HTMLDetailsElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLDialogElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -18,7 +18,7 @@ public:
virtual ~HTMLDialogElement() override;
// https://www.w3.org/TR/html-aria/#el-dialog
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::dialog; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::dialog; }
private:
HTMLDialogElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLDivElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -18,7 +18,7 @@ public:
virtual ~HTMLDivElement() override;
// https://www.w3.org/TR/html-aria/#el-div
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::generic; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::generic; }
private:
HTMLDivElement(DOM::Document&, DOM::QualifiedName);

50
Userland/Libraries/LibWeb/HTML/HTMLElement.cpp
View File

@ -6,7 +6,7 @@
#include <AK/StringBuilder.h>
#include <LibJS/Interpreter.h>
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/IDLEventListener.h>
#include <LibWeb/DOM/ShadowRoot.h>
@ -331,86 +331,86 @@ void HTMLElement::blur()
// User agents may selectively or uniformly ignore calls to this method for usability reasons.
}
Optional<DOM::ARIARoles::Role> HTMLElement::default_role() const
Optional<ARIA::Role> HTMLElement::default_role() const
{
// https://www.w3.org/TR/html-aria/#el-article
if (local_name() == TagNames::article)
return DOM::ARIARoles::Role::article;
return ARIA::Role::article;
// https://www.w3.org/TR/html-aria/#el-aside
if (local_name() == TagNames::aside)
return DOM::ARIARoles::Role::complementary;
return ARIA::Role::complementary;
// https://www.w3.org/TR/html-aria/#el-b
if (local_name() == TagNames::b)
return DOM::ARIARoles::Role::generic;
return ARIA::Role::generic;
// https://www.w3.org/TR/html-aria/#el-bdi
if (local_name() == TagNames::bdi)
return DOM::ARIARoles::Role::generic;
return ARIA::Role::generic;
// https://www.w3.org/TR/html-aria/#el-bdo
if (local_name() == TagNames::bdo)
return DOM::ARIARoles::Role::generic;
return ARIA::Role::generic;
// https://www.w3.org/TR/html-aria/#el-code
if (local_name() == TagNames::code)
return DOM::ARIARoles::Role::code;
return ARIA::Role::code;
// https://www.w3.org/TR/html-aria/#el-dfn
if (local_name() == TagNames::dfn)
return DOM::ARIARoles::Role::term;
return ARIA::Role::term;
// https://www.w3.org/TR/html-aria/#el-em
if (local_name() == TagNames::em)
return DOM::ARIARoles::Role::emphasis;
return ARIA::Role::emphasis;
// https://www.w3.org/TR/html-aria/#el-figure
if (local_name() == TagNames::figure)
return DOM::ARIARoles::Role::figure;
return ARIA::Role::figure;
// https://www.w3.org/TR/html-aria/#el-footer
if (local_name() == TagNames::footer) {
// TODO: If not a descendant of an article, aside, main, nav or section element, or an element with role=article, complementary, main, navigation or region then role=contentinfo
// Otherwise, role=generic
return DOM::ARIARoles::Role::generic;
return ARIA::Role::generic;
}
// https://www.w3.org/TR/html-aria/#el-header
if (local_name() == TagNames::header) {
// TODO: If not a descendant of an article, aside, main, nav or section element, or an element with role=article, complementary, main, navigation or region then role=banner
// Otherwise, role=generic
return DOM::ARIARoles::Role::generic;
return ARIA::Role::generic;
}
// https://www.w3.org/TR/html-aria/#el-hgroup
if (local_name() == TagNames::hgroup)
return DOM::ARIARoles::Role::generic;
return ARIA::Role::generic;
// https://www.w3.org/TR/html-aria/#el-i
if (local_name() == TagNames::i)
return DOM::ARIARoles::Role::generic;
return ARIA::Role::generic;
// https://www.w3.org/TR/html-aria/#el-main
if (local_name() == TagNames::main)
return DOM::ARIARoles::Role::main;
return ARIA::Role::main;
// https://www.w3.org/TR/html-aria/#el-nav
if (local_name() == TagNames::nav)
return DOM::ARIARoles::Role::navigation;
return ARIA::Role::navigation;
// https://www.w3.org/TR/html-aria/#el-samp
if (local_name() == TagNames::samp)
return DOM::ARIARoles::Role::generic;
return ARIA::Role::generic;
// https://www.w3.org/TR/html-aria/#el-section
if (local_name() == TagNames::section) {
// TODO: role=region if the section element has an accessible name
// Otherwise, no corresponding role
return DOM::ARIARoles::Role::region;
return ARIA::Role::region;
}
// https://www.w3.org/TR/html-aria/#el-small
if (local_name() == TagNames::small)
return DOM::ARIARoles::Role::generic;
return ARIA::Role::generic;
// https://www.w3.org/TR/html-aria/#el-strong
if (local_name() == TagNames::strong)
return DOM::ARIARoles::Role::strong;
return ARIA::Role::strong;
// https://www.w3.org/TR/html-aria/#el-sub
if (local_name() == TagNames::sub)
return DOM::ARIARoles::Role::subscript;
return ARIA::Role::subscript;
// https://www.w3.org/TR/html-aria/#el-summary
if (local_name() == TagNames::summary)
return DOM::ARIARoles::Role::button;
return ARIA::Role::button;
// https://www.w3.org/TR/html-aria/#el-sup
if (local_name() == TagNames::sup)
return DOM::ARIARoles::Role::superscript;
return ARIA::Role::superscript;
// https://www.w3.org/TR/html-aria/#el-u
if (local_name() == TagNames::u)
return DOM::ARIARoles::Role::generic;
return ARIA::Role::generic;
return {};
}

2
Userland/Libraries/LibWeb/HTML/HTMLElement.h
View File

@ -59,7 +59,7 @@ public:
// https://html.spec.whatwg.org/multipage/forms.html#category-label
virtual bool is_labelable() const { return false; }
virtual Optional<DOM::ARIARoles::Role> default_role() const override;
virtual Optional<ARIA::Role> default_role() const override;
protected:
HTMLElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLFieldSetElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/FormAssociatedElement.h>
#include <LibWeb/HTML/HTMLElement.h>
@ -36,7 +36,7 @@ public:
// https://html.spec.whatwg.org/multipage/forms.html#category-autocapitalize
virtual bool is_auto_capitalize_inheriting() const override { return true; }
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::group; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::group; }
private:
HTMLFieldSetElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLFormElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
#include <LibWeb/HTML/HTMLInputElement.h>
@ -38,7 +38,7 @@ public:
unsigned length() const;
// https://www.w3.org/TR/html-aria/#el-form
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::form; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::form; }
private:
HTMLFormElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLHRElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -18,7 +18,7 @@ public:
virtual ~HTMLHRElement() override;
// https://www.w3.org/TR/html-aria/#el-hr
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::separator; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::separator; }
private:
HTMLHRElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLHeadingElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -20,7 +20,7 @@ public:
virtual void apply_presentational_hints(CSS::StyleProperties&) const override;
// https://www.w3.org/TR/html-aria/#el-h1-h6
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::heading; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::heading; }
virtual DeprecatedString aria_level() const override
{

4
Userland/Libraries/LibWeb/HTML/HTMLHtmlElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -20,7 +20,7 @@ public:
bool should_use_body_background_properties() const;
// https://www.w3.org/TR/html-aria/#el-html
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::document; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::document; }
private:
HTMLHtmlElement(DOM::Document&, DOM::QualifiedName);

8
Userland/Libraries/LibWeb/HTML/HTMLImageElement.cpp
View File

@ -5,9 +5,9 @@
*/
#include <LibGfx/Bitmap.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/CSS/Parser/Parser.h>
#include <LibWeb/CSS/StyleComputer.h>
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/Event.h>
#include <LibWeb/HTML/EventNames.h>
@ -204,14 +204,14 @@ bool HTMLImageElement::complete() const
return false;
}
Optional<DOM::ARIARoles::Role> HTMLImageElement::default_role() const
Optional<ARIA::Role> HTMLImageElement::default_role() const
{
// https://www.w3.org/TR/html-aria/#el-img
// https://www.w3.org/TR/html-aria/#el-img-no-alt
if (alt().is_null() || !alt().is_empty())
return DOM::ARIARoles::Role::img;
return ARIA::Role::img;
// https://www.w3.org/TR/html-aria/#el-img-empty-alt
return DOM::ARIARoles::Role::presentation;
return ARIA::Role::presentation;
}
}

2
Userland/Libraries/LibWeb/HTML/HTMLImageElement.h
View File

@ -43,7 +43,7 @@ public:
// https://html.spec.whatwg.org/multipage/embedded-content.html#dom-img-complete
bool complete() const;
virtual Optional<DOM::ARIARoles::Role> default_role() const override;
virtual Optional<ARIA::Role> default_role() const override;
private:
HTMLImageElement(DOM::Document&, DOM::QualifiedName);

30
Userland/Libraries/LibWeb/HTML/HTMLInputElement.cpp
View File

@ -872,32 +872,32 @@ WebIDL::ExceptionOr<void> HTMLInputElement::set_selection_range(u32 start, u32 e
return {};
}
Optional<DOM::ARIARoles::Role> HTMLInputElement::default_role() const
Optional<ARIA::Role> HTMLInputElement::default_role() const
{
// https://www.w3.org/TR/html-aria/#el-input-button
if (type_state() == TypeAttributeState::Button)
return DOM::ARIARoles::Role::button;
return ARIA::Role::button;
// https://www.w3.org/TR/html-aria/#el-input-checkbox
if (type_state() == TypeAttributeState::Checkbox)
return DOM::ARIARoles::Role::checkbox;
return ARIA::Role::checkbox;
// https://www.w3.org/TR/html-aria/#el-input-email
if (type_state() == TypeAttributeState::Email && attribute("list").is_null())
return DOM::ARIARoles::Role::textbox;
return ARIA::Role::textbox;
// https://www.w3.org/TR/html-aria/#el-input-image
if (type_state() == TypeAttributeState::ImageButton)
return DOM::ARIARoles::Role::button;
return ARIA::Role::button;
// https://www.w3.org/TR/html-aria/#el-input-number
if (type_state() == TypeAttributeState::Number)
return DOM::ARIARoles::Role::spinbutton;
return ARIA::Role::spinbutton;
// https://www.w3.org/TR/html-aria/#el-input-radio
if (type_state() == TypeAttributeState::RadioButton)
return DOM::ARIARoles::Role::radio;
return ARIA::Role::radio;
// https://www.w3.org/TR/html-aria/#el-input-range
if (type_state() == TypeAttributeState::Range)
return DOM::ARIARoles::Role::slider;
return ARIA::Role::slider;
// https://www.w3.org/TR/html-aria/#el-input-reset
if (type_state() == TypeAttributeState::ResetButton)
return DOM::ARIARoles::Role::button;
return ARIA::Role::button;
// https://www.w3.org/TR/html-aria/#el-input-text-list
if ((type_state() == TypeAttributeState::Text
|| type_state() == TypeAttributeState::Search
@ -905,22 +905,22 @@ Optional<DOM::ARIARoles::Role> HTMLInputElement::default_role() const
|| type_state() == TypeAttributeState::URL
|| type_state() == TypeAttributeState::Email)
&& !attribute("list").is_null())
return DOM::ARIARoles::Role::combobox;
return ARIA::Role::combobox;
// https://www.w3.org/TR/html-aria/#el-input-search
if (type_state() == TypeAttributeState::Search && attribute("list").is_null())
return DOM::ARIARoles::Role::textbox;
return ARIA::Role::textbox;
// https://www.w3.org/TR/html-aria/#el-input-submit
if (type_state() == TypeAttributeState::SubmitButton)
return DOM::ARIARoles::Role::button;
return ARIA::Role::button;
// https://www.w3.org/TR/html-aria/#el-input-tel
if (type_state() == TypeAttributeState::Telephone)
return DOM::ARIARoles::Role::textbox;
return ARIA::Role::textbox;
// https://www.w3.org/TR/html-aria/#el-input-text
if (type_state() == TypeAttributeState::Text && attribute("list").is_null())
return DOM::ARIARoles::Role::textbox;
return ARIA::Role::textbox;
// https://www.w3.org/TR/html-aria/#el-input-url
if (type_state() == TypeAttributeState::URL && attribute("list").is_null())
return DOM::ARIARoles::Role::textbox;
return ARIA::Role::textbox;
// https://www.w3.org/TR/html-aria/#el-input-color
// https://www.w3.org/TR/html-aria/#el-input-date

2
Userland/Libraries/LibWeb/HTML/HTMLInputElement.h
View File

@ -120,7 +120,7 @@ public:
// https://html.spec.whatwg.org/multipage/forms.html#category-label
virtual bool is_labelable() const override { return type_state() != TypeAttributeState::Hidden; }
virtual Optional<DOM::ARIARoles::Role> default_role() const override;
virtual Optional<ARIA::Role> default_role() const override;
private:
HTMLInputElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLLIElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -18,7 +18,7 @@ public:
virtual ~HTMLLIElement() override;
// https://www.w3.org/TR/html-aria/#el-li
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::listitem; };
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::listitem; };
private:
HTMLLIElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLMenuElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -18,7 +18,7 @@ public:
virtual ~HTMLMenuElement() override;
// https://www.w3.org/TR/html-aria/#el-menu
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::list; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::list; }
private:
HTMLMenuElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLMeterElement.h
View File

@ -7,7 +7,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -23,7 +23,7 @@ public:
virtual bool is_labelable() const override { return true; }
// https://www.w3.org/TR/html-aria/#el-meter
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::meter; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::meter; }
private:
HTMLMeterElement(DOM::Document&, DOM::QualifiedName);

6
Userland/Libraries/LibWeb/HTML/HTMLModElement.cpp
View File

@ -25,14 +25,14 @@ JS::ThrowCompletionOr<void> HTMLModElement::initialize(JS::Realm& realm)
return {};
}
Optional<DOM::ARIARoles::Role> HTMLModElement::default_role() const
Optional<ARIA::Role> HTMLModElement::default_role() const
{
// https://www.w3.org/TR/html-aria/#el-del
if (local_name() == TagNames::del)
return DOM::ARIARoles::Role::deletion;
return ARIA::Role::deletion;
// https://www.w3.org/TR/html-aria/#el-ins
if (local_name() == TagNames::ins)
return DOM::ARIARoles::Role::insertion;
return ARIA::Role::insertion;
VERIFY_NOT_REACHED();
}

4
Userland/Libraries/LibWeb/HTML/HTMLModElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -17,7 +17,7 @@ class HTMLModElement final : public HTMLElement {
public:
virtual ~HTMLModElement() override;
virtual Optional<DOM::ARIARoles::Role> default_role() const override;
virtual Optional<ARIA::Role> default_role() const override;
private:
HTMLModElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLOListElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -18,7 +18,7 @@ public:
virtual ~HTMLOListElement() override;
// https://www.w3.org/TR/html-aria/#el-ol
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::list; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::list; }
private:
HTMLOListElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLOptGroupElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -18,7 +18,7 @@ public:
virtual ~HTMLOptGroupElement() override;
// https://www.w3.org/TR/html-aria/#el-optgroup
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::group; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::group; }
private:
HTMLOptGroupElement(DOM::Document&, DOM::QualifiedName);

6
Userland/Libraries/LibWeb/HTML/HTMLOptionElement.cpp
View File

@ -6,8 +6,8 @@
*/
#include <AK/StringBuilder.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/Bindings/Intrinsics.h>
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/DOM/Node.h>
#include <LibWeb/DOM/Text.h>
#include <LibWeb/HTML/HTMLOptGroupElement.h>
@ -148,11 +148,11 @@ bool HTMLOptionElement::disabled() const
|| (parent() && is<HTMLOptGroupElement>(parent()) && static_cast<HTMLOptGroupElement const&>(*parent()).has_attribute(AttributeNames::disabled));
}
Optional<DOM::ARIARoles::Role> HTMLOptionElement::default_role() const
Optional<ARIA::Role> HTMLOptionElement::default_role() const
{
// https://www.w3.org/TR/html-aria/#el-option
// TODO: Only an option element that is in a list of options or that represents a suggestion in a datalist should return option
return DOM::ARIARoles::Role::option;
return ARIA::Role::option;
}
}

2
Userland/Libraries/LibWeb/HTML/HTMLOptionElement.h
View File

@ -30,7 +30,7 @@ public:
bool disabled() const;
virtual Optional<DOM::ARIARoles::Role> default_role() const override;
virtual Optional<ARIA::Role> default_role() const override;
private:
friend class Bindings::OptionConstructor;

4
Userland/Libraries/LibWeb/HTML/HTMLOutputElement.h
View File

@ -7,7 +7,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/FormAssociatedElement.h>
#include <LibWeb/HTML/HTMLElement.h>
@ -45,7 +45,7 @@ public:
virtual void reset_algorithm() override;
// https://www.w3.org/TR/html-aria/#el-output
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::status; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::status; }
private:
HTMLOutputElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLParagraphElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -20,7 +20,7 @@ public:
virtual void apply_presentational_hints(CSS::StyleProperties&) const override;
// https://www.w3.org/TR/html-aria/#el-p
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::paragraph; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::paragraph; }
private:
HTMLParagraphElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLPreElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -18,7 +18,7 @@ public:
virtual ~HTMLPreElement() override;
// https://www.w3.org/TR/html-aria/#el-pre
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::generic; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::generic; }
private:
HTMLPreElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLProgressElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -34,7 +34,7 @@ public:
bool using_system_appearance() const;
// https://www.w3.org/TR/html-aria/#el-progress
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::progressbar; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::progressbar; }
private:
HTMLProgressElement(DOM::Document&, DOM::QualifiedName);

8
Userland/Libraries/LibWeb/HTML/HTMLQuoteElement.cpp
View File

@ -5,8 +5,8 @@
*/
#include <AK/Assertions.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/Bindings/Intrinsics.h>
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/HTML/HTMLQuoteElement.h>
namespace Web::HTML {
@ -26,14 +26,14 @@ JS::ThrowCompletionOr<void> HTMLQuoteElement::initialize(JS::Realm& realm)
return {};
}
Optional<DOM::ARIARoles::Role> HTMLQuoteElement::default_role() const
Optional<ARIA::Role> HTMLQuoteElement::default_role() const
{
// https://www.w3.org/TR/html-aria/#el-blockquote
if (local_name() == TagNames::blockquote)
return DOM::ARIARoles::Role::blockquote;
return ARIA::Role::blockquote;
// https://www.w3.org/TR/html-aria/#el-q
if (local_name() == TagNames::q)
return DOM::ARIARoles::Role::generic;
return ARIA::Role::generic;
VERIFY_NOT_REACHED();
}

2
Userland/Libraries/LibWeb/HTML/HTMLQuoteElement.h
View File

@ -16,7 +16,7 @@ class HTMLQuoteElement final : public HTMLElement {
public:
virtual ~HTMLQuoteElement() override;
virtual Optional<DOM::ARIARoles::Role> default_role() const override;
virtual Optional<ARIA::Role> default_role() const override;
private:
HTMLQuoteElement(DOM::Document&, DOM::QualifiedName);

8
Userland/Libraries/LibWeb/HTML/HTMLSelectElement.cpp
View File

@ -163,18 +163,18 @@ DeprecatedString const& HTMLSelectElement::type() const
return select_multiple;
}
Optional<DOM::ARIARoles::Role> HTMLSelectElement::default_role() const
Optional<ARIA::Role> HTMLSelectElement::default_role() const
{
// https://www.w3.org/TR/html-aria/#el-select-multiple-or-size-greater-1
if (has_attribute("multiple"))
return DOM::ARIARoles::Role::listbox;
return ARIA::Role::listbox;
if (has_attribute("size")) {
auto size_attribute = attribute("size").to_int();
if (size_attribute.has_value() && size_attribute.value() > 1)
return DOM::ARIARoles::Role::listbox;
return ARIA::Role::listbox;
}
// https://www.w3.org/TR/html-aria/#el-select
return DOM::ARIARoles::Role::combobox;
return ARIA::Role::combobox;
}
}

2
Userland/Libraries/LibWeb/HTML/HTMLSelectElement.h
View File

@ -60,7 +60,7 @@ public:
DeprecatedString const& type() const;
virtual Optional<DOM::ARIARoles::Role> default_role() const override;
virtual Optional<ARIA::Role> default_role() const override;
private:
HTMLSelectElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLSpanElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -18,7 +18,7 @@ public:
virtual ~HTMLSpanElement() override;
// https://www.w3.org/TR/html-aria/#el-span
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::generic; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::generic; }
private:
HTMLSpanElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLTableCaptionElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -20,7 +20,7 @@ public:
virtual void apply_presentational_hints(CSS::StyleProperties&) const override;
// https://www.w3.org/TR/html-aria/#el-caption
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::caption; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::caption; }
private:
HTMLTableCaptionElement(DOM::Document&, DOM::QualifiedName);

2
Userland/Libraries/LibWeb/HTML/HTMLTableCellElement.cpp
View File

@ -76,7 +76,7 @@ void HTMLTableCellElement::set_row_span(unsigned int value)
MUST(set_attribute(HTML::AttributeNames::rowspan, DeprecatedString::number(value)));
}
Optional<DOM::ARIARoles::Role> HTMLTableCellElement::default_role() const
Optional<ARIA::Role> HTMLTableCellElement::default_role() const
{
// TODO: For td:
// role=cell if the ancestor table element is exposed as a role=table

2
Userland/Libraries/LibWeb/HTML/HTMLTableCellElement.h
View File

@ -22,7 +22,7 @@ public:
void set_col_span(unsigned);
void set_row_span(unsigned);
virtual Optional<DOM::ARIARoles::Role> default_role() const override;
virtual Optional<ARIA::Role> default_role() const override;
private:
HTMLTableCellElement(DOM::Document&, DOM::QualifiedName);

2
Userland/Libraries/LibWeb/HTML/HTMLTableElement.h
View File

@ -43,7 +43,7 @@ public:
WebIDL::ExceptionOr<void> delete_row(long index);
// https://www.w3.org/TR/html-aria/#el-table
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::table; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::table; }
private:
HTMLTableElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLTableRowElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -25,7 +25,7 @@ public:
WebIDL::ExceptionOr<void> delete_cell(i32 index);
// https://www.w3.org/TR/html-aria/#el-tr
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::row; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::row; }
private:
HTMLTableRowElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLTableSectionElement.h
View File

@ -7,7 +7,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -25,7 +25,7 @@ public:
// https://www.w3.org/TR/html-aria/#el-tbody
// https://www.w3.org/TR/html-aria/#el-tfoot
// https://www.w3.org/TR/html-aria/#el-thead
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::rowgroup; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::rowgroup; }
private:
HTMLTableSectionElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLTextAreaElement.h
View File

@ -7,7 +7,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/FormAssociatedElement.h>
#include <LibWeb/HTML/HTMLElement.h>
@ -52,7 +52,7 @@ public:
virtual void reset_algorithm() override;
// https://www.w3.org/TR/html-aria/#el-textarea
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::textbox; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::textbox; }
private:
HTMLTextAreaElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLTimeElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -18,7 +18,7 @@ public:
virtual ~HTMLTimeElement() override;
// https://www.w3.org/TR/html-aria/#el-time
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::time; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::time; }
private:
HTMLTimeElement(DOM::Document&, DOM::QualifiedName);

4
Userland/Libraries/LibWeb/HTML/HTMLUListElement.h
View File

@ -6,7 +6,7 @@
#pragma once
#include <LibWeb/DOM/ARIARoles.h>
#include <LibWeb/ARIA/Roles.h>
#include <LibWeb/HTML/HTMLElement.h>
namespace Web::HTML {
@ -18,7 +18,7 @@ public:
virtual ~HTMLUListElement() override;
// https://www.w3.org/TR/html-aria/#el-ul
virtual Optional<DOM::ARIARoles::Role> default_role() const override { return DOM::ARIARoles::Role::list; }
virtual Optional<ARIA::Role> default_role() const override { return ARIA::Role::list; }
private:
HTMLUListElement(DOM::Document&, DOM::QualifiedName);

2
Userland/Services/WebContent/WebDriverConnection.cpp
View File

@ -1254,7 +1254,7 @@ Messages::WebDriverClient::GetComputedRoleResponse WebDriverConnection::get_comp
// 5. Return success with data role.
if (role.has_value())
return Web::DOM::ARIARoles::role_name(*role);
return Web::ARIA::role_name(*role);
return ""sv;
}