Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

12 files changed, 151 insertions, 236 deletions

diff --git a/accessible/tests/mochitest/attributes/test_obj_group.xhtml b/accessible/tests/mochitest/attributes/test_obj_group.xhtml
index 0eda4b6f2d..ba0c8bd357 100644
--- a/accessible/tests/mochitest/attributes/test_obj_group.xhtml
+++ b/accessible/tests/mochitest/attributes/test_obj_group.xhtml
@@ -196,17 +196,19 @@
   </menulist>
 
   <vbox>
-    <description role="menuitem" id="aria-menuitem"
-                 value="conventional menuitem"/>
-    <description role="menuitemcheckbox" id="aria-menuitemcheckbox"
-                 value="conventional checkbox menuitem"/>
-    <description role="menuitem" hidden="true"/>
-    <description role="menuitemradio" id="aria-menuitemradio"
-                 value="conventional radio menuitem"/>
-    <description role="separator"
-                 value="conventional separator"/>
-    <description role="menuitem" id="aria-menuitem2"
-                 value="conventional menuitem"/>
+    <div role="menu">
+      <description role="menuitem" id="aria-menuitem"
+                  value="conventional menuitem"/>
+      <description role="menuitemcheckbox" id="aria-menuitemcheckbox"
+                  value="conventional checkbox menuitem"/>
+      <description role="menuitem" hidden="true"/>
+      <description role="menuitemradio" id="aria-menuitemradio"
+                  value="conventional radio menuitem"/>
+      <description role="separator"
+                  value="conventional separator"/>
+      <description role="menuitem" id="aria-menuitem2"
+                  value="conventional menuitem"/>
+    </div>
   </vbox>
 
   </vbox>
diff --git a/accessible/tests/mochitest/focus/test_takeFocus.html b/accessible/tests/mochitest/focus/test_takeFocus.html
index 752ed66b36..6384fbfcb8 100644
--- a/accessible/tests/mochitest/focus/test_takeFocus.html
+++ b/accessible/tests/mochitest/focus/test_takeFocus.html
@@ -48,7 +48,6 @@
       gQueue.push(new takeFocusInvoker("aria-link"));
       gQueue.push(new takeFocusInvoker("aria-link2"));
       gQueue.push(new takeFocusInvoker("link"));
-      gQueue.push(new takeFocusInvoker("item2"));
       gQueue.push(new takeFocusInvoker(document));
       gQueue.push(new takeFocusInvoker("lb_item2"));
       gQueue.push(new takeFocusInvoker(document));
diff --git a/accessible/tests/mochitest/name/test_general.html b/accessible/tests/mochitest/name/test_general.html
index 09723e6222..47104ced3e 100644
--- a/accessible/tests/mochitest/name/test_general.html
+++ b/accessible/tests/mochitest/name/test_general.html
@@ -105,7 +105,7 @@
       // The label element contains the button. The name is calculated from
       // this button.
       // Note: the name contains the content of the button.
-      testName("btn_label_inside", "text10text");
+      testName("btn_label_inside", "text 10 text");
 
       // The label element and the button are placed in the same form. Gets
       // the name from the label subtree.
@@ -713,17 +713,21 @@
   <div id="grouping" role="group">label</div>
   <button id="requested_name_from_grouping"aria-labelledby="grouping"></button>
   <!-- Name from sub tree of tbody marked as display:block;, which is also a grouping -->
-  <div id="listitem_containing_block_tbody" role="listitem">
-    <table>
-      <tbody style="display: block;">
-        <tr><td>label</td></tr>
-      </tbody>
-    </table>
+  <div role="list">
+    <div id="listitem_containing_block_tbody" role="listitem">
+      <table>
+        <tbody style="display: block;">
+          <tr><td>label</td></tr>
+        </tbody>
+      </table>
+    </div>
   </div>
   <!-- Name from subtree of treeitem containing grouping -->
-  <div id="treeitem_containing_grouping" role="treeitem" aria-level="1" aria-expanded="true">root
-    <div role="group">
-      <div role="treeitem" aria-level="2">sub</div>
+  <div role="tree">
+    <div id="treeitem_containing_grouping" role="treeitem" aria-level="1" aria-expanded="true">root
+      <div role="group">
+        <div role="treeitem" aria-level="2">sub</div>
+      </div>
     </div>
   </div>
 
