Bug 1796178 - Revise mapping for <s> element to role=deletion. r=Jamie

Updated HTMLMarkupMap to expose `<s>` element with an implicit `roles::CONTENT_DELETION`, updated `accessible/tests/mochitest/elm/test_HTMLSpec.html` Mochitest and expected results for `testing/web-platform/tests/html-aam/roles.html` wpt test

Differential Revision: https://phabricator.services.mozilla.com/D179842

accessible/base/HTMLMarkupMap.h

@@ -328,6 +328,8 @@ MARKUPMAP(
 
 MARKUPMAP(q, New_HyperText, 0)
 
+MARKUPMAP(s, New_HyperText, roles::CONTENT_DELETION)
+
 MARKUPMAP(
     section,
     [](Element* aElement, LocalAccessible* aContext) -> LocalAccessible* {

accessible/tests/mochitest/elm/test_HTMLSpec.html

@@ -1311,13 +1311,9 @@
 
       obj = {
         role: ROLE_PARAGRAPH,
-        textAttrs: {
-          0: { },
-          6: { "text-line-through-style": "solid" },
-        },
         children: [
           { role: ROLE_TEXT_LEAF }, // plain text
-          { role: ROLE_TEXT_LEAF }, // HTML:i text
+          { role: ROLE_CONTENT_DELETION },
         ],
       };
       testElm("s_container", obj);
@@ -1995,7 +1991,7 @@
     字 <rp>(</rp><rt>ji</rt><rp>)</rp>
   </ruby>
 
-  <p id="s_container">normal<s>striked</s></p>
+  <p id="s_container">normal<s>Removed</s></p>
   <p id="samp_container">normal<samp>sample</samp></p>
   <section id="section">section</section>
   <section id="named_section" aria-label="foo">named section</section>

accessible/tests/mochitest/textattrs/test_general.html

@@ -311,15 +311,6 @@
       attrs = {};
       testTextAttrs(ID, 144, attrs, defAttrs, 143, 151);
 
-      attrs = {
-        "text-line-through-style": "solid",
-        "text-line-through-color": gComputedStyle.color,
-      };
-      testTextAttrs(ID, 152, attrs, defAttrs, 151, 164);
-
-      attrs = {};
-      testTextAttrs(ID, 165, attrs, defAttrs, 164, 172);
-
       // ////////////////////////////////////////////////////////////////////////
       // area10, different single style spans in non-styled paragraph
       ID = "area10";
@@ -744,7 +735,6 @@
     <span style="font-family: monospace;">Different font</span> normal
     <span style="text-decoration: underline;">underlined</span> normal
     <span style="text-decoration: line-through;">strikethrough</span> normal
-    <s>strikethrough</s> normal
     <strike>strikethrough</strike> normal
   </p>
 
@@ -812,8 +802,8 @@
   <div><span id="superscript_role_in_div" role="superscript">offset test</span></div>
   <p role="superscript"><sub id="sub_within_superscript_role">offset test</sub></p>
   <p role="subscript"><sup id="sup_within_subscript_role">offset test</sup></p>
-  <sup><sub id="sub_within_sup">offset test</sub></sup>
-  <sub><sup id="sup_within_sub">offset test</sup></sub>
+  <sup><sub id="sub_within_sup">offset test</sub></sup>
+  <sub><sup id="sup_within_sub">offset test</sup></sub>
   <p id="css_sub_within_superscript_role" role="superscript"><span style="vertical-align: sub">offset test</span></p>
   <p id="css_super_within_subscript_role" role="subscript"><span style="vertical-align: super">offset test</span></p>
   <sub id="sub_with_superscript_role" role="superscript">offset test</sub>

testing/web-platform/meta/html-aam/roles.html.ini

@@ -56,9 +56,6 @@
   [el-hgroup]
     expected: FAIL
 
-  [el-s]
-    expected: FAIL
-
   [el-samp]
     expected: FAIL