Backed out 4 changesets (bug 1732306) for causing osx browser-a11y failures on browser_text_basics.js. CLOSED TREE

Backed out changeset 55e194f1c92d (bug 1732306) Backed out changeset 44270ea2f53c (bug 1732306) Backed out changeset e063d64d28a6 (bug 1732306) Backed out changeset 1824083c6fc1 (bug 1732306)
2024-11-27 14:52:16 +00:00 · 2024-02-08 04:06:38 +02:00 · 2024-02-08 04:06:38 +02:00 · db55ffffda
commit db55ffffda
parent 3a5ac56154
10 changed files with 24 additions and 136 deletions
--- a/accessible/base/ARIAMap.cpp
+++ b/accessible/base/ARIAMap.cpp
@ -650,16 +650,6 @@ static const nsRoleMapEntry sWAIRoleMaps[] = {
    kNoReqStates,
    eReadonlyUntilEditable
  },
-  { // emphasis
-    nsGkAtoms::emphasis,
-    roles::EMPHASIS,
-    kUseMapRole,
-    eNoValue,
-    eNoAction,
-    eNoLiveAttr,
-    kGenericAccType,
-    kNoReqStates
-  },
  { // feed
    nsGkAtoms::feed,
    roles::GROUPING,
@ -690,16 +680,6 @@ static const nsRoleMapEntry sWAIRoleMaps[] = {
    eLandmark,
    kNoReqStates
  },
-  { // generic
-    nsGkAtoms::generic,
-    roles::SECTION,
-    kUseMapRole,
-    eNoValue,
-    eNoAction,
-    eNoLiveAttr,
-    kGenericAccType,
-    kNoReqStates
-  },
  { // graphics-document
    nsGkAtoms::graphicsDocument,
    roles::NON_NATIVE_DOCUMENT,
@ -1193,16 +1173,6 @@ static const nsRoleMapEntry sWAIRoleMaps[] = {
    kGenericAccType,
    kNoReqStates
  },
-  { // strong
-    nsGkAtoms::strong,
-    roles::STRONG,
-    kUseMapRole,
-    eNoValue,
-    eNoAction,
-    eNoLiveAttr,
-    kGenericAccType,
-    kNoReqStates
-  },
  { // subscript
    nsGkAtoms::subscript,
    roles::SUBSCRIPT,
@ -1309,15 +1279,6 @@ static const nsRoleMapEntry sWAIRoleMaps[] = {
    eARIAMultiline,
    eARIAReadonlyOrEditable
  },
-  { // time
-    nsGkAtoms::time,
-    roles::TIME,
-    kUseMapRole,
-    eNoValue,
-    eNoAction,
-    eNoLiveAttr,
-    kNoReqStates
-  },
  { // timer
    nsGkAtoms::timer,
    roles::NOTHING,
--- a/accessible/base/HTMLMarkupMap.h
+++ b/accessible/base/HTMLMarkupMap.h
@ -155,8 +155,6 @@ MARKUPMAP(

 MARKUPMAP(dt, New_HTMLDtOrDd<HTMLLIAccessible>, roles::TERM)

-MARKUPMAP(em, New_HyperText, roles::EMPHASIS)
-
 MARKUPMAP(
    figcaption,
    [](Element* aElement, LocalAccessible* aContext) -> LocalAccessible* {
@ -348,8 +346,6 @@ MARKUPMAP(
    },
    0)

-MARKUPMAP(strong, New_HyperText, roles::STRONG)
-
 MARKUPMAP(sub, New_HyperText, roles::SUBSCRIPT)

 MARKUPMAP(
@ -368,7 +364,7 @@ MARKUPMAP(
    },
    roles::TABLE)

-MARKUPMAP(time, New_HyperText, roles::TIME, Attr(xmlroles, time),
+MARKUPMAP(time, New_HyperText, 0, Attr(xmlroles, time),
          AttrFromDOM(datetime, datetime))

 MARKUPMAP(tbody, nullptr, roles::GROUPING)
--- a/accessible/base/RoleMap.h
+++ b/accessible/base/RoleMap.h
@ -1509,38 +1509,4 @@ 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)
-
-ROLE(STRONG,
-     "strong",
-     nsGkAtoms::strong,
-     ATK_ROLE_STATIC,
-     NSAccessibilityGroupRole,
-     @"AXStrongStyleGroup",
-     ROLE_SYSTEM_GROUPING,
-     IA2_ROLE_TEXT_FRAME,
-     java::SessionAccessibility::CLASSNAME_VIEW,
-     eNameFromSubtreeIfReqRule)
-
-ROLE(TIME,
-     "time",
-     nsGkAtoms::time,
-     ATK_ROLE_STATIC,
-     NSAccessibilityGroupRole,
-     @"AXTimeGroup",
-     ROLE_SYSTEM_GROUPING,
-     ROLE_SYSTEM_GROUPING,
-     java::SessionAccessibility::CLASSNAME_VIEW,
-     eNameFromSubtreeIfReqRule)
-
 // clang-format on
--- a/accessible/interfaces/nsIAccessibleRole.idl
+++ b/accessible/interfaces/nsIAccessibleRole.idl
@ -784,19 +784,4 @@ 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;
-
-  /**
-   * Represents content that is important, serious, or urgent.
-   */
-  const unsigned long ROLE_STRONG = 136;
-
-  /**
-   * Represents a specific point in time.
-   */
-  const unsigned long ROLE_TIME = 137;
 };
--- a/accessible/tests/mochitest/elm/test_HTMLSpec.html
+++ b/accessible/tests/mochitest/elm/test_HTMLSpec.html
@ -452,18 +452,11 @@
        role: ROLE_PARAGRAPH,
        textAttrs: {
          0: { },
-          6: { },
+          6: { "font-style": "italic" },
        },
        children: [
          { role: ROLE_TEXT_LEAF }, // plain text
-          { role: ROLE_EMPHASIS, // HTML:em text
-            children: [
-              { role: ROLE_TEXT_LEAF, },
-            ],
-            textAttrs: {
-              0: { },
-            },
-          },
+          { role: ROLE_TEXT_LEAF }, // HTML:em text
        ],
      };
      testElm("em_container", obj);
@ -1392,12 +1385,7 @@
        role: ROLE_PARAGRAPH,
        children: [
          { role: ROLE_TEXT_LEAF }, // plain text
-          {
-            role: ROLE_STRONG, // HTML:strong text
-            children: [
-              { role: ROLE_TEXT_LEAF, },
-            ],
-          },
+          { role: ROLE_TEXT_LEAF }, // HTML:strong text
        ],
      };
      testElm("strong_container", obj);
@ -1473,7 +1461,7 @@
      // HTML:time

      obj = {
-        role: ROLE_TIME,
+        role: ROLE_TEXT,
        attributes: { "xml-roles": "time", "datetime": "2001-05-15 19:00" },
        interfaces: [ nsIAccessibleText, nsIAccessibleHyperText ],
      };
--- a/accessible/tests/mochitest/role.js
+++ b/accessible/tests/mochitest/role.js
@ -32,7 +32,6 @@ 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;
@ -121,7 +120,6 @@ const ROLE_SLIDER = nsIAccessibleRole.ROLE_SLIDER;
 const ROLE_SPINBUTTON = nsIAccessibleRole.ROLE_SPINBUTTON;
 const ROLE_STATICTEXT = nsIAccessibleRole.ROLE_STATICTEXT;
 const ROLE_STATUSBAR = nsIAccessibleRole.ROLE_STATUSBAR;
-const ROLE_STRONG = nsIAccessibleRole.ROLE_STRONG;
 const ROLE_SUBSCRIPT = nsIAccessibleRole.ROLE_SUBSCRIPT;
 const ROLE_SUGGESTION = nsIAccessibleRole.ROLE_SUGGESTION;
 const ROLE_SUPERSCRIPT = nsIAccessibleRole.ROLE_SUPERSCRIPT;
@ -132,7 +130,6 @@ const ROLE_TERM = nsIAccessibleRole.ROLE_TERM;
 const ROLE_TEXT = nsIAccessibleRole.ROLE_TEXT;
 const ROLE_TEXT_CONTAINER = nsIAccessibleRole.ROLE_TEXT_CONTAINER;
 const ROLE_TEXT_LEAF = nsIAccessibleRole.ROLE_TEXT_LEAF;
-const ROLE_TIME = nsIAccessibleRole.ROLE_TIME;
 const ROLE_TIME_EDITOR = nsIAccessibleRole.ROLE_TIME_EDITOR;
 const ROLE_TOGGLE_BUTTON = nsIAccessibleRole.ROLE_TOGGLE_BUTTON;
 const ROLE_TOOLBAR = nsIAccessibleRole.ROLE_TOOLBAR;
--- a/testing/web-platform/meta/html-aam/roles.html.ini
+++ b/testing/web-platform/meta/html-aam/roles.html.ini
@ -1 +1,9 @@
 [roles.html]
+  [el-em]
+    expected: FAIL
+
+  [el-strong]
+    expected: FAIL
+
+  [el-time]
+    expected: FAIL
--- a/testing/web-platform/meta/wai-aria/role/roles.html.ini
+++ b/testing/web-platform/meta/wai-aria/role/roles.html.ini
@ -1 +1,12 @@
 [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
+
+  [role: time]
+    expected: FAIL
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1732306
--- a/testing/web-platform/tests/wai-aria/role/generic-roles.html
+++ b/testing/web-platform/tests/wai-aria/role/generic-roles.html
@ -1,23 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>Generic Role Verification Tests</title>
-  <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 <a href="https://w3c.github.io/aria/#generic">generic</a>.</p>
-
-<p role="generic" data-testname="generic role on p element is generic" class="ex-generic">x</p>
-
-<script>
-AriaUtils.verifyGenericRolesBySelector(".ex-generic");
-</script>
-
-</body>
-</html>
--- a/xpcom/ds/StaticAtoms.py
+++ b/xpcom/ds/StaticAtoms.py
@ -419,7 +419,6 @@ STATIC_ATOMS = [
    Atom("elements", "elements"),
    Atom("em", "em"),
    Atom("embed", "embed"),
-    Atom("emphasis", "emphasis"),
    Atom("empty", "empty"),
    Atom("encoding", "encoding"),
    Atom("enctype", "enctype"),