mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 02:37:36 +00:00
LibWeb: Replace ARIA role static FlyStrings with an enum
This replaces the FlyStrings for ARIA roles that were constructed in a [[gnu::constructor]] with a single enum. I came across this as the DOM inspector was crashing due to a null FlyString for an ARIA role. After fixing that, I was confused as to why these roles were not an enum. Looking at the spec there's a fixed list of roles and switching from references to static strings to an enum was pretty much an exercise in find and replace :). No functional changes (outside of fixing the mentioned crash).
This commit is contained in:
parent
f23eba1ba8
commit
890b4d7980
59 changed files with 344 additions and 327 deletions
172
Userland/Libraries/LibWeb/DOM/ARIARoles.cpp
Normal file
172
Userland/Libraries/LibWeb/DOM/ARIARoles.cpp
Normal file
|
@ -0,0 +1,172 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Jonah Shafran <jonahshafran@gmail.com>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <AK/GenericShorthands.h>
|
||||
#include <LibWeb/DOM/ARIARoles.h>
|
||||
|
||||
namespace Web::DOM::ARIARoles {
|
||||
|
||||
StringView role_name(Role role)
|
||||
{
|
||||
switch (role) {
|
||||
#define __ENUMERATE_ARIA_ROLE(name) \
|
||||
case Role::name: \
|
||||
return #name##sv;
|
||||
ENUMERATE_ARIA_ROLES
|
||||
#undef __ENUMERATE_ARIA_ROLE
|
||||
default:
|
||||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
}
|
||||
|
||||
Optional<Role> from_string(StringView role_name)
|
||||
{
|
||||
#define __ENUMERATE_ARIA_ROLE(name) \
|
||||
if (role_name.equals_ignoring_case(#name##sv)) \
|
||||
return Role::name;
|
||||
ENUMERATE_ARIA_ROLES
|
||||
#undef __ENUMERATE_ARIA_ROLE
|
||||
return {};
|
||||
}
|
||||
|
||||
// https://www.w3.org/TR/wai-aria-1.2/#abstract_roles
|
||||
bool is_abstract_aria_role(Role role)
|
||||
{
|
||||
return first_is_one_of(role,
|
||||
Role::command,
|
||||
Role::composite,
|
||||
Role::input,
|
||||
Role::landmark,
|
||||
Role::range,
|
||||
Role::roletype,
|
||||
Role::section,
|
||||
Role::sectionhead,
|
||||
Role::select,
|
||||
Role::structure,
|
||||
Role::widget,
|
||||
Role::window);
|
||||
}
|
||||
|
||||
// https://www.w3.org/TR/wai-aria-1.2/#widget_roles
|
||||
bool is_widget_aria_role(Role role)
|
||||
{
|
||||
return first_is_one_of(role,
|
||||
Role::button,
|
||||
Role::checkbox,
|
||||
Role::gridcell,
|
||||
Role::link,
|
||||
Role::menuitem,
|
||||
Role::menuitemcheckbox,
|
||||
Role::option,
|
||||
Role::progressbar,
|
||||
Role::radio,
|
||||
Role::scrollbar,
|
||||
Role::searchbox,
|
||||
Role::separator, // TODO: Only when focusable
|
||||
Role::slider,
|
||||
Role::spinbutton,
|
||||
Role::switch_,
|
||||
Role::tab,
|
||||
Role::tabpanel,
|
||||
Role::textbox,
|
||||
Role::treeitem,
|
||||
Role::combobox,
|
||||
Role::grid,
|
||||
Role::listbox,
|
||||
Role::menu,
|
||||
Role::menubar,
|
||||
Role::radiogroup,
|
||||
Role::tablist,
|
||||
Role::tree,
|
||||
Role::treegrid);
|
||||
}
|
||||
|
||||
// https://www.w3.org/TR/wai-aria-1.2/#document_structure_roles
|
||||
bool is_document_structure_aria_role(Role role)
|
||||
{
|
||||
return first_is_one_of(role,
|
||||
Role::application,
|
||||
Role::article,
|
||||
Role::blockquote,
|
||||
Role::caption,
|
||||
Role::cell,
|
||||
Role::columnheader,
|
||||
Role::definition,
|
||||
Role::deletion,
|
||||
Role::directory,
|
||||
Role::document,
|
||||
Role::emphasis,
|
||||
Role::feed,
|
||||
Role::figure,
|
||||
Role::generic,
|
||||
Role::group,
|
||||
Role::heading,
|
||||
Role::img,
|
||||
Role::insertion,
|
||||
Role::list,
|
||||
Role::listitem,
|
||||
Role::math,
|
||||
Role::meter,
|
||||
Role::none,
|
||||
Role::note,
|
||||
Role::paragraph,
|
||||
Role::presentation,
|
||||
Role::row,
|
||||
Role::rowgroup,
|
||||
Role::rowheader,
|
||||
Role::separator, // TODO: Only when not focusable
|
||||
Role::strong,
|
||||
Role::subscript,
|
||||
Role::table,
|
||||
Role::term,
|
||||
Role::time,
|
||||
Role::toolbar,
|
||||
Role::tooltip);
|
||||
}
|
||||
|
||||
// https://www.w3.org/TR/wai-aria-1.2/#landmark_roles
|
||||
bool is_landmark_aria_role(Role role)
|
||||
{
|
||||
return first_is_one_of(role,
|
||||
Role::banner,
|
||||
Role::complementary,
|
||||
Role::contentinfo,
|
||||
Role::form,
|
||||
Role::main,
|
||||
Role::navigation,
|
||||
Role::region,
|
||||
Role::search);
|
||||
}
|
||||
|
||||
// https://www.w3.org/TR/wai-aria-1.2/#live_region_roles
|
||||
bool is_live_region_aria_role(Role role)
|
||||
{
|
||||
return first_is_one_of(role,
|
||||
Role::alert,
|
||||
Role::log,
|
||||
Role::marquee,
|
||||
Role::status,
|
||||
Role::timer);
|
||||
}
|
||||
|
||||
// https://www.w3.org/TR/wai-aria-1.2/#window_roles
|
||||
bool is_windows_aria_role(Role role)
|
||||
{
|
||||
return first_is_one_of(role,
|
||||
Role::alertdialog,
|
||||
Role::dialog);
|
||||
}
|
||||
|
||||
bool is_non_abstract_aria_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);
|
||||
}
|
||||
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue