Bug 1732306 - Part 1: Implement emphasis role mappings, r=Jamie

This revision implements the mapping for the ARIA 1.2 emphasis role, which was unsupported in Firefox until now. This change addresses a web platform test failure. To accomplish this, the revision adds the WAI-defined role, adds a role enum value, adds platform mappings, and adds a markup role mapping. The change requires a new static atom for the word "emphasis," also added in this revision. Finally, this change removes the expected wpt failure and updates other tests. Differential Revision: https://phabricator.services.mozilla.com/D200130
dothq · Feb 7, 2024 · 2794697 · 2794697
1 parent 34cdfc4
commit 2794697
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 9 deletions.
diff --git a/accessible/base/ARIAMap.cpp b/accessible/base/ARIAMap.cpp
@@ -650,6 +650,16 @@ static const nsRoleMapEntry sWAIRoleMaps[] = {
     kNoReqStates,
     eReadonlyUntilEditable
   },
+  { // emphasis
+    nsGkAtoms::emphasis,
+    roles::EMPHASIS,
+    kUseMapRole,
+    eNoValue,
+    eNoAction,
+    eNoLiveAttr,
+    kGenericAccType,
+    kNoReqStates
+  },
   { // feed
     nsGkAtoms::feed,
     roles::GROUPING,

diff --git a/accessible/base/HTMLMarkupMap.h b/accessible/base/HTMLMarkupMap.h
@@ -155,6 +155,8 @@ MARKUPMAP(
 
 MARKUPMAP(dt, New_HTMLDtOrDd<HTMLLIAccessible>, roles::TERM)
 
+MARKUPMAP(em, New_HyperText, roles::EMPHASIS)
+
 MARKUPMAP(
     figcaption,
     [](Element* aElement, LocalAccessible* aContext) -> LocalAccessible* {

diff --git a/accessible/base/RoleMap.h b/accessible/base/RoleMap.h
@@ -1509,4 +1509,16 @@ ROLE(SUPERSCRIPT,
      IA2_ROLE_TEXT_FRAME,
      java::SessionAccessibility::CLASSNAME_VIEW,
      eNameFromSubtreeIfReqRule)
+
+ROLE(EMPHASIS,
+     "emphasis",
+     nsGkAtoms::emphasis,
+     ATK_ROLE_STATIC,
+     NSAccessibilityGroupRole,
+     @"AXEmphasisStyleGroup",
+     ROLE_SYSTEM_GROUPING,
+     IA2_ROLE_TEXT_FRAME,
+     java::SessionAccessibility::CLASSNAME_VIEW,
+     eNameFromSubtreeIfReqRule)
+
 // clang-format on
diff --git a/accessible/interfaces/nsIAccessibleRole.idl b/accessible/interfaces/nsIAccessibleRole.idl
@@ -784,4 +784,10 @@ interface nsIAccessibleRole : nsISupports
    */
   const unsigned long ROLE_SUPERSCRIPT = 134;
 
+  /**
+   * Represents one or more emphasized characters. Use this role to stress or
+   * emphasize content.
+   */
+  const unsigned long ROLE_EMPHASIS = 135;
+
 };
diff --git a/accessible/tests/mochitest/elm/test_HTMLSpec.html b/accessible/tests/mochitest/elm/test_HTMLSpec.html
@@ -452,11 +452,18 @@
         role: ROLE_PARAGRAPH,
         textAttrs: {
           0: { },
-          6: { "font-style": "italic" },
+          6: { },
         },
         children: [
           { role: ROLE_TEXT_LEAF }, // plain text
-          { role: ROLE_TEXT_LEAF }, // HTML:em text
+          { role: ROLE_EMPHASIS, // HTML:em text
+            children: [
+              { role: ROLE_TEXT_LEAF, },
+            ],
+            textAttrs: {
+              0: { },
+            },
+          },
         ],
       };
       testElm("em_container", obj);

diff --git a/accessible/tests/mochitest/role.js b/accessible/tests/mochitest/role.js
@@ -32,6 +32,7 @@ const ROLE_DIAGRAM = nsIAccessibleRole.ROLE_DIAGRAM;
 const ROLE_DIALOG = nsIAccessibleRole.ROLE_DIALOG;
 const ROLE_DOCUMENT = nsIAccessibleRole.ROLE_DOCUMENT;
 const ROLE_EDITCOMBOBOX = nsIAccessibleRole.ROLE_EDITCOMBOBOX;
+const ROLE_EMPHASIS = nsIAccessibleRole.ROLE_EMPHASIS;
 const ROLE_ENTRY = nsIAccessibleRole.ROLE_ENTRY;
 const ROLE_FIGURE = nsIAccessibleRole.ROLE_FIGURE;
 const ROLE_FOOTNOTE = nsIAccessibleRole.ROLE_FOOTNOTE;

diff --git a/testing/web-platform/meta/html-aam/roles.html.ini b/testing/web-platform/meta/html-aam/roles.html.ini
@@ -1,7 +1,4 @@
 [roles.html]
-  [el-em]
-    expected: FAIL
-
   [el-strong]
     expected: FAIL
 

diff --git a/testing/web-platform/meta/wai-aria/role/roles.html.ini b/testing/web-platform/meta/wai-aria/role/roles.html.ini
@@ -1,8 +1,4 @@
 [roles.html]
-  [role: emphasis]
-    expected: FAIL
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1732306
-
   [role: strong]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1732306

diff --git a/xpcom/ds/StaticAtoms.py b/xpcom/ds/StaticAtoms.py
@@ -419,6 +419,7 @@
     Atom("elements", "elements"),
     Atom("em", "em"),
     Atom("embed", "embed"),
+    Atom("emphasis", "emphasis"),
     Atom("empty", "empty"),
     Atom("encoding", "encoding"),
     Atom("enctype", "enctype"),