@@ -735,11 +739,13 @@
   </div>
 
   <!-- Text nodes and inline elements. -->
-  <div id="container_text_inline" role="option">a<strong>b</strong>c</div>
-  <!-- Text nodes and block elements. -->
-  <div id="container_text_block" role="option">a<p>b</p>c</div>
-  <!-- Text nodes and empty block elements. -->
-  <div id="container_text_emptyblock" role="option">a<p></p><p></p>b</div>
+  <div role="listbox">
+    <div id="container_text_inline" role="option">a<strong>b</strong>c</div>
+    <!-- Text nodes and block elements. -->
+    <div id="container_text_block" role="option">a<p>b</p>c</div>
+    <!-- Text nodes and empty block elements. -->
+    <div id="container_text_emptyblock" role="option">a<p></p><p></p>b</div>
+  </div>
 
   <!-- aria-labelledby referring to a slot -->
   <div id="shadowHost">
diff --git a/accessible/tests/mochitest/relations/a11y.toml b/accessible/tests/mochitest/relations/a11y.toml
index ae41bf91a5..77021c28cf 100644
--- a/accessible/tests/mochitest/relations/a11y.toml
+++ b/accessible/tests/mochitest/relations/a11y.toml
@@ -18,6 +18,4 @@ skip-if = [
 
 ["test_tree.xhtml"]
 
-["test_ui_modalprompt.html"]
-
 ["test_update.html"]
diff --git a/accessible/tests/mochitest/relations/test_ui_modalprompt.html b/accessible/tests/mochitest/relations/test_ui_modalprompt.html
deleted file mode 100644
index a05b273d86..0000000000
--- a/accessible/tests/mochitest/relations/test_ui_modalprompt.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<html>
-
-<head>
-  <title>Modal prompts</title>
-  <link rel="stylesheet" type="text/css"
-        href="chrome://mochikit/content/tests/SimpleTest/test.css" />
-
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
-
-  <script type="application/javascript"
-          src="../common.js"></script>
-  <script type="application/javascript"
-          src="../relations.js"></script>
-  <script type="application/javascript"
-          src="../role.js"></script>
-  <script type="application/javascript"
-          src="../events.js"></script>
-  <script type="application/javascript"
-          src="../browser.js"></script>
-
-  <script type="application/javascript">
-    SpecialPowers.pushPrefEnv({
-      set: [["prompts.contentPromptSubDialog", false]],
-    });
-    function showAlert() {
-      this.eventSeq = [
-        {
-          type: EVENT_SHOW,
-          match(aEvent) {
-            return aEvent.accessible.role == ROLE_DIALOG;
-          },
-        },
-      ];
-
-      this.invoke = function showAlert_invoke() {
-        window.setTimeout(
-          function() {
-            currentTabDocument().defaultView.alert("hello");
-          }, 0);
-      };
-
-      this.check = function showAlert_finalCheck(aEvent) {
-        if(aEvent.type === EVENT_HIDE) {
-          return;
-        }
-        var dialog = aEvent.accessible.DOMNode;
-        var info = dialog.querySelector(".tabmodalprompt-infoBody");
-        testRelation(info, RELATION_DESCRIPTION_FOR, dialog);
-        testRelation(dialog, RELATION_DESCRIBED_BY, info);
-      };
-
-      this.getID = function showAlert_getID() {
-        return "show alert";
-      };
-    }
-
-    function closeAlert() {
-      this.eventSeq = [
-        {
-          type: EVENT_HIDE,
-          match(aEvent) {
-            return aEvent.accessible.role == ROLE_DIALOG;
-          },
-        },
-      ];
-
-      this.invoke = function showAlert_invoke() {
-        synthesizeKey("VK_RETURN", {}, browserWindow());
-      };
-
-      this.getID = function showAlert_getID() {
-        return "cleanup alert";
-      };
-    }
-
-
-    // gA11yEventDumpToConsole = true; // debug
-
-    var gQueue = null;
-    function doTests() {
-      gQueue = new eventQueue();
-      gQueue.push(new showAlert());
-      gQueue.push(new closeAlert());
-      gQueue.onFinish = function() {
-        closeBrowserWindow();
-      };
-      gQueue.invoke(); // will call SimpleTest.finish()
-    }
-
-    SimpleTest.waitForExplicitFinish();
-    openBrowserWindow(doTests);
-  </script>
-
-</head>
-
-<body id="body">
-
-  <a target="_blank"
-     href="https://bugzilla.mozilla.org/show_bug.cgi?id=661293"
-     title="The tabmodalprompt dialog's prompt label doesn't get the text properly associated for accessibility">
-    Mozilla Bug 661293
-  </a>
-  <br>
-  <p id="display"></p>
-  <div id="content" style="display: none"></div>
-  <pre id="test">
-  </pre>
-
-</body>
-</html>
diff --git a/accessible/tests/mochitest/role/test_aria.html b/accessible/tests/mochitest/role/test_aria.html
index 0e7873c485..dcd2c7839e 100644
--- a/accessible/tests/mochitest/role/test_aria.html
+++ b/accessible/tests/mochitest/role/test_aria.html
@@ -42,8 +42,6 @@
       testRole("aria_checkbox_mixed", ROLE_CHECKBUTTON);
       testRole("aria_code", ROLE_CODE);
       testRole("aria_code_mixed", ROLE_CODE);
-      testRole("aria_columnheader", ROLE_COLUMNHEADER);
-      testRole("aria_columnheader_mixed", ROLE_COLUMNHEADER);
       testRole("aria_combobox", ROLE_EDITCOMBOBOX);
       testRole("aria_combobox_mixed", ROLE_EDITCOMBOBOX);
       testRole("aria_comment", ROLE_COMMENT);
@@ -66,8 +64,6 @@
       testRole("aria_figure_mixed", ROLE_FIGURE);
       testRole("aria_grid", ROLE_GRID);
       testRole("aria_grid_mixed", ROLE_GRID);
-      testRole("aria_gridcell", ROLE_GRID_CELL);
-      testRole("aria_gridcell_mixed", ROLE_GRID_CELL);
       testRole("aria_group", ROLE_GROUPING);
       testRole("aria_group_mixed", ROLE_GROUPING);
       testRole("aria_heading", ROLE_HEADING);
@@ -82,8 +78,6 @@
       testRole("aria_list_mixed", ROLE_LIST);
       testRole("aria_listbox", ROLE_LISTBOX);
       testRole("aria_listbox_mixed", ROLE_LISTBOX);
-      testRole("aria_listitem", ROLE_LISTITEM);
-      testRole("aria_listitem_mixed", ROLE_LISTITEM);
       testRole("aria_log", ROLE_TEXT); // weak role
       testRole("aria_log_mixed", ROLE_TEXT); // weak role
       testRole("aria_mark", ROLE_MARK);
@@ -96,12 +90,6 @@
       testRole("aria_menu_mixed", ROLE_MENUPOPUP);
       testRole("aria_menubar", ROLE_MENUBAR);
       testRole("aria_menubar_mixed", ROLE_MENUBAR);
-      testRole("aria_menuitem", ROLE_MENUITEM);
-      testRole("aria_menuitem_mixed", ROLE_MENUITEM);
-      testRole("aria_menuitemcheckbox", ROLE_CHECK_MENU_ITEM);
-      testRole("aria_menuitemcheckbox_mixed", ROLE_CHECK_MENU_ITEM);
-      testRole("aria_menuitemradio", ROLE_RADIO_MENU_ITEM);
-      testRole("aria_menuitemradio_mixed", ROLE_RADIO_MENU_ITEM);
       testRole("aria_meter", ROLE_METER);
       testRole("aria_meter_mixed", ROLE_METER);
       testRole("aria_note", ROLE_NOTE);
@@ -130,10 +118,6 @@
       testRole("aria_region_as_table_with_caption_mixed", ROLE_REGION);
       testRole("aria_region_as_table_with_miscaption", ROLE_TABLE);
       testRole("aria_region_as_table_with_miscaption_mixed", ROLE_TABLE);
-      testRole("aria_row", ROLE_ROW);
-      testRole("aria_row_mixed", ROLE_ROW);
-      testRole("aria_rowheader", ROLE_ROWHEADER);
-      testRole("aria_rowheader_mixed", ROLE_ROWHEADER);
       testRole("aria_scrollbar", ROLE_SCROLLBAR);
       testRole("aria_scrollbar_mixed", ROLE_SCROLLBAR);
       testRole("aria_searchbox", ROLE_ENTRY);
@@ -154,8 +138,6 @@
       testRole("aria_superscript_mixed", ROLE_SUPERSCRIPT);
       testRole("aria_switch", ROLE_SWITCH);
       testRole("aria_switch_mixed", ROLE_SWITCH);
-      testRole("aria_tab", ROLE_PAGETAB);
-      testRole("aria_tab_mixed", ROLE_PAGETAB);
       testRole("aria_tablist", ROLE_PAGETABLIST);
       testRole("aria_tablist_mixed", ROLE_PAGETABLIST);
       testRole("aria_tabpanel", ROLE_PROPERTYPAGE);
@@ -174,8 +156,6 @@
       testRole("aria_tree_mixed", ROLE_OUTLINE);
       testRole("aria_treegrid", ROLE_TREE_TABLE);
       testRole("aria_treegrid_mixed", ROLE_TREE_TABLE);
-      testRole("aria_treeitem", ROLE_OUTLINEITEM);
-      testRole("aria_treeitem_mixed", ROLE_OUTLINEITEM);
 
       // Note:
       // The phrase "weak foo" here means that there is no good foo-to-platform
@@ -262,6 +242,29 @@
       testRole("implicit_gridcell_mixed", ROLE_GRID_CELL);
 
       // ////////////////////////////////////////////////////////////////////////
+      // child roles dependent on ancestor role presence
+      testRole("aria_columnheader", ROLE_COLUMNHEADER);
+      testRole("aria_columnheader_mixed", ROLE_COLUMNHEADER);
+      testRole("aria_gridcell", ROLE_GRID_CELL);
+      testRole("aria_gridcell_mixed", ROLE_GRID_CELL);
+      testRole("aria_rowheader", ROLE_ROWHEADER);
+      testRole("aria_rowheader_mixed", ROLE_ROWHEADER);
+      testRole("aria_listitem", ROLE_LISTITEM);
+      testRole("aria_listitem_mixed", ROLE_LISTITEM);
+      testRole("aria_menuitem", ROLE_MENUITEM);
+      testRole("aria_menuitem_mixed", ROLE_MENUITEM);
+      testRole("aria_menuitemcheckbox", ROLE_CHECK_MENU_ITEM);
+      testRole("aria_menuitemcheckbox_mixed", ROLE_CHECK_MENU_ITEM);
+      testRole("aria_menuitemradio", ROLE_RADIO_MENU_ITEM);
+      testRole("aria_menuitemradio_mixed", ROLE_RADIO_MENU_ITEM);
+      testRole("aria_row", ROLE_ROW);
+      testRole("aria_row_mixed", ROLE_ROW);
+      testRole("aria_tab", ROLE_PAGETAB);
+      testRole("aria_tab_mixed", ROLE_PAGETAB);
+      testRole("aria_treeitem", ROLE_OUTLINEITEM);
+      testRole("aria_treeitem_mixed", ROLE_OUTLINEITEM);
+
+      // ////////////////////////////////////////////////////////////////////////
       // ignore unknown roles, take first known
       testRole("unknown_roles", ROLE_PUSHBUTTON);
       testRole("unknown_roles_mixed", ROLE_PUSHBUTTON);
@@ -400,8 +403,6 @@
   <span id="aria_checkbox_mixed" role="cHECKBOx"></span>
   <span id="aria_code" role="code"></span>
   <span id="aria_code_mixed" role="cODe"></span>
-  <span id="aria_columnheader" role="columnheader"></span>
-  <span id="aria_columnheader_mixed" role="cOLUMNHEADEr"></span>
   <span id="aria_combobox" role="combobox"></span>
   <span id="aria_combobox_mixed" role="cOMBOBOx"></span>
   <span id="aria_comment" role="comment"></span>
@@ -424,8 +425,6 @@
   <span id="aria_figure_mixed" role="fIGURe"></span>
   <span id="aria_grid" role="grid"></span>
   <span id="aria_grid_mixed" role="gRId"></span>
-  <span id="aria_gridcell" role="gridcell"></span>
-  <span id="aria_gridcell_mixed" role="gRIDCELl"></span>
   <span id="aria_group" role="group"></span>
   <span id="aria_group_mixed" role="gROUp"></span>
   <span id="aria_heading" role="heading"></span>
@@ -440,8 +439,6 @@
   <span id="aria_list_mixed" role="lISt"></span>
   <span id="aria_listbox" role="listbox"></span>
   <span id="aria_listbox_mixed" role="lISTBOx"></span>
-  <span id="aria_listitem" role="listitem"></span>
-  <span id="aria_listitem_mixed" role="lISTITEm"></span>
   <span id="aria_log" role="log"></span>
   <span id="aria_log_mixed" role="lOg"></span>
   <span id="aria_mark" role="mark"></span>
@@ -454,12 +451,6 @@
   <span id="aria_menu_mixed" role="mENu"></span>
   <span id="aria_menubar" role="menubar"></span>
   <span id="aria_menubar_mixed" role="mENUBAr"></span>
-  <span id="aria_menuitem" role="menuitem"></span>
-  <span id="aria_menuitem_mixed" role="mENUITEm"></span>
-  <span id="aria_menuitemcheckbox" role="menuitemcheckbox"></span>
-  <span id="aria_menuitemcheckbox_mixed" role="mENUITEMCHECKBOx"></span>
-  <span id="aria_menuitemradio" role="menuitemradio"></span>
-  <span id="aria_menuitemradio_mixed" role="mENUITEMRADIo"></span>
   <span id="aria_meter" role="meter"></span>
   <span id="aria_meter_mixed" role="meTer"></span>
   <span id="aria_note" role="note"></span>
@@ -488,10 +479,6 @@
   <table id="aria_region_as_table_with_caption_mixed" role="rEGIOn"><caption>hello</caption></table>
   <table id="aria_region_as_table_with_miscaption" role="region"><caption role="option">hello</caption></table>
   <table id="aria_region_as_table_with_miscaption_mixed" role="rEGIOn"><caption role="option">hello</caption></table>
-  <span id="aria_row" role="row"></span>
-  <span id="aria_row_mixed" role="rOw"></span>
-  <span id="aria_rowheader" role="rowheader"></span>
-  <span id="aria_rowheader_mixed" role="rOWHEADEr"></span>
   <span id="aria_scrollbar" role="scrollbar"></span>
   <span id="aria_scrollbar_mixed" role="sCROLLBAr"></span>
   <span id="aria_searchbox" role="textbox"></span>
@@ -512,8 +499,6 @@
   <span id="aria_superscript_mixed" role="sUPERSCRIPt"></span>
   <span id="aria_switch" role="switch"></span>
   <span id="aria_switch_mixed" role="sWITCh"></span>
-  <span id="aria_tab" role="tab"></span>
-  <span id="aria_tab_mixed" role="tAb"></span>
   <span id="aria_tablist" role="tablist"></span>
   <span id="aria_tablist_mixed" role="tABLISt"></span>
   <span id="aria_tabpanel" role="tabpanel"></span>
@@ -532,8 +517,6 @@
   <span id="aria_tree_mixed" role="tREe"></span>
   <span id="aria_treegrid" role="treegrid"></span>
   <span id="aria_treegrid_mixed" role="tREEGRId"></span>
-  <span id="aria_treeitem" role="treeitem"></span>
-  <span id="aria_treeitem_mixed" role="tREEITEm"></span>
 
   <article id="articlemain" role="main">a main area</article>
   <article id="articlemain_mixed" role="mAIn">a main area</article>
@@ -665,6 +648,42 @@
     </tr>
   </table>
 
+  <!-- child roles dependent on ancestor role presence -->
+  <div role="grid">
+    <div role="row">
+      <span id="aria_columnheader" role="columnheader"></span>
+      <span id="aria_columnheader_mixed" role="cOLUMNHEADEr"></span>
+      <span id="aria_gridcell" role="gridcell"></span>
+      <span id="aria_gridcell_mixed" role="gRIDCELl"></span>
+      <span id="aria_rowheader" role="rowheader"></span>
+      <span id="aria_rowheader_mixed" role="rOWHEADEr"></span>
+    </div>
+  </div>
+  <div role="list">
+    <span id="aria_listitem" role="listitem"></span>
+    <span id="aria_listitem_mixed" role="lISTITEm"></span>
+  </div>
+  <div role="menu">
+    <span id="aria_menuitem" role="menuitem"></span>
+    <span id="aria_menuitem_mixed" role="mENUITEm"></span>
+    <span id="aria_menuitemcheckbox" role="menuitemcheckbox"></span>
+    <span id="aria_menuitemcheckbox_mixed" role="mENUITEMCHECKBOx"></span>
+    <span id="aria_menuitemradio" role="menuitemradio"></span>
+    <span id="aria_menuitemradio_mixed" role="mENUITEMRADIo"></span>
+  </div>
+  <div role="table">
+    <span id="aria_row" role="row"></span>
+    <span id="aria_row_mixed" role="rOw"></span>
+  </div>
+  <div role="tablist">
+    <span id="aria_tab" role="tab"></span>
+    <span id="aria_tab_mixed" role="tAb"></span>
+  </div>
+  <div role="tree">
+    <span id="aria_treeitem" role="treeitem"></span>
+    <span id="aria_treeitem_mixed" role="tREEITEm"></span>
+  </div>
+
   <!-- roles transformed by ARIA state attributes -->
   <button aria-pressed="true" id="togglebutton"></button>
   <button aria-pressed="tRUe" id="togglebutton_mixed"></button>
diff --git a/accessible/tests/mochitest/test_custom_element_accessibility_defaults.html b/accessible/tests/mochitest/test_custom_element_accessibility_defaults.html
index 672b5c36ad..799aefc163 100644
--- a/accessible/tests/mochitest/test_custom_element_accessibility_defaults.html
+++ b/accessible/tests/mochitest/test_custom_element_accessibility_defaults.html
@@ -33,7 +33,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1665151
   ["disabled", "button", internals => internals.ariaDisabled = "true"],
   ["expanded", "button", internals => internals.ariaExpanded = "true"],
   ["haspopup", "button", internals => internals.ariaHasPopup = "true"],
-  ["hidden", "region", internals => internals.ariaHidden = "false"],
+  ["hidden", "region", internals => internals.ariaHidden = "true"],
   ["invalid", "textbox", internals => internals.ariaInvalid = "true"],
   ["keyshortcuts", "button", internals => internals.ariaKeyShortcuts = "Alt+Shift+A"],
   ["label", "button", internals => internals.ariaLabel = "Default"],
@@ -122,8 +122,8 @@ async function runTest() {
   testAttrs("default-haspopup", {"haspopup": "true"}, true);
   testAbsentAttrs("custom-haspopup", {"haspopup": "false"});
 
-  ok(isAccessible("default-hidden"), "Accessible for not aria-hidden");
-  ok(!isAccessible("custom-hidden"), "No accessible for aria-hidden");
+  ok(!isAccessible("default-hidden"), "Accessible for aria-hidden default");
+  ok(isAccessible("custom-hidden"), "Accessible for custom aria-hidden=false");
 
   testStates("default-invalid", STATE_INVALID);
   testStates("custom-invalid", 0, 0, STATE_INVALID);
@@ -277,7 +277,7 @@ addA11yLoadEvent(runTest);
 <custom-haspopup id="custom-haspopup" aria-haspopup="false"></custom-haspopup>
 
 <custom-hidden id="default-hidden"></custom-hidden>
-<custom-hidden id="custom-hidden" aria-hidden="true"></custom-hidden>
+<custom-hidden id="custom-hidden" aria-hidden="false"></custom-hidden>
 
 <custom-invalid id="default-invalid"></custom-invalid>
 <custom-invalid id="custom-invalid" aria-invalid="false"></custom-invalid>
@@ -306,8 +306,10 @@ addA11yLoadEvent(runTest);
 <custom-orientation id="default-orientation"></custom-orientation>
 <custom-orientation id="custom-orientation" aria-orientation="horizontal"></custom-orientation>
 
-<custom-posinset id="default-posinset"></custom-posinset>
-<custom-posinset id="custom-posinset" aria-posinset="2"></custom-posinset>
+<div role="listbox">
+  <custom-posinset id="default-posinset"></custom-posinset>
+  <custom-posinset id="custom-posinset" aria-posinset="2"></custom-posinset>
+</div>
 
 <custom-pressed id="default-pressed"></custom-pressed>
 <custom-pressed id="custom-pressed" aria-pressed="false"></custom-pressed>
@@ -345,10 +347,10 @@ addA11yLoadEvent(runTest);
 <custom-selected id="default-selected"></custom-selected>
 <custom-selected id="custom-selected" aria-selected="false"></custom-selected>
 
-<div role="listbox">
+<div role="list">
   <custom-setsize id="default-setsize"></custom-setsize>
 </div>
-<div role="listbox">
+<div role="list">
   <custom-setsize id="custom-setsize" aria-setsize="2"></custom-setsize>
   <div role="listitem" aria-setsize="2"></div>
 </div>
diff --git a/accessible/tests/mochitest/tree/test_aria_display_contents.html b/accessible/tests/mochitest/tree/test_aria_display_contents.html
index 454e4e46e1..5b2331e730 100644
--- a/accessible/tests/mochitest/tree/test_aria_display_contents.html
+++ b/accessible/tests/mochitest/tree/test_aria_display_contents.html
@@ -53,11 +53,11 @@
             ] },
           ] },
           { SECTION: [
-            { LISTITEM: [
+            { SECTION: [
               { TEXT_LEAF: [ ] }
             ] },
           ] },
-          { LISTITEM: [
+          { SECTION: [
             { TEXT_LEAF: [ ] }
           ] },
         ] };
@@ -93,63 +93,63 @@
   </pre>
 
   <div id="gridWithoutDisplayContents" role="grid">
-    <div role="row">

-      <div role="columnheader">col1</div>

-      <div role="columnheader">col2</div>

-    </div>

-    <div role="row">

-      <div role="rowheader">row1</div>

-      <div role="gridcell">cell1</div>

+    <div role="row">
+      <div role="columnheader">col1</div>
+      <div role="columnheader">col2</div>
+    </div>
+    <div role="row">
+      <div role="rowheader">row1</div>
+      <div role="gridcell">cell1</div>
     </div>
   </div>
   <div id="gridWithDisplayContents" role="grid" style="display:contents;">
-    <div role="row">

-      <div role="columnheader">col1</div>

-      <div role="columnheader">col2</div>

-    </div>

-    <div role="row">

-      <div role="rowheader">row1</div>

-      <div role="gridcell">cell1</div>

+    <div role="row">
+      <div role="columnheader">col1</div>
+      <div role="columnheader">col2</div>
+    </div>
+    <div role="row">
+      <div role="rowheader">row1</div>
+      <div role="gridcell">cell1</div>
     </div>
   </div>
   <div id="gridWithDisplayContentsRow" role="grid">
-    <div role="row" style="display:contents;">

-      <div role="columnheader">col1</div>

-      <div role="columnheader">col2</div>

-    </div>

-    <div role="row">

-      <div role="rowheader">row1</div>

-      <div role="gridcell">cell1</div>

+    <div role="row" style="display:contents;">
+      <div role="columnheader">col1</div>
+      <div role="columnheader">col2</div>
+    </div>
+    <div role="row">
+      <div role="rowheader">row1</div>
+      <div role="gridcell">cell1</div>
     </div>
   </div>
   <div id="gridWithDisplayContentsColHeader" role="grid">
-    <div role="row">

-      <div role="columnheader" style="display:contents;">col1</div>

-      <div role="columnheader">col2</div>

-    </div>

-    <div role="row">

-      <div role="rowheader">row1</div>

-      <div role="gridcell">cell1</div>

+    <div role="row">
+      <div role="columnheader" style="display:contents;">col1</div>
+      <div role="columnheader">col2</div>
+    </div>
+    <div role="row">
+      <div role="rowheader">row1</div>
+      <div role="gridcell">cell1</div>
     </div>
   </div>
   <div id="gridWithDisplayContentsRowHeader" role="grid">
-    <div role="row">

-      <div role="columnheader">col1</div>

-      <div role="columnheader">col2</div>

-    </div>

-    <div role="row">

-      <div role="rowheader" style="display:contents;">row1</div>

-      <div role="gridcell">cell1</div>

+    <div role="row">
+      <div role="columnheader">col1</div>
+      <div role="columnheader">col2</div>
+    </div>
+    <div role="row">
+      <div role="rowheader" style="display:contents;">row1</div>
+      <div role="gridcell">cell1</div>
     </div>
   </div>
   <div id="gridWithDisplayContentsGridCell" role="grid">
-    <div role="row">

-      <div role="columnheader">col1</div>

-      <div role="columnheader">col2</div>

-    </div>

-    <div role="row">

-      <div role="rowheader">row1</div>

-      <div role="gridcell" style="display:contents;">cell1</div>

+    <div role="row">
+      <div role="columnheader">col1</div>
+      <div role="columnheader">col2</div>
+    </div>
+    <div role="row">
+      <div role="rowheader">row1</div>
+      <div role="gridcell" style="display:contents;">cell1</div>
     </div>
   </div>
 
diff --git a/accessible/tests/mochitest/tree/test_aria_grid.html b/accessible/tests/mochitest/tree/test_aria_grid.html
index 4dd30e4183..d409c87c34 100644
--- a/accessible/tests/mochitest/tree/test_aria_grid.html
+++ b/accessible/tests/mochitest/tree/test_aria_grid.html
@@ -19,7 +19,7 @@
 
       var accTree =
         { GRID: [
-          { GROUPING: [
+          { ROWGROUP: [
             { ROW: [
               { GRID_CELL: [
                 { TEXT_LEAF: [ ] },
diff --git a/accessible/tests/mochitest/tree/test_aria_table.html b/accessible/tests/mochitest/tree/test_aria_table.html
index 22375faf59..2d4a0f00ae 100644
--- a/accessible/tests/mochitest/tree/test_aria_table.html
+++ b/accessible/tests/mochitest/tree/test_aria_table.html
@@ -19,7 +19,7 @@
 
       var accTree =
         { TABLE: [
-          { GROUPING: [
+          { ROWGROUP: [
             { ROW: [
               { CELL: [
                 { TEXT_LEAF: [ ] },
diff --git a/accessible/tests/mochitest/tree/test_display_contents.html b/accessible/tests/mochitest/tree/test_display_contents.html
index 8393a35b41..9573a845d3 100644
--- a/accessible/tests/mochitest/tree/test_display_contents.html
+++ b/accessible/tests/mochitest/tree/test_display_contents.html
@@ -41,7 +41,7 @@ function doTest() {
 
   tree =
   { TABLE: [
-    { GROUPING : [
+    { ROWGROUP : [
       { ROW: [
         { CELL: [{ TEXT_LEAF: [] } ] },
         { CELL: [{ TEXT_LEAF: [] } ] },
diff --git a/accessible/tests/mochitest/tree/test_table.html b/accessible/tests/mochitest/tree/test_table.html
index 5f34c12067..7f7f4fe6db 100644
--- a/accessible/tests/mochitest/tree/test_table.html
+++ b/accessible/tests/mochitest/tree/test_table.html
@@ -283,7 +283,7 @@
       // The tbody should get a grouping accessible.
       accTree =
         { TABLE: [
-          { GROUPING: [
+          { ROWGROUP: [
             { ROW: [
               { CELL: [
                 { TEXT_LEAF: [ ] },