mirrors/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-22 17:24:48 -05:00
Code Issues Projects Releases Packages Wiki Activity

LibWeb: Add support for ARIA Graphics roles

Browse source 
This change adds support for the graphics-document, graphics-object, and
graphics-symbol ARIA roles from the WAI-ARIA Graphics Module spec at
https://w3c.github.io/graphics-aria/#role_definitions
This commit is contained in:
sideshowbarker 2024-12-26 09:56:56 +09:00 committed by Tim Flynn
parent fc956080e2
commit 8961d5d2ce
Notes: github-actions[bot] 2024-12-28 01:17:20 +00:00 
Author: https://github.com/sideshowbarker
Commit: https://github.com/LadybirdBrowser/ladybird/commit/8961d5d2ce3
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/3043
Reviewed-by: https://github.com/ADKaster ✅
Reviewed-by: https://github.com/trflynn89
6 changed files with 287 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

136
Libraries/LibWeb/ARIA/AriaRoles.json
View file

@ -4606,5 +4606,141 @@
"implicitValueForRole": { "implicitValueForRole": {
"aria-orientation": "AriaOrientation::Horizontal" "aria-orientation": "AriaOrientation::Horizontal"
} }
},
"GraphicsDocument": {
"specLink": "https://w3c.github.io/graphics-aria/#graphics-document",
"description": "A type of document in which the visual appearance or layout of content conveys meaning.",
"superClassRoles": [
"Document"
],
"supportedStates": [
"aria-busy",
"aria-current",
"aria-disabled",
"aria-grabbed",
"aria-hidden",
"aria-invalid"
],
"supportedProperties": [
"aria-atomic",
"aria-braillelabel",
"aria-brailleroledescription",
"aria-controls",
"aria-describedby",
"aria-description",
"aria-details",
"aria-dropeffect",
"aria-errormessage",
"aria-flowto",
"aria-haspopup",
"aria-keyshortcuts",
"aria-label",
"aria-labelledby",
"aria-live",
"aria-owns",
"aria-relevant",
"aria-roledescription"
],
"requiredStates": [],
"requiredProperties": [],
"prohibitedStates": [],
"prohibitedProperties": [],
"requiredContextRoles": [],
"requiredOwnedElements": [],
"nameFromSource": "Author",
"accessibleNameRequired": true,
"childrenArePresentational": false,
"implicitValueForRole": {}
},
"GraphicsObject": {
"specLink": "https://w3c.github.io/graphics-aria/#graphics-object",
"description": "A section of a graphics-document that represents a distinct object or sub-component with semantic meaning.",
"superClassRoles": [
"Group"
],
"supportedStates": [
"aria-busy",
"aria-current",
"aria-disabled",
"aria-grabbed",
"aria-hidden",
"aria-invalid"
],
"supportedProperties": [
"aria-activedescendant",
"aria-atomic",
"aria-braillelabel",
"aria-brailleroledescription",
"aria-controls",
"aria-describedby",
"aria-description",
"aria-details",
"aria-dropeffect",
"aria-errormessage",
"aria-flowto",
"aria-haspopup",
"aria-keyshortcuts",
"aria-label",
"aria-labelledby",
"aria-live",
"aria-owns",
"aria-relevant",
"aria-roledescription"
],
"requiredStates": [],
"requiredProperties": [],
"prohibitedStates": [],
"prohibitedProperties": [],
"requiredContextRoles": [],
"requiredOwnedElements": [],
"nameFromSource": "Author",
"accessibleNameRequired": false,
"childrenArePresentational": false,
"implicitValueForRole": {}
},
"GraphicsSymbol": {
"specLink": "https://w3c.github.io/graphics-aria/#graphics-symbol",
"description": "A graphical object used to convey a simple meaning or category, where the meaning is more important than the particular visual appearance.",
"superClassRoles": [
"Img"
],
"supportedStates": [
"aria-busy",
"aria-current",
"aria-disabled",
"aria-grabbed",
"aria-hidden",
"aria-invalid"
],
"supportedProperties": [
"aria-atomic",
"aria-braillelabel",
"aria-brailleroledescription",
"aria-controls",
"aria-describedby",
"aria-description",
"aria-details",
"aria-dropeffect",
"aria-errormessage",
"aria-flowto",
"aria-haspopup",
"aria-keyshortcuts",
"aria-label",
"aria-labelledby",
"aria-live",
"aria-owns",
"aria-relevant",
"aria-roledescription"
],
"requiredStates": [],
"requiredProperties": [],
"prohibitedStates": [],
"prohibitedProperties": [],
"requiredContextRoles": [],
"requiredOwnedElements": [],
"nameFromSource": "Author",
"accessibleNameRequired": true,
"childrenArePresentational": true,
"implicitValueForRole": {}
} }
} }

