Modified: trunk/Source/WebCore/ChangeLog (289015 => 289016)
--- trunk/Source/WebCore/ChangeLog 2022-02-03 00:34:50 UTC (rev 289015)
+++ trunk/Source/WebCore/ChangeLog 2022-02-03 00:48:32 UTC (rev 289016)
@@ -1,3 +1,19 @@
+2022-02-02 Lauro Moura <[email protected]>
+
+ [GLIB] Unreviewed debug buildfix after r288872
+ https://bugs.webkit.org/show_bug.cgi?id=236036
+
+ The actual issue was the roleNames array provided to SortedArrayMap
+ constructor wasn't fully ordered, making isSortedConstExpr to fail,
+ generating the call to WTFReport..., which is non-constexpr and thus
+ the compile failure.
+
+ This commit revert the previous fix from r288990 and fix the ordering of
+ roleNames.
+
+ * accessibility/atspi/AccessibilityAtspi.cpp:
+ (WebCore::AccessibilityAtspi::localizedRoleName):
+
2022-02-02 Antoine Quint <[email protected]>
Keyframe resolution methods should use reference instead of pointer parameters
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspi.cpp (289015 => 289016)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspi.cpp 2022-02-03 00:34:50 UTC (rev 289015)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspi.cpp 2022-02-03 00:48:32 UTC (rev 289016)
@@ -602,8 +602,8 @@
{ AccessibilityRole::Definition, { "definition", N_("definition") } },
{ AccessibilityRole::Deletion, { "content deletion", N_("content deletion") } },
{ AccessibilityRole::DescriptionList, { "description list", N_("description list") } },
+ { AccessibilityRole::DescriptionListDetail, { "description value", N_("description value") } },
{ AccessibilityRole::DescriptionListTerm, { "description term", N_("description term") } },
- { AccessibilityRole::DescriptionListDetail, { "description value", N_("description value") } },
{ AccessibilityRole::Directory, { "directory pane", N_("directory pane") } },
{ AccessibilityRole::Div, { "section", N_("section") } },
{ AccessibilityRole::Document, { "document frame", N_("document frame") } },
@@ -704,7 +704,7 @@
const char* AccessibilityAtspi::localizedRoleName(AccessibilityRole role)
{
- static const SortedArrayMap roleNamesMap { roleNames };
+ static constexpr SortedArrayMap roleNamesMap { roleNames };
if (auto entry = roleNamesMap.tryGet(role))
return entry->localizedName;
