From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:14:29 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../tests/mochitest/tree/test_aria_display_contents.html     |  2 +-
 accessible/tests/mochitest/tree/test_aria_grid.html          | 12 ++++++------
 accessible/tests/mochitest/tree/test_aria_owns.html          |  4 ++--
 accessible/tests/mochitest/tree/test_tabbrowser.xhtml        |  2 +-
 accessible/tests/mochitest/tree/test_tree.xhtml              |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'accessible/tests/mochitest/tree')

diff --git a/accessible/tests/mochitest/tree/test_aria_display_contents.html b/accessible/tests/mochitest/tree/test_aria_display_contents.html
index 5c6f7f20fb..454e4e46e1 100644
--- a/accessible/tests/mochitest/tree/test_aria_display_contents.html
+++ b/accessible/tests/mochitest/tree/test_aria_display_contents.html
@@ -17,7 +17,7 @@
       // Test ARIA grids that have display: contents; on different elements.
       // They should all have equivalent trees.
       var accTree =
-        { TABLE: [
+        { GRID: [
           { ROW: [
             { role: ROLE_COLUMNHEADER,
               children: [ { TEXT_LEAF: [ ] }, ]
diff --git a/accessible/tests/mochitest/tree/test_aria_grid.html b/accessible/tests/mochitest/tree/test_aria_grid.html
index 80ff97095b..4dd30e4183 100644
--- a/accessible/tests/mochitest/tree/test_aria_grid.html
+++ b/accessible/tests/mochitest/tree/test_aria_grid.html
@@ -18,7 +18,7 @@
       // grid having rowgroups
 
       var accTree =
-        { TABLE: [
+        { GRID: [
           { GROUPING: [
             { ROW: [
               { GRID_CELL: [
@@ -34,7 +34,7 @@
       // strange grids (mix of ARIA and HTML tables)
 
       accTree = {
-        role: ROLE_TABLE,
+        role: ROLE_GRID,
         children: [
           { // div@role="row"
             role: ROLE_ROW,
@@ -67,7 +67,7 @@
       testAccessibleTree("strange_grid1", accTree);
 
       accTree = {
-        role: ROLE_TABLE,
+        role: ROLE_GRID,
         children: [
           { // tr@role="row"
             role: ROLE_ROW,
@@ -95,7 +95,7 @@
       testAccessibleTree("strange_grid2", accTree);
 
       accTree = {
-        role: ROLE_TABLE,
+        role: ROLE_GRID,
         children: [
           { // div@role="row"
             role: ROLE_ROW,
@@ -122,7 +122,7 @@
       testAccessibleTree("strange_grid3", accTree);
 
       accTree = {
-        role: ROLE_TABLE,
+        role: ROLE_GRID,
         children: [
           { // div@role="row"
             role: ROLE_ROW,
@@ -192,7 +192,7 @@
       // grids that could contain text container accessibles but shouldn't.
 
       accTree =
-        { TABLE: [
+        { GRID: [
           { ROW: [
             { GRID_CELL: [
               { TEXT_LEAF: [ ] },
diff --git a/accessible/tests/mochitest/tree/test_aria_owns.html b/accessible/tests/mochitest/tree/test_aria_owns.html
index a01968521b..760cf7565b 100644
--- a/accessible/tests/mochitest/tree/test_aria_owns.html
+++ b/accessible/tests/mochitest/tree/test_aria_owns.html
@@ -96,7 +96,7 @@
       testAccessibleTree("ariaowns_container", tree);
 
       tree =
-        { TABLE: [
+        { GRID: [
           { ROW: [
             { GRID_CELL: [
               { TEXT_LEAF: [] },
@@ -160,7 +160,7 @@
   <!-- natural and aria-owns hierarchy -->
   <div id="t5_2" role="note"><div aria-owns="t5_3" role="heading"></div></div>
   <div id="t5_1"><div aria-owns="t5_2" role="group"></div></div>
-  <div id="t5_3" role="form"><div aria-owns="t5_1" role="tooltip"></div></div>
+  <div id="t5_3" aria-label="form" role="form"><div aria-owns="t5_1" role="tooltip"></div></div>
 
   <!-- rearrange children -->
   <div id="t6_1" aria-owns="t6_3 t6_2">
diff --git a/accessible/tests/mochitest/tree/test_tabbrowser.xhtml b/accessible/tests/mochitest/tree/test_tabbrowser.xhtml
index 401ea1a2b1..3ccf83e4dc 100644
--- a/accessible/tests/mochitest/tree/test_tabbrowser.xhtml
+++ b/accessible/tests/mochitest/tree/test_tabbrowser.xhtml
@@ -42,7 +42,7 @@
         browserDocument().documentElement.getBoundingClientRect();
       }
 
-      this.finalCheck = function testTabHierarchy_finalCheck(aEvent)
+      this.finalCheck = function testTabHierarchy_finalCheck()
       {
         ////////////////////
         // Tab bar
diff --git a/accessible/tests/mochitest/tree/test_tree.xhtml b/accessible/tests/mochitest/tree/test_tree.xhtml
index e22b3faa9d..e70ef134e9 100644
--- a/accessible/tests/mochitest/tree/test_tree.xhtml
+++ b/accessible/tests/mochitest/tree/test_tree.xhtml
@@ -97,7 +97,7 @@
       {
         this.DOMNode.view = aView;
       }
-      this.check = function check(aEvent)
+      this.check = function check()
       {
         testAccessibleTreeFor(this.DOMNode, aRole);
       }
-- 
cgit v1.2.3