Changeset 289016 in webkit

Timestamp:

Feb 2, 2022, 4:48:32 PM (4 years ago)

Author:

Lauro Moura

Message:

[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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/atspi/AccessibilityAtspi.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-02  Lauro Moura  <lmoura@igalia.com>
+
+        [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  <graouts@webkit.org>
 

trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspi.cpp

@@ -603 +603 @@
     { 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") } },
@@ -705 +705 @@
 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;