6
Libraries/LibWeb/ARIA/RoleType.cpp
View file

@ -202,6 +202,12 @@ ErrorOr<NonnullOwnPtr<RoleType>> RoleType::build_role_object(Role role, bool foc
return adopt_nonnull_own_or_enomem(new (nothrow) Form(data)); return adopt_nonnull_own_or_enomem(new (nothrow) Form(data));
case Role::generic: case Role::generic:
return adopt_nonnull_own_or_enomem(new (nothrow) Generic(data)); return adopt_nonnull_own_or_enomem(new (nothrow) Generic(data));
case Role::graphicsdocument:
return adopt_nonnull_own_or_enomem(new (nothrow) GraphicsDocument(data));
case Role::graphicsobject:
return adopt_nonnull_own_or_enomem(new (nothrow) GraphicsObject(data));
case Role::graphicssymbol:
return adopt_nonnull_own_or_enomem(new (nothrow) GraphicsSymbol(data));
case Role::grid: case Role::grid:
return adopt_nonnull_own_or_enomem(static_cast<Composite*>(new (nothrow) Grid(data))); return adopt_nonnull_own_or_enomem(static_cast<Composite*>(new (nothrow) Grid(data)));
case Role::gridcell: case Role::gridcell:

18
Libraries/LibWeb/ARIA/Roles.cpp
View file

@ -13,11 +13,11 @@ StringView role_name(Role role)
{ {
// Note: Role::switch_ is mapped to "switch" (due to C++ keyword clash) // Note: Role::switch_ is mapped to "switch" (due to C++ keyword clash)
switch (role) { switch (role) {
#define __ENUMERATE_ARIA_ROLE(name) \ #define __ENUMERATE_ARIA_ROLE(name, attribute) \
case Role::name: \ case Role::name: \
if constexpr (Role::name == Role::switch_) \ if constexpr (Role::name == Role::switch_) \
return "switch"sv; \ return "switch"sv; \
return #name##sv; return attribute##sv;
ENUMERATE_ARIA_ROLES ENUMERATE_ARIA_ROLES
#undef __ENUMERATE_ARIA_ROLE #undef __ENUMERATE_ARIA_ROLE
default: default:
@ -28,13 +28,13 @@ StringView role_name(Role role)
Optional<Role> role_from_string(StringView role_name) Optional<Role> role_from_string(StringView role_name)
{ {
// Note: "switch" is mapped to Role::switch_ (due to C++ keyword clash) // Note: "switch" is mapped to Role::switch_ (due to C++ keyword clash)
#define __ENUMERATE_ARIA_ROLE(name) \ #define __ENUMERATE_ARIA_ROLE(name, attribute) \
if constexpr (Role::name == Role::switch_) { \ if constexpr (Role::name == Role::switch_) { \
if (role_name.equals_ignoring_ascii_case("switch"sv)) \ if (role_name.equals_ignoring_ascii_case("switch"sv)) \
return Role::switch_; \ return Role::switch_; \
} else { \ } else { \
if (role_name.equals_ignoring_ascii_case(#name##sv)) \ if (role_name.equals_ignoring_ascii_case(attribute##sv)) \
return Role::name; \ return Role::name; \
} }
ENUMERATE_ARIA_ROLES ENUMERATE_ARIA_ROLES
#undef __ENUMERATE_ARIA_ROLE #undef __ENUMERATE_ARIA_ROLE

205
Libraries/LibWeb/ARIA/Roles.h
View file

@ -11,109 +11,112 @@
namespace Web::ARIA { namespace Web::ARIA {
#define ENUMERATE_ARIA_ROLES \ #define ENUMERATE_ARIA_ROLES \
__ENUMERATE_ARIA_ROLE(alert) \ __ENUMERATE_ARIA_ROLE(alert, "alert") \
__ENUMERATE_ARIA_ROLE(alertdialog) \ __ENUMERATE_ARIA_ROLE(alertdialog, "alertdialog") \
__ENUMERATE_ARIA_ROLE(application) \ __ENUMERATE_ARIA_ROLE(application, "application") \
__ENUMERATE_ARIA_ROLE(article) \ __ENUMERATE_ARIA_ROLE(article, "article") \
__ENUMERATE_ARIA_ROLE(banner) \ __ENUMERATE_ARIA_ROLE(banner, "banner") \
__ENUMERATE_ARIA_ROLE(blockquote) \ __ENUMERATE_ARIA_ROLE(blockquote, "blockquote") \
__ENUMERATE_ARIA_ROLE(button) \ __ENUMERATE_ARIA_ROLE(button, "button") \
__ENUMERATE_ARIA_ROLE(caption) \ __ENUMERATE_ARIA_ROLE(caption, "caption") \
__ENUMERATE_ARIA_ROLE(cell) \ __ENUMERATE_ARIA_ROLE(cell, "cell") \
__ENUMERATE_ARIA_ROLE(checkbox) \ __ENUMERATE_ARIA_ROLE(checkbox, "checkbox") \
__ENUMERATE_ARIA_ROLE(code) \ __ENUMERATE_ARIA_ROLE(code, "code") \
__ENUMERATE_ARIA_ROLE(columnheader) \ __ENUMERATE_ARIA_ROLE(columnheader, "columnheader") \
__ENUMERATE_ARIA_ROLE(combobox) \ __ENUMERATE_ARIA_ROLE(combobox, "combobox") \
__ENUMERATE_ARIA_ROLE(command) \ __ENUMERATE_ARIA_ROLE(command, "command") \
__ENUMERATE_ARIA_ROLE(complementary) \ __ENUMERATE_ARIA_ROLE(complementary, "complementary") \
__ENUMERATE_ARIA_ROLE(composite) \ __ENUMERATE_ARIA_ROLE(composite, "composite") \
__ENUMERATE_ARIA_ROLE(contentinfo) \ __ENUMERATE_ARIA_ROLE(contentinfo, "contentinfo") \
__ENUMERATE_ARIA_ROLE(definition) \ __ENUMERATE_ARIA_ROLE(definition, "definition") \
__ENUMERATE_ARIA_ROLE(deletion) \ __ENUMERATE_ARIA_ROLE(deletion, "deletion") \
__ENUMERATE_ARIA_ROLE(dialog) \ __ENUMERATE_ARIA_ROLE(dialog, "dialog") \
__ENUMERATE_ARIA_ROLE(directory) \ __ENUMERATE_ARIA_ROLE(directory, "directory") \
__ENUMERATE_ARIA_ROLE(document) \ __ENUMERATE_ARIA_ROLE(document, "document") \
__ENUMERATE_ARIA_ROLE(emphasis) \ __ENUMERATE_ARIA_ROLE(emphasis, "emphasis") \
__ENUMERATE_ARIA_ROLE(feed) \ __ENUMERATE_ARIA_ROLE(feed, "feed") \
__ENUMERATE_ARIA_ROLE(figure) \ __ENUMERATE_ARIA_ROLE(figure, "figure") \
__ENUMERATE_ARIA_ROLE(form) \ __ENUMERATE_ARIA_ROLE(form, "form") \
__ENUMERATE_ARIA_ROLE(generic) \ __ENUMERATE_ARIA_ROLE(generic, "generic") \
__ENUMERATE_ARIA_ROLE(grid) \ __ENUMERATE_ARIA_ROLE(graphicsdocument, "graphics-document") \
__ENUMERATE_ARIA_ROLE(gridcell) \ __ENUMERATE_ARIA_ROLE(graphicsobject, "graphics-object") \
__ENUMERATE_ARIA_ROLE(group) \ __ENUMERATE_ARIA_ROLE(graphicssymbol, "graphics-symbol") \
__ENUMERATE_ARIA_ROLE(heading) \ __ENUMERATE_ARIA_ROLE(grid, "grid") \
__ENUMERATE_ARIA_ROLE(image) \ __ENUMERATE_ARIA_ROLE(gridcell, "gridcell") \
__ENUMERATE_ARIA_ROLE(img) \ __ENUMERATE_ARIA_ROLE(group, "group") \
__ENUMERATE_ARIA_ROLE(input) \ __ENUMERATE_ARIA_ROLE(heading, "heading") \
__ENUMERATE_ARIA_ROLE(insertion) \ __ENUMERATE_ARIA_ROLE(image, "image") \
__ENUMERATE_ARIA_ROLE(landmark) \ __ENUMERATE_ARIA_ROLE(img, "img") \
__ENUMERATE_ARIA_ROLE(link) \ __ENUMERATE_ARIA_ROLE(input, "input") \
__ENUMERATE_ARIA_ROLE(list) \ __ENUMERATE_ARIA_ROLE(insertion, "insertion") \
__ENUMERATE_ARIA_ROLE(listbox) \ __ENUMERATE_ARIA_ROLE(landmark, "landmark") \
__ENUMERATE_ARIA_ROLE(listitem) \ __ENUMERATE_ARIA_ROLE(link, "link") \
__ENUMERATE_ARIA_ROLE(log) \ __ENUMERATE_ARIA_ROLE(list, "list") \
__ENUMERATE_ARIA_ROLE(main) \ __ENUMERATE_ARIA_ROLE(listbox, "listbox") \
__ENUMERATE_ARIA_ROLE(mark) \ __ENUMERATE_ARIA_ROLE(listitem, "listitem") \
__ENUMERATE_ARIA_ROLE(marquee) \ __ENUMERATE_ARIA_ROLE(log, "log") \
__ENUMERATE_ARIA_ROLE(math) \ __ENUMERATE_ARIA_ROLE(main, "main") \
__ENUMERATE_ARIA_ROLE(meter) \ __ENUMERATE_ARIA_ROLE(mark, "mark") \
__ENUMERATE_ARIA_ROLE(menu) \ __ENUMERATE_ARIA_ROLE(marquee, "marquee") \
__ENUMERATE_ARIA_ROLE(menubar) \ __ENUMERATE_ARIA_ROLE(math, "math") \
__ENUMERATE_ARIA_ROLE(menuitem) \ __ENUMERATE_ARIA_ROLE(meter, "meter") \
__ENUMERATE_ARIA_ROLE(menuitemcheckbox) \ __ENUMERATE_ARIA_ROLE(menu, "menu") \
__ENUMERATE_ARIA_ROLE(menuitemradio) \ __ENUMERATE_ARIA_ROLE(menubar, "menubar") \
__ENUMERATE_ARIA_ROLE(navigation) \ __ENUMERATE_ARIA_ROLE(menuitem, "menuitem") \
__ENUMERATE_ARIA_ROLE(none) \ __ENUMERATE_ARIA_ROLE(menuitemcheckbox, "menuitemcheckbox") \
__ENUMERATE_ARIA_ROLE(note) \ __ENUMERATE_ARIA_ROLE(menuitemradio, "menuitemradio") \
__ENUMERATE_ARIA_ROLE(option) \ __ENUMERATE_ARIA_ROLE(navigation, "navigation") \
__ENUMERATE_ARIA_ROLE(paragraph) \ __ENUMERATE_ARIA_ROLE(none, "none") \
__ENUMERATE_ARIA_ROLE(presentation) \ __ENUMERATE_ARIA_ROLE(note, "note") \
__ENUMERATE_ARIA_ROLE(progressbar) \ __ENUMERATE_ARIA_ROLE(option, "option") \
__ENUMERATE_ARIA_ROLE(radio) \ __ENUMERATE_ARIA_ROLE(paragraph, "paragraph") \
__ENUMERATE_ARIA_ROLE(radiogroup) \ __ENUMERATE_ARIA_ROLE(presentation, "presentation") \
__ENUMERATE_ARIA_ROLE(range) \ __ENUMERATE_ARIA_ROLE(progressbar, "progressbar") \
__ENUMERATE_ARIA_ROLE(region) \ __ENUMERATE_ARIA_ROLE(radio, "radio") \
__ENUMERATE_ARIA_ROLE(roletype) \ __ENUMERATE_ARIA_ROLE(radiogroup, "radiogroup") \
__ENUMERATE_ARIA_ROLE(row) \ __ENUMERATE_ARIA_ROLE(range, "range") \
__ENUMERATE_ARIA_ROLE(rowgroup) \ __ENUMERATE_ARIA_ROLE(region, "region") \
__ENUMERATE_ARIA_ROLE(rowheader) \ __ENUMERATE_ARIA_ROLE(roletype, "roletype") \
__ENUMERATE_ARIA_ROLE(scrollbar) \ __ENUMERATE_ARIA_ROLE(row, "row") \
__ENUMERATE_ARIA_ROLE(search) \ __ENUMERATE_ARIA_ROLE(rowgroup, "rowgroup") \
__ENUMERATE_ARIA_ROLE(searchbox) \ __ENUMERATE_ARIA_ROLE(rowheader, "rowheader") \
__ENUMERATE_ARIA_ROLE(section) \ __ENUMERATE_ARIA_ROLE(scrollbar, "scrollbar") \
__ENUMERATE_ARIA_ROLE(sectionfooter) \ __ENUMERATE_ARIA_ROLE(search, "search") \
__ENUMERATE_ARIA_ROLE(sectionhead) \ __ENUMERATE_ARIA_ROLE(searchbox, "searchbox") \
__ENUMERATE_ARIA_ROLE(sectionheader) \ __ENUMERATE_ARIA_ROLE(section, "section") \
__ENUMERATE_ARIA_ROLE(select) \ __ENUMERATE_ARIA_ROLE(sectionfooter, "sectionfooter") \
__ENUMERATE_ARIA_ROLE(separator) \ __ENUMERATE_ARIA_ROLE(sectionhead, "sectionhead") \
__ENUMERATE_ARIA_ROLE(slider) \ __ENUMERATE_ARIA_ROLE(sectionheader, "sectionheader") \
__ENUMERATE_ARIA_ROLE(spinbutton) \ __ENUMERATE_ARIA_ROLE(select, "select") \
__ENUMERATE_ARIA_ROLE(status) \ __ENUMERATE_ARIA_ROLE(separator, "separator") \
__ENUMERATE_ARIA_ROLE(strong) \ __ENUMERATE_ARIA_ROLE(slider, "slider") \
__ENUMERATE_ARIA_ROLE(structure) \ __ENUMERATE_ARIA_ROLE(spinbutton, "spinbutton") \
__ENUMERATE_ARIA_ROLE(subscript) \ __ENUMERATE_ARIA_ROLE(status, "status") \
__ENUMERATE_ARIA_ROLE(suggestion) \ __ENUMERATE_ARIA_ROLE(strong, "strong") \
__ENUMERATE_ARIA_ROLE(superscript) \ __ENUMERATE_ARIA_ROLE(structure, "structure") \
__ENUMERATE_ARIA_ROLE(switch_) \ __ENUMERATE_ARIA_ROLE(subscript, "subscript") \
__ENUMERATE_ARIA_ROLE(tab) \ __ENUMERATE_ARIA_ROLE(suggestion, "suggestion") \
__ENUMERATE_ARIA_ROLE(table) \ __ENUMERATE_ARIA_ROLE(superscript, "superscript") \
__ENUMERATE_ARIA_ROLE(tablist) \ __ENUMERATE_ARIA_ROLE(switch_, "switch_") \
__ENUMERATE_ARIA_ROLE(tabpanel) \ __ENUMERATE_ARIA_ROLE(tab, "tab") \
__ENUMERATE_ARIA_ROLE(term) \ __ENUMERATE_ARIA_ROLE(table, "table") \
__ENUMERATE_ARIA_ROLE(textbox) \ __ENUMERATE_ARIA_ROLE(tablist, "tablist") \
__ENUMERATE_ARIA_ROLE(time) \ __ENUMERATE_ARIA_ROLE(tabpanel, "tabpanel") \
__ENUMERATE_ARIA_ROLE(timer) \ __ENUMERATE_ARIA_ROLE(term, "term") \
__ENUMERATE_ARIA_ROLE(toolbar) \ __ENUMERATE_ARIA_ROLE(textbox, "textbox") \
__ENUMERATE_ARIA_ROLE(tooltip) \ __ENUMERATE_ARIA_ROLE(time, "time") \
__ENUMERATE_ARIA_ROLE(tree) \ __ENUMERATE_ARIA_ROLE(timer, "timer") \
__ENUMERATE_ARIA_ROLE(treegrid) \ __ENUMERATE_ARIA_ROLE(toolbar, "toolbar") \
__ENUMERATE_ARIA_ROLE(treeitem) \ __ENUMERATE_ARIA_ROLE(tooltip, "tooltip") \
__ENUMERATE_ARIA_ROLE(widget) \ __ENUMERATE_ARIA_ROLE(tree, "tree") \
__ENUMERATE_ARIA_ROLE(window) __ENUMERATE_ARIA_ROLE(treegrid, "treegrid") \
__ENUMERATE_ARIA_ROLE(treeitem, "treeitem") \
__ENUMERATE_ARIA_ROLE(widget, "widget") \
__ENUMERATE_ARIA_ROLE(window, "window")
enum class Role { enum class Role {
#define __ENUMERATE_ARIA_ROLE(name) name, #define __ENUMERATE_ARIA_ROLE(name, attribute) name,
ENUMERATE_ARIA_ROLES ENUMERATE_ARIA_ROLES
#undef __ENUMERATE_ARIA_ROLE #undef __ENUMERATE_ARIA_ROLE
}; };

8
Tests/LibWeb/Text/expected/wpt-import/graphics-aria/graphics-roles.txt Normal file
View file

@ -0,0 +1,8 @@
Harness status: OK
Found 3 tests
3 Pass
Pass graphics-document
Pass graphics-object
Pass graphics-symbol

24
Tests/LibWeb/Text/input/wpt-import/graphics-aria/graphics-roles.html Normal file
View file

@ -0,0 +1,24 @@
<!doctype html>
<html>
<head>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="../resources/testdriver.js"></script>
<script src="../resources/testdriver-vendor.js"></script>
<script src="../resources/testdriver-actions.js"></script>
<script src="../wai-aria/scripts/aria-utils.js"></script>
</head>
<body>
<p>Tests the concrete roles defined in the <a href="https://www.w3.org/TR/graphics-aria-1.0/#role_definitions">ARIA Graphics Module</a> role definitions.</p>
<div role="graphics-document" data-expectedrole="graphics-document" class="ex">x</div>
<div role="graphics-object" data-expectedrole="graphics-object" class="ex">x</div>
<div role="graphics-symbol" data-expectedrole="graphics-symbol" class="ex">x</div>
<script>
AriaUtils.verifyRolesBySelector(".ex");
</script>
</body>
</html>