From bded8855dd0562f7be7145f9b3fe02d43bf1a8d2 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Tue, 30 Apr 2024 17:18:04 -0700
Subject: [PATCH 01/38] Extend testdriver to add accessibility API testing

---
 .../aria-autocomplete.tentative.html          | 133 +++++++
 .../aria-braillelabel.tentative.html          |  64 ++++
 .../aria-errormessage.tentative.html          |  78 ++++
 core-aam/role/blockquote.tentative.html       |  82 ++++
 ...a-pressed_and_aria-haspopup.tentative.html |  76 ++++
 ...ined_value_for_aria-pressed.tentative.html |  73 ++++
 ...lse_value_for_aria-haspopup.tentative.html | 114 ++++++
 core-aam/scripts/aam-utils.js                 |  53 +++
 resources/testdriver.js                       |  22 ++
 tools/wpt/run.py                              |   3 +-
 .../wptrunner/wptrunner/executors/actions.py  |  18 +-
 .../wptrunner/executors/executormarionette.py |   5 +-
 .../executorplatformaccessibility.py          |  52 +++
 .../wptrunner/executors/executorwebdriver.py  |   8 +-
 .../platformaccessibility/__init__.py         |   0
 .../platformaccessibility/executoratspi.py    | 355 ++++++++++++++++++
 .../platformaccessibility/executoraxapi.py    | 148 ++++++++
 .../executorwindowsaccessibility.py           | 149 ++++++++
 .../platformaccessibility/ia2/constants.py    | 344 +++++++++++++++++
 .../platformaccessibility/ia2/ia2_api_all.tlb | Bin 0 -> 29016 bytes
 tools/wptrunner/wptrunner/testdriver-extra.js |   9 +-
 tools/wptrunner/wptrunner/testrunner.py       |  12 +-
 tools/wptrunner/wptrunner/wptcommandline.py   |   2 +
 tools/wptrunner/wptrunner/wptrunner.py        |   3 +-
 24 files changed, 1791 insertions(+), 12 deletions(-)
 create mode 100644 core-aam/attribute/aria-autocomplete.tentative.html
 create mode 100644 core-aam/attribute/aria-braillelabel.tentative.html
 create mode 100644 core-aam/attribute/aria-errormessage.tentative.html
 create mode 100644 core-aam/role/blockquote.tentative.html
 create mode 100644 core-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup.tentative.html
 create mode 100644 core-aam/role/button_with_defined_value_for_aria-pressed.tentative.html
 create mode 100644 core-aam/role/button_with_non_false_value_for_aria-haspopup.tentative.html
 create mode 100644 core-aam/scripts/aam-utils.js
 create mode 100644 tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
 create mode 100644 tools/wptrunner/wptrunner/executors/platformaccessibility/__init__.py
 create mode 100644 tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
 create mode 100644 tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
 create mode 100644 tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
 create mode 100644 tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py
 create mode 100644 tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/ia2_api_all.tlb
diff --git a/core-aam/attribute/aria-autocomplete.tentative.html b/core-aam/attribute/aria-autocomplete.tentative.html
new file mode 100644
index 00000000000000..248ae23a4238f1
--- /dev/null
+++ b/core-aam/attribute/aria-autocomplete.tentative.html
@@ -0,0 +1,133 @@
+<!doctype html>
+<meta charset=utf-8>
+<html>
+<head>
+  <title>aria-braillelabel</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="/core-aam/scripts/aam-utils.js"></script>
+</head>
+<body>
+
+<p>
+  This test is marked tentative because it uses an experimental testing API
+  that is presently under development.
+</p>
+
+<input role='combobox' id='test1' aria-autocomplete='both'>
+<input role='combobox' id='test2' aria-autocomplete='inline'>
+<input role='combobox' id='test3' aria-autocomplete='list'>
+
+<script>
+  AAMUtils.verifyAPI(
+    'aria-autocomplete=both',
+    'test1',
+    {
+      "Atspi" : [
+        [
+          "property",
+          "objectAttributes",
+          "contains",
+          "autocomplete:both"
+        ],
+        [
+          "property",
+          "states",
+          "contains",
+          "STATE_SUPPORTS_AUTOCOMPLETION"
+        ]
+      ],
+      "IAccessible2" : [
+         [
+           "property",
+           "objectAttributes",
+           "contains",
+           "autocomplete:both"
+         ],
+         [
+           "property",
+           "states",
+           "contains",
+           "IA2_STATE_SUPPORTS_AUTOCOMPLETION"
+         ]
+      ]
+    }
+  );
+
+  AAMUtils.verifyAPI(
+    'aria-autocomplete=inline',
+    'test2',
+    {
+      "Atspi" : [
+        [
+          "property",
+          "objectAttributes",
+          "contains",
+          "autocomplete:inline"
+        ],
+        [
+          "property",
+          "states",
+          "contains",
+          "STATE_SUPPORTS_AUTOCOMPLETION"
+        ]
+      ],
+      "IAccessible2" : [
+         [
+           "property",
+           "objectAttributes",
+           "contains",
+           "autocomplete:inline"
+         ],
+         [
+           "property",
+           "states",
+           "contains",
+           "IA2_STATE_SUPPORTS_AUTOCOMPLETION"
+         ]
+      ]
+    }
+  );
+
+  AAMUtils.verifyAPI(
+    'aria-autocomplete=list',
+    'test3',
+    {
+      "Atspi" : [
+        [
+          "property",
+          "objectAttributes",
+          "contains",
+          "autocomplete:list"
+        ],
+        [
+          "property",
+          "states",
+          "contains",
+          "STATE_SUPPORTS_AUTOCOMPLETION"
+        ]
+      ],
+      "IAccessible2" : [
+         [
+           "property",
+           "objectAttributes",
+           "contains",
+           "autocomplete:list"
+         ],
+         [
+           "property",
+           "states",
+           "contains",
+           "IA2_STATE_SUPPORTS_AUTOCOMPLETION"
+         ]
+      ]
+    }
+  );
+
+</script>
+
+</body>
+</html>
diff --git a/core-aam/attribute/aria-braillelabel.tentative.html b/core-aam/attribute/aria-braillelabel.tentative.html
new file mode 100644
index 00000000000000..0bed0de7dc96aa
--- /dev/null
+++ b/core-aam/attribute/aria-braillelabel.tentative.html
@@ -0,0 +1,64 @@
+<!doctype html>
+<meta charset=utf-8>
+<html>
+<head>
+  <title>aria-braillelabel</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="/core-aam/scripts/aam-utils.js"></script>
+</head>
+<body>
+
+<p>
+  This test is marked tentative because it uses an experimental testing API
+  that is presently under development.
+</p>
+
+<button id=test aria-braillelabel=foobar>
+
+<script>
+  AAMUtils.verifyAPI(
+    'aria-braillelabel',
+    'test',
+    {
+      "Atspi" : [
+        [
+          "property",
+          "objectAttributes",
+          "contains",
+          "braillelabel:foobar"
+        ]
+      ],
+      "AXAPI" : [
+        [
+          "property",
+          "AXBrailleLabel",
+          "is",
+          "foobar"
+        ]
+      ],
+      "IAccessible2" : [
+        [
+          "property",
+          "objectAttributes",
+          "contains",
+          "braillelabel:foobar"
+        ]
+      ],
+      "UIA" : [
+        [
+          "property",
+          "AriaProperties.braillelabel",
+          "is",
+          "foobar"
+        ]
+      ]
+    },
+  );
+</script>
+
+</body>
+</html>
diff --git a/core-aam/attribute/aria-errormessage.tentative.html b/core-aam/attribute/aria-errormessage.tentative.html
new file mode 100644
index 00000000000000..9edacbaa4cd756
--- /dev/null
+++ b/core-aam/attribute/aria-errormessage.tentative.html
@@ -0,0 +1,78 @@
+<!doctype html>
+<meta charset=utf-8>
+<html>
+<head>
+  <title>aria-flowto</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="/core-aam/scripts/aam-utils.js"></script>
+</head>
+<body>
+
+<p>
+  This test is marked tentative because it uses an experimental testing API
+  that is presently under development.
+</p>
+
+<div role='checkbox' id='test' aria-errormessage='error1 error2' aria-invalid='true'>content</div>
+<div id='error1'>hello</div>
+<div id='error2'>world</div>
+
+<script>
+  AAMUtils.verifyAPI(
+    'aria-flowto',
+    'test',
+    {
+      "Atspi" : [
+        [
+          "relation",
+          "RELATION_ERROR_MESSAGE",
+          "is",
+          ['error1', 'error2']
+        ],
+        [
+          "reverseRelation",
+          "RELATION_ERROR_FOR",
+          "is",
+          ['error1', 'error2']
+        ]
+      ],
+      "AXAPI" : [
+        [
+          "property",
+          "AXErrorMessageElements",
+          "is",
+          ['error1', 'error2']
+        ]
+      ],
+      "IAccessible2" : [
+        [
+          "relation",
+          "IA2_RELATION_ERROR",
+          "is",
+          ['error1', 'error2']
+        ],
+        [
+          "reverseRelation",
+          "IA2_RELATION_ERROR_FOR",
+          "is",
+          ['error1', 'error2']
+        ]
+      ],
+      "UIA" : [
+        [
+          "property",
+          "ControllerFor",
+          "is",
+          ['error1', 'error2']
+        ]
+      ]
+    }
+  );
+</script>
+
+</body>
+</html>
diff --git a/core-aam/role/blockquote.tentative.html b/core-aam/role/blockquote.tentative.html
new file mode 100644
index 00000000000000..5b4d256c60d377
--- /dev/null
+++ b/core-aam/role/blockquote.tentative.html
@@ -0,0 +1,82 @@
+<!doctype html>
+<meta charset=utf-8>
+<html>
+<head>
+  <title>role blockquote</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="/core-aam/scripts/aam-utils.js"></script>
+</head>
+<body>
+
+<p>
+  This test is marked tentative because it uses an experimental testing API
+  that is presently under development.
+</p>
+
+<div id=test role=blockquote>quote</div>
+
+<script>
+  AAMUtils.verifyAPI(
+    'role=blockquote',
+    'test',
+    {
+      "Atspi" : [
+         [
+            "property",
+            "role",
+            "is",
+            "block quote"
+         ]
+      ],
+      "AXAPI" : [
+         [
+            "property",
+            "AXRole",
+            "is",
+            "AXGroup"
+         ],
+         [
+            "property",
+            "AXSubrole",
+            "is",
+            "<nil>"
+         ]
+      ],
+      "IAccessible2" : [
+         [
+            "property",
+            "role",
+            "is",
+            "IA2_ROLE_BLOCK_QUOTE"
+         ],
+         [
+            "property",
+            "msaaRole",
+            "is",
+            "ROLE_SYSTEM_GROUPING"
+         ]
+      ],
+      "UIA" : [
+         [
+            "property",
+            "ControlType",
+            "is",
+            "Group"
+         ],
+         [
+            "property",
+            "LocalizedControlType",
+            "is",
+            "blockquote"
+         ]
+      ]
+    }
+  );
+</script>
+
+</body>
+</html>
diff --git a/core-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup.tentative.html b/core-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup.tentative.html
new file mode 100644
index 00000000000000..bbd1c696ad1cc3
--- /dev/null
+++ b/core-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup.tentative.html
@@ -0,0 +1,76 @@
+<!doctype html>
+<meta charset=utf-8>
+<html>
+<head>
+  <title>role button with default values for aria-pressed and aria-hapopup</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="/core-aam/scripts/aam-utils.js"></script>
+</head>
+<body>
+
+<p>
+  This test is marked tentative because it uses an experimental testing API
+  that is presently under development.
+</p>
+
+<div id=test1 role=button>click me</div>
+<div id=test2 role=button aria-pressed>click me</div>
+<div id=test3 role=button aria-pressed aria-haspopup>click me</div>
+<div id=test4 role=button aria-haspopup>click me</div>
+<div id=test5 role=button aria-haspopup=false>click me</div>
+
+<script>
+  var test_statements = {
+    "Atspi" : [
+       [
+          "property",
+          "role",
+          "is",
+          "push button"
+       ]
+    ],
+    "AXAPI" : [
+       [
+          "property",
+          "AXRole",
+          "is",
+          "AXButton"
+       ],
+       [
+          "property",
+          "AXSubrole",
+          "is",
+          "<nil>"
+       ]
+    ],
+    "IAccessible2" : [
+       [
+          "property",
+          "msaaRole",
+          "is",
+          "ROLE_SYSTEM_PUSHBUTTON"
+       ]
+    ],
+    "UIA" : [
+       [
+          "property",
+          "ControlType",
+          "is",
+          "Button"
+       ]
+    ]
+  };
+
+  AAMUtils.verifyAPI('role=button', 'test1', test_statements);
+  AAMUtils.verifyAPI('role=button aria-pressed', 'test2', test_statements);
+  AAMUtils.verifyAPI('role=button aria-pressed aria-haspopup', 'test3', test_statements);
+  AAMUtils.verifyAPI('role=button aria-haspopup', 'test4', test_statements);
+  AAMUtils.verifyAPI('role=button aria-haspopup=false', 'test5', test_statements);
+</script>
+
+</body>
+</html>
diff --git a/core-aam/role/button_with_defined_value_for_aria-pressed.tentative.html b/core-aam/role/button_with_defined_value_for_aria-pressed.tentative.html
new file mode 100644
index 00000000000000..0e8e2cead1ac6d
--- /dev/null
+++ b/core-aam/role/button_with_defined_value_for_aria-pressed.tentative.html
@@ -0,0 +1,73 @@
+<!doctype html>
+<meta charset=utf-8>
+<html>
+<head>
+  <title>role button with defined value for aria-pressed</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="/core-aam/scripts/aam-utils.js"></script>
+</head>
+<body>
+<p>
+  This test is marked tentative because it uses an experimental testing API
+  that is presently under development.
+</p>
+
+<div id=test1 role=button aria-pressed=true>press me</div>
+<div id=test2 role=button aria-pressed=false>press me</div>
+
+<script>
+  var test_statements = {
+    "Atspi" : [
+       [
+          "property",
+          "role",
+          "is",
+          "toggle button"
+       ]
+    ],
+    "AXAPI" : [
+       [
+          "property",
+          "AXRole",
+          "is",
+          "AXCheckBox"
+       ],
+       [
+          "property",
+          "AXSubrole",
+          "is",
+          "AXToggle"
+       ]
+    ],
+    "IAccessible2" : [
+       [
+          "property",
+          "role",
+          "is",
+          "IA2_ROLE_TOGGLE_BUTTON"
+       ],
+      [
+          "property",
+          "msaaRole",
+          "is",
+          "ROLE_SYSTEM_PUSHBUTTON"
+       ]
+    ],
+    "UIA" : [
+       [
+          "property",
+          "ControlType",
+          "is",
+          "Button"
+       ]
+    ]
+  };
+
+  AAMUtils.verifyAPI('role=button aria-pressed=true', 'test1', test_statements);
+  AAMUtils.verifyAPI('role=button aria-pressed=false','test2', test_statements);
+</script>
+</body>
diff --git a/core-aam/role/button_with_non_false_value_for_aria-haspopup.tentative.html b/core-aam/role/button_with_non_false_value_for_aria-haspopup.tentative.html
new file mode 100644
index 00000000000000..d2871e4549da72
--- /dev/null
+++ b/core-aam/role/button_with_non_false_value_for_aria-haspopup.tentative.html
@@ -0,0 +1,114 @@
+<!doctype html>
+<meta charset=utf-8>
+<html>
+<head>
+  <title>role button with non false value for aria-pressed</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="/core-aam/scripts/aam-utils.js"></script>
+</head>
+<body>
+
+<p>
+  This test is marked tentative because it uses an experimental testing API
+  that is presently under development.
+</p>
+
+<div id=test1 role=button aria-haspopup=true>click me</div>
+<div id=test2 role=button aria-haspopup=menu>click me</div>
+<div id=test3 role=button aria-haspopup=listbox>click me</div>
+<div id=test4 role=button aria-haspopup=tree>click me</div>
+<div id=test5 role=button aria-haspopup=grid>click me</div>
+<div id=test6 role=button aria-haspopup=dialog>click me</div>
+
+<script>
+  var test_statements =  {
+     "Atspi" : [
+        [
+           "property",
+           "role",
+           "is",
+           "push button"
+        ]
+     ],
+     "AXAPI" : [
+        [
+           "property",
+           "AXRole",
+           "is",
+           "AXPopUpButton"
+        ],
+        [
+           "property",
+           "AXSubrole",
+           "is",
+           "<nil>"
+        ],
+        [
+           "property",
+           "actions",
+           "contains",
+           "AXShowMenu"
+        ]
+     ],
+     "IAccessible2" : [
+        [
+           "property",
+           "msaaRole",
+           "is",
+           "ROLE_SYSTEM_PUSHBUTTON"
+        ]
+     ],
+     "UIA" : [
+        [
+           "property",
+           "ControlType",
+           "is",
+           "Button"
+        ]
+     ]
+  };
+
+
+
+  AAMUtils.verifyAPI(
+    'role=button aria-haspopup=true',
+    'test1',
+    test_statements
+  );
+
+  AAMUtils.verifyAPI(
+    'role=button aria-haspopup=menu',
+    'test2',
+    test_statements
+  );
+
+  AAMUtils.verifyAPI(
+    'role=button aria-haspopup=listbox',
+    'test3',
+    test_statements
+  );
+
+  AAMUtils.verifyAPI(
+    'role=button aria-haspopup=tree',
+    'test4',
+    test_statements
+  );
+
+  AAMUtils.verifyAPI(
+    'role=button aria-haspopup=grid',
+    'test5',
+    test_statements
+  );
+
+  AAMUtils.verifyAPI(
+    'role=button aria-haspopup=dialog',
+    'test6',
+    test_statements
+  );
+
+</script>
+</body>
diff --git a/core-aam/scripts/aam-utils.js b/core-aam/scripts/aam-utils.js
new file mode 100644
index 00000000000000..3bc0008b23bd20
--- /dev/null
+++ b/core-aam/scripts/aam-utils.js
@@ -0,0 +1,53 @@
+/*
+  Utility files for platform specific accessibility API tests for the
+  Accessibility API Mappings (AAM) standards: Core-AAM and HTML-aam
+*/
+
+const AAMUtils = {
+  APIS: ['Atspi', 'AXAPI', 'IAccessible2', 'UIA'],
+
+  runAssertions: function(test_statements, results) {
+    // If the test was not run, the API doesn't apply to backend OS,
+    // pass with no asserts.
+    if (!results) {
+      return;
+    }
+
+    if (results.length !== test_statements.length)
+      assert_unreached(`Recieved a different number of results than test statements: ${results}`)
+
+    for (i = 0; i < results.length; i++) {
+      assert_equals(results[i], "Pass", `${test_statements[i].join(' ')}`)
+    }
+  },
+
+
+  /*
+    Creates a subtest for each API. Runs no asserts for APIs not found.
+
+    id:     id of element to test the accessibility node of
+    map:    entry in role-map.js, or similar
+    name:   name of the test
+  */
+
+  verifyAPI: function(test_name, id, map) {
+    if (!map) {
+      throw "Error: missing accessibility API test map";
+    }
+
+    for (const api of this.APIS) {
+      if (map[api] && map[api].length) {
+        promise_test(async t => {
+          let results = await test_driver.test_accessibility_api(
+            id,
+            map,
+            api
+          );
+
+          this.runAssertions(map[api], results);
+
+        }, `api: ${api}, ${test_name}`);
+      }
+    }
+  }
+}
diff --git a/resources/testdriver.js b/resources/testdriver.js
index 0986b207696568..e09c666127cc9b 100644
--- a/resources/testdriver.js
+++ b/resources/testdriver.js
@@ -2307,6 +2307,23 @@
          */
         uninstall_web_extension: function(extension_id) {
             return window.test_driver_internal.uninstall_web_extension(extension_id);
+        },
+
+        /**
+         * Test properties of API's accessibility node. This test API endpoint
+         * is still under development and subject to change, and for now should
+         * only be used for core-aam and html-aam tests.
+         *
+         * @param {id}         id of element
+         * @param {test}       an object of tests
+         * @param {api}        string indicating the API to test
+         * @returns {Promise}  The string "match" when the test succeeds,
+         *                     a failure message otherwise
+         */
+        test_accessibility_api: async function(dom_id, test, api) {
+            return window.test_driver_internal.test_accessibility_api(
+              dom_id, test, api, location.href
+            );
         }
     };
 
@@ -2644,6 +2661,11 @@
 
         async get_global_privacy_control() {
             throw new Error("get_global_privacy_control() is not implemented by testdriver-vendor.js");
+        },
+
+        async test_accessibility_api(dom_id, test, api, url) {
+            throw new Error("test_accessibility_api() is not available.");
         }
+
     };
 })();
diff --git a/tools/wpt/run.py b/tools/wpt/run.py
index 0f35fb5e68c877..181a32122d9969 100644
--- a/tools/wpt/run.py
+++ b/tools/wpt/run.py
@@ -520,7 +520,8 @@ def setup_kwargs(self, kwargs):
             # We are on Taskcluster, where our Docker container does not have
             # enough capabilities to run Chrome with sandboxing. (gh-20133)
             kwargs["binary_args"].append("--no-sandbox")
-
+        if kwargs["force_renderer_accessibility"]:
+            kwargs["binary_args"].append("--force-renderer-accessibility")
 
 class HeadlessShell(BrowserSetup):
     name = "headless_shell"
diff --git a/tools/wptrunner/wptrunner/executors/actions.py b/tools/wptrunner/wptrunner/executors/actions.py
index 785962062822bf..1c336f1ff9854d 100644
--- a/tools/wptrunner/wptrunner/executors/actions.py
+++ b/tools/wptrunner/wptrunner/executors/actions.py
@@ -594,6 +594,21 @@ def __call__(self, payload):
         extension_id = payload["extension_id"]
         return self.protocol.web_extensions.uninstall_web_extension(extension_id)
 
+class TestAccessibilityAPIAction:
+    name = "test_accessibility_api"
+
+    def __init__(self, logger, protocol):
+        self.logger = logger
+        self.protocol = protocol
+
+    def __call__(self, payload):
+        dom_id = payload["dom_id"]
+        test = payload["test"]
+        api = payload["api"]
+        url = payload["url"]
+        return self.protocol.platform_accessibility.test_accessibility_api(dom_id, test, api, url)
+
+
 actions = [ClickAction,
            DeleteAllCookiesAction,
            GetAllCookiesAction,
@@ -640,4 +655,5 @@ def __call__(self, payload):
            GetGlobalPrivacyControlAction,
            SetGlobalPrivacyControlAction,
            WebExtensionInstallAction,
-           WebExtensionUninstallAction]
+           WebExtensionUninstallAction,
+           TestAccessibilityAPIAction]
diff --git a/tools/wptrunner/wptrunner/executors/executormarionette.py b/tools/wptrunner/wptrunner/executors/executormarionette.py
index e1b954a7d23da5..467acb491bdf8c 100644
--- a/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -51,6 +51,7 @@
                        WindowProtocolPart,
                        merge_dicts)
 
+from .executorplatformaccessibility import (PlatformAccessibilityProtocolPart)
 
 def do_delayed_imports():
     global errors, marionette, Addons, WebAuthn
@@ -827,12 +828,14 @@ class MarionetteProtocol(Protocol):
                   MarionetteDevicePostureProtocolPart,
                   MarionetteVirtualPressureSourceProtocolPart,
                   MarionetteDisplayFeaturesProtocolPart,
-                  MarionetteWebExtensionsProtocolPart]
+                  MarionetteWebExtensionsProtocolPart,
+                  PlatformAccessibilityProtocolPart]
 
     def __init__(self, executor, browser, capabilities=None, timeout_multiplier=1, e10s=True, ccov=False):
         do_delayed_imports()
 
         super().__init__(executor, browser)
+        self.product_name = browser.product_name
         self.marionette = None
         self.marionette_port = browser.marionette_port
         self.capabilities = capabilities
diff --git a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
new file mode 100644
index 00000000000000..bad2baecf48f36
--- /dev/null
+++ b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
@@ -0,0 +1,52 @@
+from .protocol import ProtocolPart
+
+from abc import ABCMeta
+from sys import platform
+
+linux = False
+mac = False
+windows = False
+if platform == "linux":
+    linux = True
+    from .platformaccessibility.executoratspi import AtspiExecutorImpl
+if platform == "darwin":
+    mac = True
+    from .platformaccessibility.executoraxapi import AXAPIExecutorImpl
+if platform == "win32":
+    windows = True
+    from .platformaccessibility.executorwindowsaccessibility import WindowsAccessibilityExecutorImpl
+
+def valid_api_for_platform(api):
+    if (linux and api == "Atspi"):
+        return True
+    if (mac and api == "AXAPI"):
+        return True
+    if (windows and (api == "UIA" or api == "IAccessible2")):
+        return True
+    return False
+
+class PlatformAccessibilityProtocolPart(ProtocolPart):
+    """Protocol part for platform accessibility introspection"""
+    name = "platform_accessibility"
+
+    def setup(self):
+        self.product_name = self.parent.product_name
+        self.impl = None
+        if linux:
+            self.impl = AtspiExecutorImpl()
+            self.impl.setup(self.product_name, self.logger)
+        if mac:
+            self.impl = AXAPIExecutorImpl()
+            self.impl.setup(self.product_name, self.logger)
+        if windows:
+            self.impl = WindowsAccessibilityExecutorImpl()
+            self.impl.setup(self.product_name, self.logger)
+
+    def test_accessibility_api(self, dom_id, test, api, url):
+        # Tests will pass if they are not applicable for a platform,
+        # for example, Windows API tests passed to Linux. Ideally, this will
+        # be fixed with a "not applicable".
+        if not valid_api_for_platform(api):
+          return ""
+
+        return self.impl.test_accessibility_api(dom_id, test, api, url)
diff --git a/tools/wptrunner/wptrunner/executors/executorwebdriver.py b/tools/wptrunner/wptrunner/executors/executorwebdriver.py
index f7f4428b2c604c..1040adbab8fde0 100644
--- a/tools/wptrunner/wptrunner/executors/executorwebdriver.py
+++ b/tools/wptrunner/wptrunner/executors/executorwebdriver.py
@@ -52,7 +52,9 @@
                        WebExtensionsProtocolPart,
                        merge_dicts)
 
-from typing import Any, List, Dict, Optional
+from .executorplatformaccessibility import (PlatformAccessibilityProtocolPart)
+
+from typing import Any, List, Dict, Optional, Tuple
 from webdriver.client import Session
 from webdriver import error as webdriver_error
 from webdriver.bidi import error as webdriver_bidi_error
@@ -1029,10 +1031,12 @@ class WebDriverProtocol(Protocol):
                   WebDriverProtectedAudienceProtocolPart,
                   WebDriverDisplayFeaturesProtocolPart,
                   WebDriverGlobalPrivacyControlProtocolPart,
-                  WebDriverWebExtensionsProtocolPart]
+                  WebDriverWebExtensionsProtocolPart,
+                  PlatformAccessibilityProtocolPart]
 
     def __init__(self, executor, browser, capabilities, **kwargs):
         super().__init__(executor, browser)
+        self.product_name = browser.product_name
         self.capabilities = capabilities
         if hasattr(browser, "capabilities"):
             if self.capabilities is None:
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/__init__.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
new file mode 100644
index 00000000000000..ccd86c35c13c1a
--- /dev/null
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
@@ -0,0 +1,355 @@
+import gi
+
+gi.require_version("Atspi", "2.0")
+from gi.repository import Atspi
+import json
+import threading
+import time
+
+import sys
+
+
+def poll_for_tab(root, product, url):
+    """Poll until the tab with the test url is loaded and available in the
+       accessibility API. Assumes wptrunner has already started a browser
+       process and navigated to the test test page.
+
+    :param root: The node in the accessibility API representing the browser process.
+    :param product: The name of the browser.
+    :param url: The url of the test.
+    :return: Atspi.Accessible representing test document.
+    """
+
+    tab = find_tab(root, product, url)
+    while not tab:
+        time.sleep(0.01)
+        tab = find_tab(root, product, url)
+
+    return tab
+
+
+def find_tab(root, product, url):
+    """Find the tab with the test url.
+
+    :param root: The node in the accessibility API representing the browser process.
+    :param product: The name of the browser.
+    :param url: The url of the test.
+    :return: Atspi.Accessible representing test document or None.
+    """
+
+    stack = [root]
+    while stack:
+        node = stack.pop()
+        if Atspi.Accessible.get_role_name(node) == "frame":
+            relationset = Atspi.Accessible.get_relation_set(node)
+            for relation in relationset:
+                if relation.get_relation_type() == Atspi.RelationType.EMBEDS:
+                    tab = relation.get_target(0)
+                    if is_ready(tab, product, url):
+                        return tab
+                    else:
+                        return None
+            continue
+
+        for i in range(Atspi.Accessible.get_child_count(node)):
+            child = Atspi.Accessible.get_child_at_index(node, i)
+            stack.append(child)
+
+    return None
+
+
+def is_ready(tab, product, url):
+    """Test whether tab is fully loaded.
+
+    :param tab: Atspi.Accessible representing test document.
+    :param product: The name of the browser.
+    :param url: The url of the test.
+    :return: Boolean.
+    """
+
+    # Firefox uses the "BUSY" state to indicate the page is not ready.
+    if product == "firefox":
+        state_set = Atspi.Accessible.get_state_set(tab)
+        return not Atspi.StateSet.contains(state_set, Atspi.StateType.BUSY)
+
+    # Chromium family browsers do not use "BUSY", but you can
+    # tell if the document can be queried by URL attribute. If the 'URL'
+    # attribute is not here, we need to query for a new accessible object.
+    document = Atspi.Accessible.get_document_iface(tab)
+    document_attributes = Atspi.Document.get_document_attributes(document)
+    if "URI" in document_attributes and document_attributes["URI"] == url:
+        return True
+    return False
+
+
+def find_browser(name):
+    """Find the Atspi.Accessible representing the browser.
+
+    :param name: The name of the browser.
+    :return: Atspi.Accessible or None.
+    """
+
+    desktop = Atspi.get_desktop(0)
+    child_count = Atspi.Accessible.get_child_count(desktop)
+    for i in range(child_count):
+        app = Atspi.Accessible.get_child_at_index(desktop, i)
+        full_app_name = Atspi.Accessible.get_name(app)
+        if name in full_app_name.lower():
+            return app
+    return None
+
+
+def find_node(root, dom_id):
+    """Find the Atspi.Accessible with a specified dom_id.
+
+    :dom_id: The dom ID.
+    :return: TestNode or None if not found.
+    """
+
+    stack = [root]
+    while stack:
+        node = stack.pop()
+
+        attributes = Atspi.Accessible.get_attributes(node)
+        if "id" in attributes and attributes["id"] == dom_id:
+            return TestNode(root, dom_id, node)
+
+        for i in range(Atspi.Accessible.get_child_count(node)):
+            child = Atspi.Accessible.get_child_at_index(node, i)
+            stack.append(child)
+
+    return None
+
+
+class AtspiExecutorImpl:
+    def setup(self, product_name, logger):
+        """Setup for accessibility API testing.
+
+        :product_name: The name of the browser, used to find the browser in the accessibility API.
+        :logger: Logger for logging errors.
+        """
+        self.logger = logger
+        self.product_name = product_name
+        self.root = None
+        self.document = None
+        self.test_url = None
+
+        self.root = find_browser(self.product_name)
+        if not self.root:
+            self.logger.error(
+                f"Couldn't find browser {self.product_name} in accessibility API ATSPI. Accessibility API queries will not succeeded."
+            )
+
+    def __poll_for_tab_if_necessary(self, url):
+        """If accessible node representing the test document for this URL has
+           not been found, find it and set self.document.
+
+        :param url: The url of the test.
+        """
+        if not self.root:
+            raise Exception(
+                f"Couldn't find browser {self.product_name} in accessibility API ATSPI. Did you turn on accessibility?"
+            )
+
+        if self.test_url != url or not self.document:
+            self.test_url = url
+            self.document = poll_for_tab(self.root, self.product_name, url)
+
+    def test_accessibility_api(self, dom_id, test, api, url):
+        """Execute a test of the accessibility API.
+
+        :param dom_id: The dom id of the node to test.
+        :param test: The test statement.
+        :param api: The API to test.
+        :param url: The url of the test.
+        """
+        self.__poll_for_tab_if_necessary(url)
+
+        test_node = find_node(self.document, dom_id)
+
+        if not test_node:
+            raise Exception(
+                f"Couldn't find node with id {dom_id} in accessibility API ATSPI."
+            )
+
+        results = []
+        for test_statement in test["Atspi"]:
+            results.append(test_node.run_test_statement(TestStatement(test_statement)))
+
+        return results
+
+
+class TestNode:
+    """Wrapper around an Atspi Node for testing purposes"""
+
+    def __init__(self, document, dom_id, node):
+        self.document = document
+        self.dom_id = dom_id
+        self.node = node
+
+    def serialize(self):
+        """Convert the node to a dictionary for printing/debugging.
+
+        :returns: A dictionary representing the node.
+        """
+
+        node_dictionary = {}
+        node_dictionary["API"] = "atspi"
+        node_dictionary["role"] = Atspi.Accessible.get_role_name(self.node)
+        node_dictionary["name"] = Atspi.Accessible.get_name(self.node)
+        node_dictionary["description"] = Atspi.Accessible.get_description(self.node)
+        node_dictionary["states"] = self.get_state_list()
+        node_dictionary["objectAttributes"] = Atspi.Accessible.get_attributes_as_array(
+            self.node
+        )
+        node_dictionary["relations"] = self.get_relations_dictionary()
+
+        return node_dictionary
+
+    def run_test_statement(self, statement):
+        """Run a single test statement.
+
+        :statement: a TestStatement object
+        :returns: the string "Pass" or a failure message.
+        """
+
+        if statement.type == "property":
+            return self.run_property_test(statement)
+
+        if statement.type == "relation":
+            return self.run_relation_test(statement)
+
+        if statement.type == "reverseRelation":
+            return self.run_reverse_relation_test(statement)
+
+        return "Error: not implemented ({statement.type})"
+
+    def run_property_test(self, statement):
+        """Run a single test statement with type "property".
+
+        :statement: a TestStatement object
+        :returns: the string "Pass" or a failure message.
+        """
+
+        if statement.key == "role":
+            role = Atspi.Accessible.get_role_name(self.node)
+            return statement.value_compare_with(role)
+
+        if statement.key == "objectAttributes":
+            attributes = Atspi.Accessible.get_attributes_as_array(self.node)
+            return statement.value_contained_or_not_contained_in(attributes)
+
+        if statement.key == "states":
+            states = self.get_state_list()
+            return statement.value_contained_or_not_contained_in(states)
+
+        return f"Fail: not implemented ({statement.key})"
+
+    def run_relation_test(self, statement):
+        """Run a single test statement with type "relation".
+
+        :statement: a TestStatement object
+        :returns: the string "Pass" or a failure message.
+        """
+
+        expected_relation = statement.key
+        expected_ids = statement.value
+        relations_dict = self.get_relations_dictionary()
+        if expected_relation not in relations_dict:
+            return f"Fail: relation not in list: {list(relations_dict.keys())}"
+        id_str = ",".join(relations_dict[expected_relation])
+        expected_ids.sort()
+        expected_id_str = ",".join(expected_ids)
+        if id_str != expected_id_str:
+            return f"Fail: {expected_relation}={relations_dict[expected_relation]}"
+        return "Pass"
+
+    def run_reverse_relation_test(self, statement):
+        """Run a single test statement with type "reverseRelation".
+
+        :statement: a TestStatement object
+        :returns: the string "Pass" or a failure message.
+        """
+
+        expected_relation = statement.key
+        # statement.value is a list of dom_ids representing the nodes that should have
+        # a reverse relation back to this node.
+        expected_elements = statement.value
+
+        for element in expected_elements:
+            test_node = find_node(self.document, element)
+            relations_dict = test_node.get_relations_dictionary()
+
+            if expected_relation not in relations_dict:
+                return f"Fail: element '{element}' does not have reverse relation, has relations: {list(relations_dict.keys())}"
+
+            if self.dom_id not in relations_dict[expected_relation]:
+                return f"Fail: element '{element}' {expected_relation}={relations_dict[expected_relation]}"
+
+        return "Pass"
+
+    def get_relations_dictionary(self):
+        """
+        :returns: A dictionary with relations as keys and the values, DOM ids.
+        """
+        relations_dict = {}
+        relations = Atspi.Accessible.get_relation_set(self.node)
+        for relation in relations:
+            name = relation.get_relation_type().value_name.removeprefix("ATSPI_")
+            relations_dict[name] = []
+            num_targets = relation.get_n_targets()
+
+            for i in range(num_targets):
+                target = relation.get_target(i)
+                attributes = Atspi.Accessible.get_attributes(target)
+                if "id" in attributes:
+                    relations_dict[name].append(attributes["id"])
+                else:
+                    relations_dict[name].append("[unknown id]")
+        return relations_dict
+
+    def get_state_list(self):
+        """
+        :returns: A list of states for this Atspi.Accessible.
+        """
+        state_list = Atspi.Accessible.get_state_set(self.node).get_states()
+        state_string_list = []
+        for state in state_list:
+            state_string_list.append(state.value_name.replace("ATSPI_", ""))
+        return state_string_list
+
+
+class TestStatement:
+    """Wrapper around an accessibility API test statement"""
+
+    def __init__(self, test_statement_arr):
+        self.test_statement_arr = test_statement_arr
+
+        self.type = test_statement_arr[0]
+        self.key = test_statement_arr[1]
+        self.assertion = test_statement_arr[2]
+        self.value = test_statement_arr[3]
+
+    def value_compare_with(self, value):
+        if self.assertion == "is":
+            if self.value != value:
+                return f"Fail: {self.key} is {value}"
+        elif self.assertion == "isNot":
+            if self.value == value:
+                return f"Fail: {self.key} is {value}"
+        else:
+            return f"Error: Test statement malformed, '{self.assertion}' must be 'is' or 'isNot'."
+
+        return "Pass"
+
+    def value_contained_or_not_contained_in(self, array):
+        if self.assertion == "contains":
+            if self.value not in array:
+                return f"Fail: {array} does not contain {self.value}"
+        elif self.assertion == "doesNotContain":
+            if self.value in array:
+                return f"Fail: {array} contains {self.value}"
+        else:
+            return f"Error: Test statement malformed, '{self.assertion}' must be 'contains' or 'doesNotContain'."
+
+        return "Pass"
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
new file mode 100644
index 00000000000000..b4e964abc7cbd8
--- /dev/null
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
@@ -0,0 +1,148 @@
+from ApplicationServices import (
+    AXUIElementCopyAttributeNames,
+    AXUIElementCopyAttributeValue,
+    AXUIElementCreateApplication,
+)
+
+from Cocoa import (
+    NSApplicationActivationPolicyRegular,
+    NSPredicate,
+    NSWorkspace,
+)
+
+import json
+
+
+def find_browser(name):
+    """Find the AXUIElement representing the browser.
+
+    :param name: The name of the browser.
+    :return: AXUIElement or None.
+    """
+
+    ws = NSWorkspace.sharedWorkspace()
+    regular_predicate = NSPredicate.predicateWithFormat_(
+        f"activationPolicy == {NSApplicationActivationPolicyRegular}"
+    )
+    running_apps = ws.runningApplications().filteredArrayUsingPredicate_(
+        regular_predicate
+    )
+    name_predicate = NSPredicate.predicateWithFormat_(
+        f"localizedName contains[c] '{name}'"
+    )
+    filtered_apps = running_apps.filteredArrayUsingPredicate_(name_predicate)
+    if filtered_apps.count() == 0:
+        return None
+    app = filtered_apps[0]
+    pid = app.processIdentifier()
+    if pid == -1:
+        return None
+    return AXUIElementCreateApplication(pid)
+
+
+def find_active_tab(browser):
+    """Find the active tab of the browser.
+
+    :param browser: The name of the browser.
+    :return: AXUIElement representing test document or None.
+    """
+
+    stack = [browser]
+    tabs = []
+    while stack:
+        node = stack.pop()
+
+        (err, role) = AXUIElementCopyAttributeValue(node, "AXRole", None)
+        if err:
+            continue
+        if role == "AXWebArea":
+            return node
+
+        (err, children) = AXUIElementCopyAttributeValue(node, "AXChildren", None)
+        if err:
+            continue
+        stack.extend(children)
+
+    return None
+
+
+def find_node(root, attribute, expected_value):
+    """Find the AXUIElement with a specified dom_id.
+
+    :dom_id: The dom ID.
+    :return: AXUIElement or None if not found.
+    """
+
+    stack = [root]
+    while stack:
+        node = stack.pop()
+
+        (err, attributes) = AXUIElementCopyAttributeNames(node, None)
+        if err:
+            continue
+        if attribute in attributes:
+            (err, value) = AXUIElementCopyAttributeValue(node, attribute, None)
+            if err:
+                continue
+            if value == expected_value:
+                return node
+
+        (err, children) = AXUIElementCopyAttributeValue(node, "AXChildren", None)
+        if err:
+            continue
+        stack.extend(children)
+    return None
+
+
+def serialize_node(node):
+    """Convert the node to a dictionary for printing/debugging.
+
+    :returns: A dictionary representing the node.
+    """
+    props = {}
+    props["API"] = "axapi"
+    (err, role) = AXUIElementCopyAttributeValue(node, "AXRole", None)
+    props["role"] = role
+    (err, name) = AXUIElementCopyAttributeValue(node, "AXTitle", None)
+    props["name"] = name
+    (err, description) = AXUIElementCopyAttributeValue(node, "AXDescription", None)
+    props["description"] = description
+
+    return props
+
+
+class AXAPIExecutorImpl:
+    def setup(self, product_name, logger):
+        """Setup for accessibility API testing.
+
+        :product_name: The name of the browser, used to find the browser in the accessibility API.
+        :logger: Logger for logging errors.
+        """
+        self.product_name = product_name
+        self.root = find_browser(self.product_name)
+
+        if not self.root:
+            self.logger.error(
+                f"Couldn't find browser {self.product_name} in accessibility API AX API. Accessibility API queries will not succeeded."
+            )
+
+    def test_accessibility_api(self, dom_id, test, api, url):
+        """Execute a test of the accessibility API.
+
+        :param dom_id: The dom id of the node to test.
+        :param test: The test statement.
+        :param api: The API to test.
+        :param url: The url of the test.
+        """
+        tab = find_active_tab(self.root)
+        node = find_node(tab, "AXDOMIdentifier", dom_id)
+        if not node:
+            raise Exception(
+                f"Couldn't find node with ID {dom_id}. Did you turn on accessibility?"
+            )
+
+        results = []
+        for test_statement in test["AXAPI"]:
+            results.append("Fail: Test not implemented.")
+
+        return results
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
new file mode 100644
index 00000000000000..3ae6eb3b3301ac
--- /dev/null
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
@@ -0,0 +1,149 @@
+from ..executors.ia2.constants import *
+
+import json
+import sys
+import time
+
+import ctypes
+from ctypes import POINTER, byref
+from ctypes.wintypes import BOOL, HWND, LPARAM, POINT
+
+import comtypes.client
+from comtypes import COMError, IServiceProvider
+
+CHILDID_SELF = 0
+OBJID_CLIENT = -4
+
+user32 = ctypes.windll.user32
+oleacc = ctypes.oledll.oleacc
+oleaccMod = comtypes.client.GetModule("oleacc.dll")
+IAccessible = oleaccMod.IAccessible
+
+# CoCreateInstance of UIA also initializes IA2
+uiaMod = comtypes.client.GetModule("UIAutomationCore.dll")
+uiaClient = comtypes.CoCreateInstance(
+    uiaMod.CUIAutomation._reg_clsid_,
+    interface=uiaMod.IUIAutomation,
+    clsctx=comtypes.CLSCTX_INPROC_SERVER,
+)
+
+
+def accessible_object_from_window(hwnd):
+    p = POINTER(IAccessible)()
+    oleacc.AccessibleObjectFromWindow(
+        hwnd, OBJID_CLIENT, byref(IAccessible._iid_), byref(p)
+    )
+    return p
+
+
+def name_from_hwnd(hwnd):
+    MAX_CHARS = 257
+    buffer = ctypes.create_unicode_buffer(MAX_CHARS)
+    user32.GetWindowTextW(hwnd, buffer, MAX_CHARS)
+    return buffer.value
+
+
+def get_browser_hwnd(product_name):
+    found = []
+
+    @ctypes.WINFUNCTYPE(BOOL, HWND, LPARAM)
+    def check_window_name(hwnd, lParam):
+        window_name = name_from_hwnd(hwnd)
+        if product_name not in window_name.lower():
+            # EnumWindows should continue enumerating
+            return True
+        found.append(hwnd)
+        # EnumWindows should stop enumerating (since we found the right window)
+        return False
+
+    user32.EnumWindows(check_window_name, LPARAM(0))
+    if not found:
+        raise LookupError(f"Couldn't find {product_name} HWND")
+    return found[0]
+
+
+def to_ia2(node):
+    service = node.QueryInterface(IServiceProvider)
+    return service.QueryService(IAccessible2._iid_, IAccessible2)
+
+
+def find_browser(product_name):
+    hwnd = get_browser_hwnd(product_name)
+    root = accessible_object_from_window(hwnd)
+    return to_ia2(root)
+
+
+def poll_for_tab(url, root):
+    tab = find_tab(url, root)
+    while not tab:
+        time.sleep(0.01)
+        tab = find_tab(url, root)
+    return tab
+
+
+def find_tab(url, root):
+    for i in range(1, root.accChildCount + 1):
+        child = to_ia2(root.accChild(i))
+        if child.accRole(CHILDID_SELF) == ROLE_SYSTEM_DOCUMENT:
+            if child.accValue(CHILDID_SELF) == url:
+                return child
+            # No need to search within documents.
+            return
+        descendant = find_tab(url, child)
+        if descendant:
+            return descendant
+
+
+def find_ia2_node(root, id):
+    id_attribute = f"id:{id};"
+    for i in range(1, root.accChildCount + 1):
+        child = to_ia2(root.accChild(i))
+        if child.attributes and id_attribute in child.attributes:
+            return child
+        descendant = find_ia2_node(child, id)
+        if descendant:
+            return descendant
+
+
+def serialize_node(node):
+    node_dictionary = {}
+    node_dictionary["API"] = "windows"
+
+    # MSAA properties
+    node_dictionary["name"] = node.accName(CHILDID_SELF)
+    node_dictionary["msaa_role"] = role_to_string[node.accRole(CHILDID_SELF)]
+    node_dictionary["msaa_states"] = get_msaa_state_list(node.accState(CHILDID_SELF))
+
+    # IAccessible2 properties
+    node_dictionary["ia2_role"] = role_to_string[node.role()]
+    node_dictionary["ia2_states"] = get_state_list(node.states)
+
+    return node_dictionary
+
+
+class WindowsAccessibilityExecutorImpl:
+    def setup(self, product_name):
+        self.product_name = product_name
+
+    def test_accessibility_api(self, dom_id, test, api, url):
+        """Execute a test of the accessibility API.
+
+        :param dom_id: The dom id of the node to test.
+        :param test: The test statement.
+        :param api: The API to test.
+        :param url: The url of the test.
+        """
+        self.root = find_browser(self.product_name)
+        if not self.root:
+            raise Exception(f"Couldn't find browser {self.product_name}.")
+
+        tab = poll_for_tab(url, self.root)
+        node = find_ia2_node(tab, dom_id)
+        if not node:
+            raise Exception(f"Couldn't find node with ID {dom_id}.")
+
+        results = []
+        for test_statement in test["AXAPI"]:
+            results.append("Fail: Test not implemented.")
+
+        return results
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py
new file mode 100644
index 00000000000000..73b7ff2d3a7642
--- /dev/null
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py
@@ -0,0 +1,344 @@
+import os
+import comtypes.client
+
+# Get IAccessible2 constants for helper functions below
+ia2Tlb = os.path.join(
+    os.path.dirname(os.path.realpath(__file__)),
+    "ia2_api_all.tlb",
+)
+ia2Mod = comtypes.client.GetModule(ia2Tlb)
+# Add to globals the many IAccessible2 constants. These will also be imported
+# when this file is imported.
+globals().update((k, getattr(ia2Mod, k)) for k in ia2Mod.__all__)
+
+# Some constants are not provided via oleacc, specifically those for MSAA
+ROLE_SYSTEM_TITLEBAR=1
+ROLE_SYSTEM_MENUBAR=2
+ROLE_SYSTEM_SCROLLBAR=3
+ROLE_SYSTEM_GRIP=4
+ROLE_SYSTEM_SOUND=5
+ROLE_SYSTEM_CURSOR=6
+ROLE_SYSTEM_CARET=7
+ROLE_SYSTEM_ALERT=8
+ROLE_SYSTEM_WINDOW=9
+ROLE_SYSTEM_CLIENT=10
+ROLE_SYSTEM_MENUPOPUP=11
+ROLE_SYSTEM_MENUITEM=12
+ROLE_SYSTEM_TOOLTIP=13
+ROLE_SYSTEM_APPLICATION=14
+ROLE_SYSTEM_DOCUMENT=15
+ROLE_SYSTEM_PANE=16
+ROLE_SYSTEM_CHART=17
+ROLE_SYSTEM_DIALOG=18
+ROLE_SYSTEM_BORDER=19
+ROLE_SYSTEM_GROUPING=20
+ROLE_SYSTEM_SEPARATOR=21
+ROLE_SYSTEM_TOOLBAR=22
+ROLE_SYSTEM_STATUSBAR=23
+ROLE_SYSTEM_TABLE=24
+ROLE_SYSTEM_COLUMNHEADER=25
+ROLE_SYSTEM_ROWHEADER=26
+ROLE_SYSTEM_COLUMN=27
+ROLE_SYSTEM_ROW=28
+ROLE_SYSTEM_CELL=29
+ROLE_SYSTEM_LINK=30
+ROLE_SYSTEM_HELPBALLOON=31
+ROLE_SYSTEM_CHARACTER=32
+ROLE_SYSTEM_LIST=33
+ROLE_SYSTEM_LISTITEM=34
+ROLE_SYSTEM_OUTLINE=35
+ROLE_SYSTEM_OUTLINEITEM=36
+ROLE_SYSTEM_PAGETAB=37
+ROLE_SYSTEM_PROPERTYPAGE=38
+ROLE_SYSTEM_INDICATOR=39
+ROLE_SYSTEM_GRAPHIC=40
+ROLE_SYSTEM_STATICTEXT=41
+ROLE_SYSTEM_TEXT=42
+ROLE_SYSTEM_PUSHBUTTON=43
+ROLE_SYSTEM_CHECKBUTTON=44
+ROLE_SYSTEM_RADIOBUTTON=45
+ROLE_SYSTEM_COMBOBOX=46
+ROLE_SYSTEM_DROPLIST=47
+ROLE_SYSTEM_PROGRESSBAR=48
+ROLE_SYSTEM_DIAL=49
+ROLE_SYSTEM_HOTKEYFIELD=50
+ROLE_SYSTEM_SLIDER=51
+ROLE_SYSTEM_SPINBUTTON=52
+ROLE_SYSTEM_DIAGRAM=53
+ROLE_SYSTEM_ANIMATION=54
+ROLE_SYSTEM_EQUATION=55
+ROLE_SYSTEM_BUTTONDROPDOWN=56
+ROLE_SYSTEM_BUTTONMENU=57
+ROLE_SYSTEM_BUTTONDROPDOWNGRID=58
+ROLE_SYSTEM_WHITESPACE=59
+ROLE_SYSTEM_PAGETABLIST=60
+ROLE_SYSTEM_CLOCK=61
+ROLE_SYSTEM_SPLITBUTTON=62
+ROLE_SYSTEM_IPADDRESS=63
+ROLE_SYSTEM_OUTLINEBUTTON=64
+
+role_to_string = {
+  ROLE_SYSTEM_TITLEBAR: "ROLE_SYSTEM_TITLEBAR",
+  ROLE_SYSTEM_MENUBAR: "ROLE_SYSTEM_MENUBAR",
+  ROLE_SYSTEM_SCROLLBAR: "ROLE_SYSTEM_SCROLLBAR",
+  ROLE_SYSTEM_GRIP: "ROLE_SYSTEM_GRIP",
+  ROLE_SYSTEM_SOUND: "ROLE_SYSTEM_SOUND",
+  ROLE_SYSTEM_CURSOR: "ROLE_SYSTEM_CURSOR",
+  ROLE_SYSTEM_CARET: "ROLE_SYSTEM_CARET",
+  ROLE_SYSTEM_ALERT: "ROLE_SYSTEM_ALERT",
+  ROLE_SYSTEM_WINDOW: "ROLE_SYSTEM_WINDOW",
+  ROLE_SYSTEM_CLIENT: "ROLE_SYSTEM_CLIENT",
+  ROLE_SYSTEM_MENUPOPUP: "ROLE_SYSTEM_MENUPOPUP",
+  ROLE_SYSTEM_MENUITEM: "ROLE_SYSTEM_MENUITEM",
+  ROLE_SYSTEM_TOOLTIP: "ROLE_SYSTEM_TOOLTIP",
+  ROLE_SYSTEM_APPLICATION: "ROLE_SYSTEM_APPLICATION",
+  ROLE_SYSTEM_DOCUMENT: "ROLE_SYSTEM_DOCUMENT",
+  ROLE_SYSTEM_PANE: "ROLE_SYSTEM_PANE",
+  ROLE_SYSTEM_CHART: "ROLE_SYSTEM_CHART",
+  ROLE_SYSTEM_DIALOG: "ROLE_SYSTEM_DIALOG",
+  ROLE_SYSTEM_BORDER: "ROLE_SYSTEM_BORDER",
+  ROLE_SYSTEM_GROUPING: "ROLE_SYSTEM_GROUPING",
+  ROLE_SYSTEM_SEPARATOR: "ROLE_SYSTEM_SEPARATOR",
+  ROLE_SYSTEM_TOOLBAR: "ROLE_SYSTEM_TOOLBAR",
+  ROLE_SYSTEM_STATUSBAR: "ROLE_SYSTEM_STATUSBAR",
+  ROLE_SYSTEM_TABLE: "ROLE_SYSTEM_TABLE",
+  ROLE_SYSTEM_COLUMNHEADER: "ROLE_SYSTEM_COLUMNHEADER",
+  ROLE_SYSTEM_ROWHEADER: "ROLE_SYSTEM_ROWHEADER",
+  ROLE_SYSTEM_COLUMN: "ROLE_SYSTEM_COLUMN",
+  ROLE_SYSTEM_ROW: "ROLE_SYSTEM_ROW",
+  ROLE_SYSTEM_CELL: "ROLE_SYSTEM_CEL",
+  ROLE_SYSTEM_LINK: "ROLE_SYSTEM_LINK",
+  ROLE_SYSTEM_HELPBALLOON: "ROLE_SYSTEM_HELPBALLOON",
+  ROLE_SYSTEM_CHARACTER: "ROLE_SYSTEM_CHARACTER",
+  ROLE_SYSTEM_LIST: "ROLE_SYSTEM_LIST",
+  ROLE_SYSTEM_LISTITEM: "ROLE_SYSTEM_LISTITEM",
+  ROLE_SYSTEM_OUTLINE: "ROLE_SYSTEM_OUTLINE",
+  ROLE_SYSTEM_OUTLINEITEM: "ROLE_SYSTEM_OUTLINEITEM",
+  ROLE_SYSTEM_PAGETAB: "ROLE_SYSTEM_PAGETAB",
+  ROLE_SYSTEM_PROPERTYPAGE: "ROLE_SYSTEM_PROPERTYPAGE",
+  ROLE_SYSTEM_INDICATOR: "ROLE_SYSTEM_INDICATOR",
+  ROLE_SYSTEM_GRAPHIC: "ROLE_SYSTEM_GRAPHIC",
+  ROLE_SYSTEM_STATICTEXT: "ROLE_SYSTEM_STATICTEXT",
+  ROLE_SYSTEM_TEXT: "ROLE_SYSTEM_TEXT",
+  ROLE_SYSTEM_PUSHBUTTON: "ROLE_SYSTEM_PUSHBUTTON",
+  ROLE_SYSTEM_CHECKBUTTON: "ROLE_SYSTEM_CHECKBUTTON",
+  ROLE_SYSTEM_RADIOBUTTON: "ROLE_SYSTEM_RADIOBUTTON",
+  ROLE_SYSTEM_COMBOBOX: "ROLE_SYSTEM_COMBOBOX",
+  ROLE_SYSTEM_DROPLIST: "ROLE_SYSTEM_DROPLIST",
+  ROLE_SYSTEM_PROGRESSBAR: "ROLE_SYSTEM_PROGRESSBAR",
+  ROLE_SYSTEM_DIAL: "ROLE_SYSTEM_DIAL",
+  ROLE_SYSTEM_HOTKEYFIELD: "ROLE_SYSTEM_HOTKEYFIELD",
+  ROLE_SYSTEM_SLIDER: "ROLE_SYSTEM_SLIDER",
+  ROLE_SYSTEM_SPINBUTTON: "ROLE_SYSTEM_SPINBUTTON",
+  ROLE_SYSTEM_DIAGRAM: "ROLE_SYSTEM_DIAGRAM",
+  ROLE_SYSTEM_ANIMATION: "ROLE_SYSTEM_ANIMATION",
+  ROLE_SYSTEM_EQUATION: "ROLE_SYSTEM_EQUATION",
+  ROLE_SYSTEM_BUTTONDROPDOWN: "ROLE_SYSTEM_BUTTONDROPDOWN",
+  ROLE_SYSTEM_BUTTONMENU: "ROLE_SYSTEM_BUTTONMENU",
+  ROLE_SYSTEM_BUTTONDROPDOWNGRID: "ROLE_SYSTEM_BUTTONDROPDOWNGRID",
+  ROLE_SYSTEM_WHITESPACE: "ROLE_SYSTEM_WHITESPACE",
+  ROLE_SYSTEM_PAGETABLIST: "ROLE_SYSTEM_PAGETABLIST",
+  ROLE_SYSTEM_CLOCK: "ROLE_SYSTEM_CLOCK",
+  ROLE_SYSTEM_SPLITBUTTON: "ROLE_SYSTEM_SPLITBUTTON",
+  ROLE_SYSTEM_IPADDRESS: "ROLE_SYSTEM_IPADDRESS",
+  ROLE_SYSTEM_OUTLINEBUTTON: "ROLE_SYSTEM_OUTLINEBUTTON",
+  IA2_ROLE_CANVAS: "IA2_ROLE_CANVAS",
+  IA2_ROLE_CAPTION: "IA2_ROLE_CAPTION",
+  IA2_ROLE_CHECK_MENU_ITEM: "IA2_ROLE_CHECK_MENU_ITEM",
+  IA2_ROLE_COLOR_CHOOSER: "IA2_ROLE_COLOR_CHOOSER",
+  IA2_ROLE_DATE_EDITOR: "IA2_ROLE_DATE_EDITOR",
+  IA2_ROLE_DESKTOP_ICON: "IA2_ROLE_DESKTOP_ICON",
+  IA2_ROLE_DESKTOP_PANE: "IA2_ROLE_DESKTOP_PANE",
+  IA2_ROLE_DIRECTORY_PANE: "IA2_ROLE_DIRECTORY_PANE",
+  IA2_ROLE_EDITBAR: "IA2_ROLE_EDITBAR",
+  IA2_ROLE_EMBEDDED_OBJECT: "IA2_ROLE_EMBEDDED_OBJECT",
+  IA2_ROLE_ENDNOTE: "IA2_ROLE_ENDNOTE",
+  IA2_ROLE_FILE_CHOOSER: "IA2_ROLE_FILE_CHOOSER",
+  IA2_ROLE_FONT_CHOOSER: "IA2_ROLE_FONT_CHOOSER",
+  IA2_ROLE_FOOTER: "IA2_ROLE_FOOTER",
+  IA2_ROLE_FOOTNOTE: "IA2_ROLE_FOOTNOTE",
+  IA2_ROLE_FORM: "IA2_ROLE_FORM",
+  IA2_ROLE_FRAME: "IA2_ROLE_FRAME",
+  IA2_ROLE_GLASS_PANE: "IA2_ROLE_GLASS_PANE",
+  IA2_ROLE_HEADER: "IA2_ROLE_HEADER",
+  IA2_ROLE_HEADING: "IA2_ROLE_HEADING",
+  IA2_ROLE_ICON: "IA2_ROLE_ICON",
+  IA2_ROLE_IMAGE_MAP: "IA2_ROLE_IMAGE_MAP",
+  IA2_ROLE_INPUT_METHOD_WINDOW: "IA2_ROLE_INPUT_METHOD_WINDOW",
+  IA2_ROLE_INTERNAL_FRAME: "IA2_ROLE_INTERNAL_FRAME",
+  IA2_ROLE_LABEL: "IA2_ROLE_LABEL",
+  IA2_ROLE_LAYERED_PANE: "IA2_ROLE_LAYERED_PANE",
+  IA2_ROLE_NOTE: "IA2_ROLE_NOTE",
+  IA2_ROLE_OPTION_PANE: "IA2_ROLE_OPTION_PANE",
+  IA2_ROLE_PAGE: "IA2_ROLE_PAGE",
+  IA2_ROLE_PARAGRAPH: "IA2_ROLE_PARAGRAPH",
+  IA2_ROLE_RADIO_MENU_ITEM: "IA2_ROLE_RADIO_MENU_ITEM",
+  IA2_ROLE_REDUNDANT_OBJECT: "IA2_ROLE_REDUNDANT_OBJECT",
+  IA2_ROLE_ROOT_PANE: "IA2_ROLE_ROOT_PANE",
+  IA2_ROLE_RULER: "IA2_ROLE_RULER",
+  IA2_ROLE_SCROLL_PANE: "IA2_ROLE_SCROLL_PANE",
+  IA2_ROLE_SECTION: "IA2_ROLE_SECTION",
+  IA2_ROLE_SHAPE: "IA2_ROLE_SHAPE",
+  IA2_ROLE_SPLIT_PANE: "IA2_ROLE_SPLIT_PANE",
+  IA2_ROLE_TEAR_OFF_MENU: "IA2_ROLE_TEAR_OFF_MENU",
+  IA2_ROLE_TERMINAL: "IA2_ROLE_TERMINAL",
+  IA2_ROLE_TEXT_FRAME: "IA2_ROLE_TEXT_FRAME",
+  IA2_ROLE_TOGGLE_BUTTON: "IA2_ROLE_TOGGLE_BUTTON",
+  IA2_ROLE_UNKNOWN: "IA2_ROLE_UNKNOWN",
+  IA2_ROLE_VIEW_PORT: "IA2_ROLE_VIEW_PORT",
+  IA2_ROLE_COMPLEMENTARY_CONTENT: "IA2_ROLE_COMPLEMENTARY_CONTENT",
+  IA2_ROLE_LANDMARK: "IA2_ROLE_LANDMARK",
+  IA2_ROLE_LEVEL_BAR: "IA2_ROLE_LEVEL_BAR",
+  IA2_ROLE_CONTENT_DELETION: "IA2_ROLE_CONTENT_DELETION",
+  IA2_ROLE_CONTENT_INSERTION: "IA2_ROLE_CONTENT_INSERTION",
+  IA2_ROLE_BLOCK_QUOTE: "IA2_ROLE_BLOCK_QUOTE",
+  IA2_ROLE_MARK: "IA2_ROLE_MARK",
+  IA2_ROLE_SUGGESTION: "IA2_ROLE_SUGGESTION",
+  IA2_ROLE_COMMENT: "IA2_ROLE_COMMENT"
+}
+
+STATE_SYSTEM_UNAVAILABLE = 0x00000001
+STATE_SYSTEM_SELECTED = 0x00000002
+STATE_SYSTEM_FOCUSED = 0x00000004
+STATE_SYSTEM_PRESSED = 0x00000008
+STATE_SYSTEM_CHECKED = 0x00000010
+STATE_SYSTEM_MIXED = 0x00000020
+STATE_SYSTEM_INDETERMINATE = STATE_SYSTEM_MIXED
+STATE_SYSTEM_READONLY = 0x00000040
+STATE_SYSTEM_HOTTRACKED = 0x00000080
+STATE_SYSTEM_DEFAULT = 0x00000100
+STATE_SYSTEM_EXPANDED = 0x00000200
+STATE_SYSTEM_COLLAPSED = 0x00000400
+STATE_SYSTEM_BUSY = 0x00000800
+STATE_SYSTEM_FLOATING = 0x00001000
+STATE_SYSTEM_MARQUEED = 0x00002000
+STATE_SYSTEM_ANIMATED = 0x00004000
+STATE_SYSTEM_INVISIBLE = 0x00008000
+STATE_SYSTEM_OFFSCREEN = 0x00010000
+STATE_SYSTEM_SIZEABLE = 0x00020000
+STATE_SYSTEM_MOVEABLE = 0x00040000
+STATE_SYSTEM_SELFVOICING = 0x00080000
+STATE_SYSTEM_FOCUSABLE = 0x00100000
+STATE_SYSTEM_SELECTABLE = 0x00200000
+STATE_SYSTEM_LINKED = 0x00400000
+STATE_SYSTEM_TRAVERSED = 0x00800000
+STATE_SYSTEM_MULTISELECTABLE = 0x01000000
+STATE_SYSTEM_EXTSELECTABLE = 0x02000000
+STATE_SYSTEM_ALERT_LOW = 0x04000000
+STATE_SYSTEM_ALERT_MEDIUM = 0x08000000
+STATE_SYSTEM_ALERT_HIGH = 0x10000000
+STATE_SYSTEM_PROTECTED = 0x20000000
+STATE_SYSTEM_HASPOPUP = 0x40000000
+STATE_SYSTEM_VALID = 0x3FFFFFFF
+
+def get_msaa_state_list(states):
+    state_strings = []
+    if states & STATE_SYSTEM_ALERT_HIGH:
+        state_strings.append("ALERT_HIGH")
+    if states & STATE_SYSTEM_ALERT_MEDIUM:
+        state_strings.append("ALERT_MEDIUM")
+    if states & STATE_SYSTEM_ALERT_LOW:
+        state_strings.append("ALERT_LOW")
+    if states & STATE_SYSTEM_ANIMATED:
+        state_strings.append("ANIMATED")
+    if states & STATE_SYSTEM_BUSY:
+        state_strings.append("BUSY")
+    if states & STATE_SYSTEM_CHECKED:
+        state_strings.append("CHECKED")
+    if states & STATE_SYSTEM_COLLAPSED:
+        state_strings.append("COLLAPSED")
+    if states & STATE_SYSTEM_DEFAULT:
+        state_strings.append("DEFAULT")
+    if states & STATE_SYSTEM_EXPANDED:
+        state_strings.append("EXPANDED")
+    if states & STATE_SYSTEM_EXTSELECTABLE:
+        state_strings.append("EXTSELECTABLE")
+    if states & STATE_SYSTEM_FLOATING:
+        state_strings.append("FLOATING")
+    if states & STATE_SYSTEM_FOCUSABLE:
+        state_strings.append("FOCUSABLE")
+    if states & STATE_SYSTEM_FOCUSED:
+        state_strings.append("FOCUSED")
+    if states & STATE_SYSTEM_HASPOPUP:
+        state_strings.append("HASPOPUP")
+    if states & STATE_SYSTEM_HOTTRACKED:
+        state_strings.append("HOTTRACKED")
+    if states & STATE_SYSTEM_INVISIBLE:
+        state_strings.append("INVISIBLE")
+    if states & STATE_SYSTEM_LINKED:
+        state_strings.append("LINKED")
+    if states & STATE_SYSTEM_MARQUEED:
+        state_strings.append("MARQUEED")
+    if states & STATE_SYSTEM_MIXED:
+        state_strings.append("MIXED")
+    if states & STATE_SYSTEM_MOVEABLE:
+        state_strings.append("MOVEABLE")
+    if states & STATE_SYSTEM_MULTISELECTABLE:
+        state_strings.append("MULTISELECTABLE")
+    if states & STATE_SYSTEM_OFFSCREEN:
+        state_strings.append("OFFSCREEN")
+    if states & STATE_SYSTEM_PRESSED:
+        state_strings.append("PRESSED")
+    if states & STATE_SYSTEM_PROTECTED:
+        state_strings.append("PROTECTED")
+    if states & STATE_SYSTEM_READONLY:
+        state_strings.append("READONLY")
+    if states & STATE_SYSTEM_SELECTABLE:
+        state_strings.append("SELECTABLE")
+    if states & STATE_SYSTEM_SELECTED:
+        state_strings.append("SELECTED")
+    if states & STATE_SYSTEM_SELFVOICING:
+        state_strings.append("SELFVOICING")
+    if states & STATE_SYSTEM_SIZEABLE:
+        state_strings.append("SIZEABLE")
+    if states & STATE_SYSTEM_TRAVERSED:
+        state_strings.append("TRAVERSED")
+    if states & STATE_SYSTEM_UNAVAILABLE:
+        state_strings.append("UNAVAILABLE")
+
+    return state_strings
+
+def get_state_list(states):
+    state_strings = []
+    if states & IA2_STATE_ACTIVE:
+        state_strings.append("ACTIVE")
+    if states & IA2_STATE_ARMED:
+        state_strings.append("ARMED")
+    if states & IA2_STATE_CHECKABLE:
+        state_strings.append("CHECKABLE")
+    if states & IA2_STATE_DEFUNCT:
+        state_strings.append("DEFUNCT")
+    if states & IA2_STATE_EDITABLE:
+        state_strings.append("EDITABLE")
+    if states & IA2_STATE_HORIZONTAL:
+        state_strings.append("HORIZONTAL")
+    if states & IA2_STATE_ICONIFIED:
+        state_strings.append("ICONIFIED")
+    if states & IA2_STATE_INVALID_ENTRY:
+        state_strings.append("INVALID_ENTRY")
+    if states & IA2_STATE_MANAGES_DESCENDANTS:
+        state_strings.append("MANAGES_DESCENDANTS")
+    if states & IA2_STATE_MODAL:
+        state_strings.append("MODAL")
+    if states & IA2_STATE_MULTI_LINE:
+        state_strings.append("MULTI_LINE")
+    if states & IA2_STATE_OPAQUE:
+        state_strings.append("OPAQUE")
+    if states & IA2_STATE_PINNED:
+        state_strings.append("PINNED")
+    if states & IA2_STATE_REQUIRED:
+        state_strings.append("REQUIRED")
+    if states & IA2_STATE_SELECTABLE_TEXT:
+        state_strings.append("SELECTABLE_TEXT")
+    if states & IA2_STATE_SINGLE_LINE:
+        state_strings.append("SINGLE_LINE")
+    if states & IA2_STATE_STALE:
+        state_strings.append("STALE")
+    if states & IA2_STATE_SUPPORTS_AUTOCOMPLETION:
+        state_strings.append("SUPPORTS_AUTOCOMPLETION")
+    if states & IA2_STATE_TRANSIENT:
+        state_strings.append("TRANSIENT")
+    if states & IA2_STATE_VERTICAL:
+        state_strings.append("VERTICAL")
+
+    return state_strings
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/ia2_api_all.tlb b/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/ia2_api_all.tlb
new file mode 100644
index 0000000000000000000000000000000000000000..449c10b258dd7bcab244cd7279af1886da146da9
GIT binary patch
literal 29016
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%0DP@Pz0KN=
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
BD0Tn<

literal 0
HcmV?d00001

diff --git a/tools/wptrunner/wptrunner/testdriver-extra.js b/tools/wptrunner/wptrunner/testdriver-extra.js
index 6f6b13620782f5..51f9d1ababfd48 100644
--- a/tools/wptrunner/wptrunner/testdriver-extra.js
+++ b/tools/wptrunner/wptrunner/testdriver-extra.js
@@ -671,8 +671,7 @@
     window.test_driver_internal.set_global_privacy_control = function(gpc, context=null) {
         return create_action("set_global_privacy_control", {gpc});
     };
-  
-  
+
     window.test_driver_internal.bidi.speculation.prefetch_status_updated.subscribe =
         function(params) {
         return subscribe(
@@ -688,5 +687,9 @@
             'speculation.prefetchStatusUpdated', on_event);
         return () => event_target.removeEventListener(
                     'speculation.prefetchStatusUpdated', on_event);
-    }; 
+    };
+
+    window.test_driver_internal.test_accessibility_api = function(dom_id, test, api, url) {
+        return create_action("test_accessibility_api", {dom_id, test, api, url});
+    };
 })();
diff --git a/tools/wptrunner/wptrunner/testrunner.py b/tools/wptrunner/wptrunner/testrunner.py
index cc81b73511324e..eceee2f219c68e 100644
--- a/tools/wptrunner/wptrunner/testrunner.py
+++ b/tools/wptrunner/wptrunner/testrunner.py
@@ -343,7 +343,8 @@ def __init__(self, suite_name, index, test_queue,
                  pause_after_test=False, pause_on_unexpected=False,
                  restart_on_unexpected=True, debug_info=None,
                  capture_stdio=True, restart_on_new_group=True, recording=None,
-                 max_restarts=5, max_restart_backoff=0, update_status_on_crash=True):
+                 max_restarts=5, max_restart_backoff=0, update_status_on_crash=True,
+                 product_name=None):
         """Thread that owns a single TestRunner process and any processes required
         by the TestRunner (e.g. the Firefox binary).
 
@@ -363,6 +364,7 @@ def __init__(self, suite_name, index, test_queue,
         self.manager_number = index
         self.test_implementation_key = None
         self.test_implementations = test_implementations
+        self.product_name = product_name
 
         # Flags used to shut down this thread if we get a sigint
         self.parent_stop_flag = stop_flag
@@ -648,6 +650,7 @@ def get_executor_implementation(self, impl):
         executor_kwargs["group_metadata"] = self.state.group_metadata
         executor_kwargs["browser_settings"] = self.browser.browser_settings
         executor_browser_cls, executor_browser_kwargs = self.browser.browser.executor_browser()
+        executor_browser_kwargs["product_name"] = self.product_name
         return ExecutorImplementation(impl.executor_cls,
                                       executor_kwargs,
                                       executor_browser_cls,
@@ -1049,8 +1052,10 @@ def __init__(self, suite_name, test_queue_builder, test_implementations,
                  recording=None,
                  max_restarts=5,
                  max_restart_backoff=0,
-                 update_status_on_crash=False):
+                 update_status_on_crash=False,
+                 product_name=None):
         self.suite_name = suite_name
+        self.product_name = product_name
         self.test_queue_builder = test_queue_builder
         self.test_implementations = test_implementations
         self.pause_after_test = pause_after_test
@@ -1100,7 +1105,8 @@ def run(self, tests):
                                         recording=self.recording,
                                         max_restarts=self.max_restarts,
                                         max_restart_backoff=self.max_restart_backoff,
-                                        update_status_on_crash=self.update_status_on_crash)
+                                        update_status_on_crash=self.update_status_on_crash,
+                                        product_name=self.product_name)
             manager.start()
             self.pool.add(manager)
         self.wait()
diff --git a/tools/wptrunner/wptrunner/wptcommandline.py b/tools/wptrunner/wptrunner/wptcommandline.py
index 994f2520000ebe..b028cb49e29e01 100644
--- a/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tools/wptrunner/wptrunner/wptcommandline.py
@@ -370,6 +370,8 @@ def create_parser(product_choices=None):
     chrome_group.add_argument("--no-enable-experimental", action="store_false", dest="enable_experimental",
                               help="Do not enable --enable-experimental-web-platform-features flag "
                               "on experimental channels")
+    chrome_group.add_argument( "--force-renderer-accessibility", action="store_true",
+                              dest="force_renderer_accessibility",help="Turn on accessibility.")
     chrome_group.add_argument(
         "--enable-sanitizer",
         action="store_true",
diff --git a/tools/wptrunner/wptrunner/wptrunner.py b/tools/wptrunner/wptrunner/wptrunner.py
index c7d8938f25d1e0..819a38a93b9b5b 100644
--- a/tools/wptrunner/wptrunner/wptrunner.py
+++ b/tools/wptrunner/wptrunner/wptrunner.py
@@ -333,7 +333,8 @@ def run_test_iteration(test_status, test_loader, test_queue_builder,
                           recording=recording,
                           max_restarts=kwargs["max_restarts"],
                           max_restart_backoff=kwargs["max_restart_backoff"],
-                          update_status_on_crash=kwargs["update_status_on_crash"]
+                          update_status_on_crash=kwargs["update_status_on_crash"],
+                          product_name=product.name
                           ) as manager_group:
             try:
                 handle_interrupt_signals()

From 9105ceb04728e697c40ef04b3f812758a05ecf1c Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Tue, 15 Jul 2025 12:17:14 -0700
Subject: [PATCH 02/38] Add generic --force-accessibility option re: jcsteh
 suggestion

---
 tools/wpt/run.py                            | 6 +++++-
 tools/wptrunner/wptrunner/wptcommandline.py | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/wpt/run.py b/tools/wpt/run.py
index 181a32122d9969..fd100d4c87d611 100644
--- a/tools/wpt/run.py
+++ b/tools/wpt/run.py
@@ -327,6 +327,10 @@ def setup_kwargs(self, kwargs):
         if kwargs["browser_channel"] == "nightly" and kwargs["enable_webtransport_h3"] is None:
             kwargs["enable_webtransport_h3"] = True
 
+        if kwargs["force_accessibility"]:
+            kwargs["extra_prefs"].append("accessibility.force_disabled=-1")
+
+
         # Turn off Firefox WebRTC ICE logging on WPT (turned on by mozrunner)
         safe_unsetenv('R_LOG_LEVEL')
         safe_unsetenv('R_LOG_DESTINATION')
@@ -520,7 +524,7 @@ def setup_kwargs(self, kwargs):
             # We are on Taskcluster, where our Docker container does not have
             # enough capabilities to run Chrome with sandboxing. (gh-20133)
             kwargs["binary_args"].append("--no-sandbox")
-        if kwargs["force_renderer_accessibility"]:
+        if kwargs["force_accessibility"]:
             kwargs["binary_args"].append("--force-renderer-accessibility")
 
 class HeadlessShell(BrowserSetup):
diff --git a/tools/wptrunner/wptrunner/wptcommandline.py b/tools/wptrunner/wptrunner/wptcommandline.py
index b028cb49e29e01..63c6ac567feb04 100644
--- a/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tools/wptrunner/wptrunner/wptcommandline.py
@@ -283,6 +283,8 @@ def create_parser(product_choices=None):
                               help="Don't update test status to CRASH if a crash dump is found")
     config_group.add_argument("--ws-extra", action="append",
                               help="Extra paths containing websockets handlers")
+    config_group.add_argument( "--force-accessibility", action="store_true",
+                              dest="force_accessibility",help="Turn on accessibility.")
 
     build_type = parser.add_mutually_exclusive_group()
     build_type.add_argument("--debug-build", dest="debug", action="store_true",
@@ -370,8 +372,6 @@ def create_parser(product_choices=None):
     chrome_group.add_argument("--no-enable-experimental", action="store_false", dest="enable_experimental",
                               help="Do not enable --enable-experimental-web-platform-features flag "
                               "on experimental channels")
-    chrome_group.add_argument( "--force-renderer-accessibility", action="store_true",
-                              dest="force_renderer_accessibility",help="Turn on accessibility.")
     chrome_group.add_argument(
         "--enable-sanitizer",
         action="store_true",

From d1cf785bdd02f0fc6be17e6bd051cba1dadd5171 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Tue, 15 Jul 2025 14:06:42 -0700
Subject: [PATCH 03/38] Fix filepath error for windows

---
 .../platformaccessibility/executorwindowsaccessibility.py       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
index 3ae6eb3b3301ac..81fbdc2f593a09 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
@@ -1,4 +1,4 @@
-from ..executors.ia2.constants import *
+from ..platformaccessibility.ia2.constants import *
 
 import json
 import sys

From a79406eb5e1d6a16498ce4e698fb0231130ef73c Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Tue, 15 Jul 2025 14:06:59 -0700
Subject: [PATCH 04/38] Add python requirements for windows and mac

---
 tools/wptrunner/requirements.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/wptrunner/requirements.txt b/tools/wptrunner/requirements.txt
index 3890ee225def25..bc61cfee032224 100644
--- a/tools/wptrunner/requirements.txt
+++ b/tools/wptrunner/requirements.txt
@@ -1,3 +1,4 @@
+comtypes; sys_platform == 'win32' # For executorplatformaccessibility
 html5lib==1.1
 mozdebug==0.3.1
 mozinfo==1.2.3  # https://bugzilla.mozilla.org/show_bug.cgi?id=1621226
@@ -6,6 +7,8 @@ mozprocess==1.4.0
 packaging==25.0
 pillow==10.4.0; python_version < '3.9'
 pillow==11.3.0; python_version >= '3.9'
+pyobjc-framework-Accessibility; sys_platform == 'darwin' # For executorplatformaccessibility
+pyobjc-framework-ApplicationServices; sys_platform == 'darwin' # For executorplatformaccessibility
 requests==2.32.3
 types-requests==2.32.0.20241016
 urllib3==2.2.2

From b85c4d015238d00449bd8196b2489ef1c1106bde Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Tue, 15 Jul 2025 14:35:35 -0700
Subject: [PATCH 05/38] Fix requirements for macos and python 3.8

---
 tools/wptrunner/requirements.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/wptrunner/requirements.txt b/tools/wptrunner/requirements.txt
index bc61cfee032224..2b70ed2e761165 100644
--- a/tools/wptrunner/requirements.txt
+++ b/tools/wptrunner/requirements.txt
@@ -7,8 +7,11 @@ mozprocess==1.4.0
 packaging==25.0
 pillow==10.4.0; python_version < '3.9'
 pillow==11.3.0; python_version >= '3.9'
-pyobjc-framework-Accessibility; sys_platform == 'darwin' # For executorplatformaccessibility
-pyobjc-framework-ApplicationServices; sys_platform == 'darwin' # For executorplatformaccessibility
+pyobjc-framework-Accessibility==11.1; sys_platform == 'darwin' and python_version >= '3.9' # For executorplatformaccessibility
+pyobjc-framework-ApplicationServices==11.1; sys_platform == 'darwin' and python_version >= '3.9' # For executorplatformaccessibility
+pyobjc==10.3.2; sys_platform == 'darwin' and python_version < '3.9' # For executorplatformaccessibility
+pyobjc-framework-Accessibility==10.3.2; sys_platform == 'darwin' and python_version < '3.9' # For executorplatformaccessibility
+pyobjc-framework-ApplicationServices==10.3.2; sys_platform == 'darwin' and python_version < '3.9' # For executorplatformaccessibility
 requests==2.32.3
 types-requests==2.32.0.20241016
 urllib3==2.2.2

From ce107c88dba31e89e00a80d810e6bd5109812e64 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Wed, 16 Jul 2025 09:13:44 -0700
Subject: [PATCH 06/38] Fix requirements for linux

---
 tools/wptrunner/requirements.txt | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tools/wptrunner/requirements.txt b/tools/wptrunner/requirements.txt
index 2b70ed2e761165..9db6517cff5f28 100644
--- a/tools/wptrunner/requirements.txt
+++ b/tools/wptrunner/requirements.txt
@@ -1,4 +1,3 @@
-comtypes; sys_platform == 'win32' # For executorplatformaccessibility
 html5lib==1.1
 mozdebug==0.3.1
 mozinfo==1.2.3  # https://bugzilla.mozilla.org/show_bug.cgi?id=1621226
@@ -7,12 +6,17 @@ mozprocess==1.4.0
 packaging==25.0
 pillow==10.4.0; python_version < '3.9'
 pillow==11.3.0; python_version >= '3.9'
-pyobjc-framework-Accessibility==11.1; sys_platform == 'darwin' and python_version >= '3.9' # For executorplatformaccessibility
-pyobjc-framework-ApplicationServices==11.1; sys_platform == 'darwin' and python_version >= '3.9' # For executorplatformaccessibility
-pyobjc==10.3.2; sys_platform == 'darwin' and python_version < '3.9' # For executorplatformaccessibility
-pyobjc-framework-Accessibility==10.3.2; sys_platform == 'darwin' and python_version < '3.9' # For executorplatformaccessibility
-pyobjc-framework-ApplicationServices==10.3.2; sys_platform == 'darwin' and python_version < '3.9' # For executorplatformaccessibility
 requests==2.32.3
 types-requests==2.32.0.20241016
 urllib3==2.2.2
 aioquic==1.2.0
+
+# For executorplatformaccessibility
+comtypes==1.4.11; sys_platform == 'win32'
+PyGObject==3.50.1; sys_platform == 'linux' and python_version >= '3.9'
+PyGObject==3.48.2; sys_platform == 'linux' and python_version < '3.9'
+pyobjc-framework-Accessibility==11.1; sys_platform == 'darwin' and python_version >= '3.9'
+pyobjc-framework-ApplicationServices==11.1; sys_platform == 'darwin' and python_version >= '3.9'
+pyobjc==10.3.2; sys_platform == 'darwin' and python_version < '3.9'
+pyobjc-framework-Accessibility==10.3.2; sys_platform == 'darwin' and python_version < '3.9'
+pyobjc-framework-ApplicationServices==10.3.2; sys_platform == 'darwin' and python_version < '3.9'

From 8b6462096946b092831e78dbc0248e354a30ecb5 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Wed, 16 Jul 2025 16:00:10 -0700
Subject: [PATCH 07/38] Update Docker dependencies

---
 tools/docker/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index a936ad9167f058..53f1c9f3d7a5be 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -20,6 +20,9 @@ RUN apt-get -qqy update \
     glib-networking-services \
     gstreamer1.0-plugins-bad \
     gstreamer1.0-gl \
+    libatspi2.0-dev \
+    libcairo2-dev \
+    libgirepository1.0-dev \
     libosmesa6-dev \
     libproxy1-plugin-webkit \
     libvirt-daemon-system \

From bc02261604ef952ea3a22a96041c278388271319 Mon Sep 17 00:00:00 2001
From: valerie young <spectranaut@igalia.com>
Date: Tue, 22 Jul 2025 11:50:14 -0700
Subject: [PATCH 08/38] Update tests to use new docker image

---
 .taskcluster.yml           | 2 +-
 tools/ci/tc/tasks/test.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.taskcluster.yml b/.taskcluster.yml
index 5bef41d7d97406..d120d54d3960f1 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -57,7 +57,7 @@ tasks:
             owner: ${owner}
             source: ${event.repository.clone_url}
           payload:
-            image: ghcr.io/web-platform-tests/wpt:2
+            image: ghcr.io/web-platform-tests/wpt:3
             maxRunTime: 7200
             artifacts:
               public/results:
diff --git a/tools/ci/tc/tasks/test.yml b/tools/ci/tc/tasks/test.yml
index daa86a629f2924..e28eb22f160576 100644
--- a/tools/ci/tc/tasks/test.yml
+++ b/tools/ci/tc/tasks/test.yml
@@ -4,7 +4,7 @@ components:
     workerType: ci
     schedulerId: taskcluster-github
     deadline: "24 hours"
-    image: ghcr.io/web-platform-tests/wpt:2
+    image: ghcr.io/web-platform-tests/wpt:3
     maxRunTime: 7200
     artifacts:
       public/results:

From ce26cb4e1e53f4e6501f3416fcecbb8a093f39c0 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Tue, 22 Jul 2025 13:25:27 -0700
Subject: [PATCH 09/38] Fix Flake8 errors

---
 .../executorplatformaccessibility.py          |   3 +-
 .../platformaccessibility/executoratspi.py    |   5 -
 .../platformaccessibility/executoraxapi.py    |   4 -
 .../executorwindowsaccessibility.py           |  32 +-
 .../platformaccessibility/ia2/constants.py    | 274 +++++++++---------
 5 files changed, 153 insertions(+), 165 deletions(-)

diff --git a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
index bad2baecf48f36..45f489214dde53 100644
--- a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
@@ -1,6 +1,5 @@
 from .protocol import ProtocolPart
 
-from abc import ABCMeta
 from sys import platform
 
 linux = False
@@ -47,6 +46,6 @@ def test_accessibility_api(self, dom_id, test, api, url):
         # for example, Windows API tests passed to Linux. Ideally, this will
         # be fixed with a "not applicable".
         if not valid_api_for_platform(api):
-          return ""
+            return ""
 
         return self.impl.test_accessibility_api(dom_id, test, api, url)
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
index ccd86c35c13c1a..5140348b440086 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
@@ -2,13 +2,8 @@
 
 gi.require_version("Atspi", "2.0")
 from gi.repository import Atspi
-import json
-import threading
 import time
 
-import sys
-
-
 def poll_for_tab(root, product, url):
     """Poll until the tab with the test url is loaded and available in the
        accessibility API. Assumes wptrunner has already started a browser
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
index b4e964abc7cbd8..1c054b906b9f62 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
@@ -10,9 +10,6 @@
     NSWorkspace,
 )
 
-import json
-
-
 def find_browser(name):
     """Find the AXUIElement representing the browser.
 
@@ -48,7 +45,6 @@ def find_active_tab(browser):
     """
 
     stack = [browser]
-    tabs = []
     while stack:
         node = stack.pop()
 
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
index 81fbdc2f593a09..f36b2282483c3f 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
@@ -1,29 +1,27 @@
 from ..platformaccessibility.ia2.constants import *
 
-import json
-import sys
 import time
 
 import ctypes
 from ctypes import POINTER, byref
-from ctypes.wintypes import BOOL, HWND, LPARAM, POINT
+from ctypes.wintypes import BOOL, HWND, LPARAM
 
 import comtypes.client
-from comtypes import COMError, IServiceProvider
+from comtypes import IServiceProvider
 
 CHILDID_SELF = 0
 OBJID_CLIENT = -4
 
 user32 = ctypes.windll.user32
 oleacc = ctypes.oledll.oleacc
-oleaccMod = comtypes.client.GetModule("oleacc.dll")
-IAccessible = oleaccMod.IAccessible
+oleacc_mod = comtypes.client.GetModule("oleacc.dll")
+IAccessible = oleacc_mod.IAccessible # noqa: N816
 
 # CoCreateInstance of UIA also initializes IA2
-uiaMod = comtypes.client.GetModule("UIAutomationCore.dll")
-uiaClient = comtypes.CoCreateInstance(
-    uiaMod.CUIAutomation._reg_clsid_,
-    interface=uiaMod.IUIAutomation,
+uia_mod = comtypes.client.GetModule("UIAutomationCore.dll")
+uia_client = comtypes.CoCreateInstance(
+    uia_mod.CUIAutomation._reg_clsid_,
+    interface=uia_mod.IUIAutomation,
     clsctx=comtypes.CLSCTX_INPROC_SERVER,
 )
 
@@ -47,7 +45,7 @@ def get_browser_hwnd(product_name):
     found = []
 
     @ctypes.WINFUNCTYPE(BOOL, HWND, LPARAM)
-    def check_window_name(hwnd, lParam):
+    def check_window_name(hwnd, lParam): # noqa: N803
         window_name = name_from_hwnd(hwnd)
         if product_name not in window_name.lower():
             # EnumWindows should continue enumerating
@@ -64,7 +62,7 @@ def check_window_name(hwnd, lParam):
 
 def to_ia2(node):
     service = node.QueryInterface(IServiceProvider)
-    return service.QueryService(IAccessible2._iid_, IAccessible2)
+    return service.QueryService(IAccessible2._iid_, IAccessible2) # noqa: F405
 
 
 def find_browser(product_name):
@@ -84,7 +82,7 @@ def poll_for_tab(url, root):
 def find_tab(url, root):
     for i in range(1, root.accChildCount + 1):
         child = to_ia2(root.accChild(i))
-        if child.accRole(CHILDID_SELF) == ROLE_SYSTEM_DOCUMENT:
+        if child.accRole(CHILDID_SELF) == ROLE_SYSTEM_DOCUMENT: # noqa: F405
             if child.accValue(CHILDID_SELF) == url:
                 return child
             # No need to search within documents.
@@ -111,12 +109,12 @@ def serialize_node(node):
 
     # MSAA properties
     node_dictionary["name"] = node.accName(CHILDID_SELF)
-    node_dictionary["msaa_role"] = role_to_string[node.accRole(CHILDID_SELF)]
-    node_dictionary["msaa_states"] = get_msaa_state_list(node.accState(CHILDID_SELF))
+    node_dictionary["msaa_role"] = role_to_string[node.accRole(CHILDID_SELF)] # noqa: F405
+    node_dictionary["msaa_states"] = get_msaa_state_list(node.accState(CHILDID_SELF)) # noqa: F405
 
     # IAccessible2 properties
-    node_dictionary["ia2_role"] = role_to_string[node.role()]
-    node_dictionary["ia2_states"] = get_state_list(node.states)
+    node_dictionary["ia2_role"] = role_to_string[node.role()] # noqa: F405
+    node_dictionary["ia2_states"] = get_state_list(node.states) # noqa: F405
 
     return node_dictionary
 
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py
index 73b7ff2d3a7642..67ccd3f6b6ecb1 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py
@@ -12,70 +12,70 @@
 globals().update((k, getattr(ia2Mod, k)) for k in ia2Mod.__all__)
 
 # Some constants are not provided via oleacc, specifically those for MSAA
-ROLE_SYSTEM_TITLEBAR=1
-ROLE_SYSTEM_MENUBAR=2
-ROLE_SYSTEM_SCROLLBAR=3
-ROLE_SYSTEM_GRIP=4
-ROLE_SYSTEM_SOUND=5
-ROLE_SYSTEM_CURSOR=6
-ROLE_SYSTEM_CARET=7
-ROLE_SYSTEM_ALERT=8
-ROLE_SYSTEM_WINDOW=9
-ROLE_SYSTEM_CLIENT=10
-ROLE_SYSTEM_MENUPOPUP=11
-ROLE_SYSTEM_MENUITEM=12
-ROLE_SYSTEM_TOOLTIP=13
-ROLE_SYSTEM_APPLICATION=14
-ROLE_SYSTEM_DOCUMENT=15
-ROLE_SYSTEM_PANE=16
-ROLE_SYSTEM_CHART=17
-ROLE_SYSTEM_DIALOG=18
-ROLE_SYSTEM_BORDER=19
-ROLE_SYSTEM_GROUPING=20
-ROLE_SYSTEM_SEPARATOR=21
-ROLE_SYSTEM_TOOLBAR=22
-ROLE_SYSTEM_STATUSBAR=23
-ROLE_SYSTEM_TABLE=24
-ROLE_SYSTEM_COLUMNHEADER=25
-ROLE_SYSTEM_ROWHEADER=26
-ROLE_SYSTEM_COLUMN=27
-ROLE_SYSTEM_ROW=28
-ROLE_SYSTEM_CELL=29
-ROLE_SYSTEM_LINK=30
-ROLE_SYSTEM_HELPBALLOON=31
-ROLE_SYSTEM_CHARACTER=32
-ROLE_SYSTEM_LIST=33
-ROLE_SYSTEM_LISTITEM=34
-ROLE_SYSTEM_OUTLINE=35
-ROLE_SYSTEM_OUTLINEITEM=36
-ROLE_SYSTEM_PAGETAB=37
-ROLE_SYSTEM_PROPERTYPAGE=38
-ROLE_SYSTEM_INDICATOR=39
-ROLE_SYSTEM_GRAPHIC=40
-ROLE_SYSTEM_STATICTEXT=41
-ROLE_SYSTEM_TEXT=42
-ROLE_SYSTEM_PUSHBUTTON=43
-ROLE_SYSTEM_CHECKBUTTON=44
-ROLE_SYSTEM_RADIOBUTTON=45
-ROLE_SYSTEM_COMBOBOX=46
-ROLE_SYSTEM_DROPLIST=47
-ROLE_SYSTEM_PROGRESSBAR=48
-ROLE_SYSTEM_DIAL=49
-ROLE_SYSTEM_HOTKEYFIELD=50
-ROLE_SYSTEM_SLIDER=51
-ROLE_SYSTEM_SPINBUTTON=52
-ROLE_SYSTEM_DIAGRAM=53
-ROLE_SYSTEM_ANIMATION=54
-ROLE_SYSTEM_EQUATION=55
-ROLE_SYSTEM_BUTTONDROPDOWN=56
-ROLE_SYSTEM_BUTTONMENU=57
-ROLE_SYSTEM_BUTTONDROPDOWNGRID=58
-ROLE_SYSTEM_WHITESPACE=59
-ROLE_SYSTEM_PAGETABLIST=60
-ROLE_SYSTEM_CLOCK=61
-ROLE_SYSTEM_SPLITBUTTON=62
-ROLE_SYSTEM_IPADDRESS=63
-ROLE_SYSTEM_OUTLINEBUTTON=64
+ROLE_SYSTEM_TITLEBAR = 1
+ROLE_SYSTEM_MENUBAR = 2
+ROLE_SYSTEM_SCROLLBAR = 3
+ROLE_SYSTEM_GRIP = 4
+ROLE_SYSTEM_SOUND = 5
+ROLE_SYSTEM_CURSOR = 6
+ROLE_SYSTEM_CARET = 7
+ROLE_SYSTEM_ALERT = 8
+ROLE_SYSTEM_WINDOW = 9
+ROLE_SYSTEM_CLIENT = 10
+ROLE_SYSTEM_MENUPOPUP = 11
+ROLE_SYSTEM_MENUITEM = 12
+ROLE_SYSTEM_TOOLTIP = 13
+ROLE_SYSTEM_APPLICATION = 14
+ROLE_SYSTEM_DOCUMENT = 15
+ROLE_SYSTEM_PANE = 16
+ROLE_SYSTEM_CHART = 17
+ROLE_SYSTEM_DIALOG = 18
+ROLE_SYSTEM_BORDER = 19
+ROLE_SYSTEM_GROUPING = 20
+ROLE_SYSTEM_SEPARATOR = 21
+ROLE_SYSTEM_TOOLBAR = 22
+ROLE_SYSTEM_STATUSBAR = 23
+ROLE_SYSTEM_TABLE = 24
+ROLE_SYSTEM_COLUMNHEADER = 25
+ROLE_SYSTEM_ROWHEADER = 26
+ROLE_SYSTEM_COLUMN = 27
+ROLE_SYSTEM_ROW = 28
+ROLE_SYSTEM_CELL = 29
+ROLE_SYSTEM_LINK = 30
+ROLE_SYSTEM_HELPBALLOON = 31
+ROLE_SYSTEM_CHARACTER = 32
+ROLE_SYSTEM_LIST = 33
+ROLE_SYSTEM_LISTITEM = 34
+ROLE_SYSTEM_OUTLINE = 35
+ROLE_SYSTEM_OUTLINEITEM = 36
+ROLE_SYSTEM_PAGETAB = 37
+ROLE_SYSTEM_PROPERTYPAGE = 38
+ROLE_SYSTEM_INDICATOR = 39
+ROLE_SYSTEM_GRAPHIC = 40
+ROLE_SYSTEM_STATICTEXT = 41
+ROLE_SYSTEM_TEXT = 42
+ROLE_SYSTEM_PUSHBUTTON = 43
+ROLE_SYSTEM_CHECKBUTTON = 44
+ROLE_SYSTEM_RADIOBUTTON = 45
+ROLE_SYSTEM_COMBOBOX = 46
+ROLE_SYSTEM_DROPLIST = 47
+ROLE_SYSTEM_PROGRESSBAR = 48
+ROLE_SYSTEM_DIAL = 49
+ROLE_SYSTEM_HOTKEYFIELD = 50
+ROLE_SYSTEM_SLIDER = 51
+ROLE_SYSTEM_SPINBUTTON = 52
+ROLE_SYSTEM_DIAGRAM = 53
+ROLE_SYSTEM_ANIMATION = 54
+ROLE_SYSTEM_EQUATION = 55
+ROLE_SYSTEM_BUTTONDROPDOWN = 56
+ROLE_SYSTEM_BUTTONMENU = 57
+ROLE_SYSTEM_BUTTONDROPDOWNGRID = 58
+ROLE_SYSTEM_WHITESPACE = 59
+ROLE_SYSTEM_PAGETABLIST = 60
+ROLE_SYSTEM_CLOCK = 61
+ROLE_SYSTEM_SPLITBUTTON = 62
+ROLE_SYSTEM_IPADDRESS = 63
+ROLE_SYSTEM_OUTLINEBUTTON = 64
 
 role_to_string = {
   ROLE_SYSTEM_TITLEBAR: "ROLE_SYSTEM_TITLEBAR",
@@ -142,59 +142,59 @@
   ROLE_SYSTEM_SPLITBUTTON: "ROLE_SYSTEM_SPLITBUTTON",
   ROLE_SYSTEM_IPADDRESS: "ROLE_SYSTEM_IPADDRESS",
   ROLE_SYSTEM_OUTLINEBUTTON: "ROLE_SYSTEM_OUTLINEBUTTON",
-  IA2_ROLE_CANVAS: "IA2_ROLE_CANVAS",
-  IA2_ROLE_CAPTION: "IA2_ROLE_CAPTION",
-  IA2_ROLE_CHECK_MENU_ITEM: "IA2_ROLE_CHECK_MENU_ITEM",
-  IA2_ROLE_COLOR_CHOOSER: "IA2_ROLE_COLOR_CHOOSER",
-  IA2_ROLE_DATE_EDITOR: "IA2_ROLE_DATE_EDITOR",
-  IA2_ROLE_DESKTOP_ICON: "IA2_ROLE_DESKTOP_ICON",
-  IA2_ROLE_DESKTOP_PANE: "IA2_ROLE_DESKTOP_PANE",
-  IA2_ROLE_DIRECTORY_PANE: "IA2_ROLE_DIRECTORY_PANE",
-  IA2_ROLE_EDITBAR: "IA2_ROLE_EDITBAR",
-  IA2_ROLE_EMBEDDED_OBJECT: "IA2_ROLE_EMBEDDED_OBJECT",
-  IA2_ROLE_ENDNOTE: "IA2_ROLE_ENDNOTE",
-  IA2_ROLE_FILE_CHOOSER: "IA2_ROLE_FILE_CHOOSER",
-  IA2_ROLE_FONT_CHOOSER: "IA2_ROLE_FONT_CHOOSER",
-  IA2_ROLE_FOOTER: "IA2_ROLE_FOOTER",
-  IA2_ROLE_FOOTNOTE: "IA2_ROLE_FOOTNOTE",
-  IA2_ROLE_FORM: "IA2_ROLE_FORM",
-  IA2_ROLE_FRAME: "IA2_ROLE_FRAME",
-  IA2_ROLE_GLASS_PANE: "IA2_ROLE_GLASS_PANE",
-  IA2_ROLE_HEADER: "IA2_ROLE_HEADER",
-  IA2_ROLE_HEADING: "IA2_ROLE_HEADING",
-  IA2_ROLE_ICON: "IA2_ROLE_ICON",
-  IA2_ROLE_IMAGE_MAP: "IA2_ROLE_IMAGE_MAP",
-  IA2_ROLE_INPUT_METHOD_WINDOW: "IA2_ROLE_INPUT_METHOD_WINDOW",
-  IA2_ROLE_INTERNAL_FRAME: "IA2_ROLE_INTERNAL_FRAME",
-  IA2_ROLE_LABEL: "IA2_ROLE_LABEL",
-  IA2_ROLE_LAYERED_PANE: "IA2_ROLE_LAYERED_PANE",
-  IA2_ROLE_NOTE: "IA2_ROLE_NOTE",
-  IA2_ROLE_OPTION_PANE: "IA2_ROLE_OPTION_PANE",
-  IA2_ROLE_PAGE: "IA2_ROLE_PAGE",
-  IA2_ROLE_PARAGRAPH: "IA2_ROLE_PARAGRAPH",
-  IA2_ROLE_RADIO_MENU_ITEM: "IA2_ROLE_RADIO_MENU_ITEM",
-  IA2_ROLE_REDUNDANT_OBJECT: "IA2_ROLE_REDUNDANT_OBJECT",
-  IA2_ROLE_ROOT_PANE: "IA2_ROLE_ROOT_PANE",
-  IA2_ROLE_RULER: "IA2_ROLE_RULER",
-  IA2_ROLE_SCROLL_PANE: "IA2_ROLE_SCROLL_PANE",
-  IA2_ROLE_SECTION: "IA2_ROLE_SECTION",
-  IA2_ROLE_SHAPE: "IA2_ROLE_SHAPE",
-  IA2_ROLE_SPLIT_PANE: "IA2_ROLE_SPLIT_PANE",
-  IA2_ROLE_TEAR_OFF_MENU: "IA2_ROLE_TEAR_OFF_MENU",
-  IA2_ROLE_TERMINAL: "IA2_ROLE_TERMINAL",
-  IA2_ROLE_TEXT_FRAME: "IA2_ROLE_TEXT_FRAME",
-  IA2_ROLE_TOGGLE_BUTTON: "IA2_ROLE_TOGGLE_BUTTON",
-  IA2_ROLE_UNKNOWN: "IA2_ROLE_UNKNOWN",
-  IA2_ROLE_VIEW_PORT: "IA2_ROLE_VIEW_PORT",
-  IA2_ROLE_COMPLEMENTARY_CONTENT: "IA2_ROLE_COMPLEMENTARY_CONTENT",
-  IA2_ROLE_LANDMARK: "IA2_ROLE_LANDMARK",
-  IA2_ROLE_LEVEL_BAR: "IA2_ROLE_LEVEL_BAR",
-  IA2_ROLE_CONTENT_DELETION: "IA2_ROLE_CONTENT_DELETION",
-  IA2_ROLE_CONTENT_INSERTION: "IA2_ROLE_CONTENT_INSERTION",
-  IA2_ROLE_BLOCK_QUOTE: "IA2_ROLE_BLOCK_QUOTE",
-  IA2_ROLE_MARK: "IA2_ROLE_MARK",
-  IA2_ROLE_SUGGESTION: "IA2_ROLE_SUGGESTION",
-  IA2_ROLE_COMMENT: "IA2_ROLE_COMMENT"
+  IA2_ROLE_CANVAS: "IA2_ROLE_CANVAS", # noqa: F821
+  IA2_ROLE_CAPTION: "IA2_ROLE_CAPTION", # noqa: F821
+  IA2_ROLE_CHECK_MENU_ITEM: "IA2_ROLE_CHECK_MENU_ITEM", # noqa: F821
+  IA2_ROLE_COLOR_CHOOSER: "IA2_ROLE_COLOR_CHOOSER", # noqa: F821
+  IA2_ROLE_DATE_EDITOR: "IA2_ROLE_DATE_EDITOR", # noqa: F821
+  IA2_ROLE_DESKTOP_ICON: "IA2_ROLE_DESKTOP_ICON", # noqa: F821
+  IA2_ROLE_DESKTOP_PANE: "IA2_ROLE_DESKTOP_PANE", # noqa: F821
+  IA2_ROLE_DIRECTORY_PANE: "IA2_ROLE_DIRECTORY_PANE", # noqa: F821
+  IA2_ROLE_EDITBAR: "IA2_ROLE_EDITBAR", # noqa: F821
+  IA2_ROLE_EMBEDDED_OBJECT: "IA2_ROLE_EMBEDDED_OBJECT", # noqa: F821
+  IA2_ROLE_ENDNOTE: "IA2_ROLE_ENDNOTE", # noqa: F821
+  IA2_ROLE_FILE_CHOOSER: "IA2_ROLE_FILE_CHOOSER", # noqa: F821
+  IA2_ROLE_FONT_CHOOSER: "IA2_ROLE_FONT_CHOOSER", # noqa: F821
+  IA2_ROLE_FOOTER: "IA2_ROLE_FOOTER", # noqa: F821
+  IA2_ROLE_FOOTNOTE: "IA2_ROLE_FOOTNOTE", # noqa: F821
+  IA2_ROLE_FORM: "IA2_ROLE_FORM", # noqa: F821
+  IA2_ROLE_FRAME: "IA2_ROLE_FRAME", # noqa: F821
+  IA2_ROLE_GLASS_PANE: "IA2_ROLE_GLASS_PANE", # noqa: F821
+  IA2_ROLE_HEADER: "IA2_ROLE_HEADER", # noqa: F821
+  IA2_ROLE_HEADING: "IA2_ROLE_HEADING", # noqa: F821
+  IA2_ROLE_ICON: "IA2_ROLE_ICON", # noqa: F821
+  IA2_ROLE_IMAGE_MAP: "IA2_ROLE_IMAGE_MAP", # noqa: F821
+  IA2_ROLE_INPUT_METHOD_WINDOW: "IA2_ROLE_INPUT_METHOD_WINDOW", # noqa: F821
+  IA2_ROLE_INTERNAL_FRAME: "IA2_ROLE_INTERNAL_FRAME", # noqa: F821
+  IA2_ROLE_LABEL: "IA2_ROLE_LABEL", # noqa: F821
+  IA2_ROLE_LAYERED_PANE: "IA2_ROLE_LAYERED_PANE", # noqa: F821
+  IA2_ROLE_NOTE: "IA2_ROLE_NOTE", # noqa: F821
+  IA2_ROLE_OPTION_PANE: "IA2_ROLE_OPTION_PANE", # noqa: F821
+  IA2_ROLE_PAGE: "IA2_ROLE_PAGE", # noqa: F821
+  IA2_ROLE_PARAGRAPH: "IA2_ROLE_PARAGRAPH", # noqa: F821
+  IA2_ROLE_RADIO_MENU_ITEM: "IA2_ROLE_RADIO_MENU_ITEM", # noqa: F821
+  IA2_ROLE_REDUNDANT_OBJECT: "IA2_ROLE_REDUNDANT_OBJECT", # noqa: F821
+  IA2_ROLE_ROOT_PANE: "IA2_ROLE_ROOT_PANE", # noqa: F821
+  IA2_ROLE_RULER: "IA2_ROLE_RULER", # noqa: F821
+  IA2_ROLE_SCROLL_PANE: "IA2_ROLE_SCROLL_PANE", # noqa: F821
+  IA2_ROLE_SECTION: "IA2_ROLE_SECTION", # noqa: F821
+  IA2_ROLE_SHAPE: "IA2_ROLE_SHAPE", # noqa: F821
+  IA2_ROLE_SPLIT_PANE: "IA2_ROLE_SPLIT_PANE", # noqa: F821
+  IA2_ROLE_TEAR_OFF_MENU: "IA2_ROLE_TEAR_OFF_MENU", # noqa: F821
+  IA2_ROLE_TERMINAL: "IA2_ROLE_TERMINAL", # noqa: F821
+  IA2_ROLE_TEXT_FRAME: "IA2_ROLE_TEXT_FRAME", # noqa: F821
+  IA2_ROLE_TOGGLE_BUTTON: "IA2_ROLE_TOGGLE_BUTTON", # noqa: F821
+  IA2_ROLE_UNKNOWN: "IA2_ROLE_UNKNOWN", # noqa: F821
+  IA2_ROLE_VIEW_PORT: "IA2_ROLE_VIEW_PORT", # noqa: F821
+  IA2_ROLE_COMPLEMENTARY_CONTENT: "IA2_ROLE_COMPLEMENTARY_CONTENT", # noqa: F821
+  IA2_ROLE_LANDMARK: "IA2_ROLE_LANDMARK", # noqa: F821
+  IA2_ROLE_LEVEL_BAR: "IA2_ROLE_LEVEL_BAR", # noqa: F821
+  IA2_ROLE_CONTENT_DELETION: "IA2_ROLE_CONTENT_DELETION", # noqa: F821
+  IA2_ROLE_CONTENT_INSERTION: "IA2_ROLE_CONTENT_INSERTION", # noqa: F821
+  IA2_ROLE_BLOCK_QUOTE: "IA2_ROLE_BLOCK_QUOTE", # noqa: F821
+  IA2_ROLE_MARK: "IA2_ROLE_MARK", # noqa: F821
+  IA2_ROLE_SUGGESTION: "IA2_ROLE_SUGGESTION", # noqa: F821
+  IA2_ROLE_COMMENT: "IA2_ROLE_COMMENT", # noqa: F821
 }
 
 STATE_SYSTEM_UNAVAILABLE = 0x00000001
@@ -300,45 +300,45 @@ def get_msaa_state_list(states):
 
 def get_state_list(states):
     state_strings = []
-    if states & IA2_STATE_ACTIVE:
+    if states & IA2_STATE_ACTIVE: # noqa: F821
         state_strings.append("ACTIVE")
-    if states & IA2_STATE_ARMED:
+    if states & IA2_STATE_ARMED: # noqa: F821
         state_strings.append("ARMED")
-    if states & IA2_STATE_CHECKABLE:
+    if states & IA2_STATE_CHECKABLE: # noqa: F821
         state_strings.append("CHECKABLE")
-    if states & IA2_STATE_DEFUNCT:
+    if states & IA2_STATE_DEFUNCT: # noqa: F821
         state_strings.append("DEFUNCT")
-    if states & IA2_STATE_EDITABLE:
+    if states & IA2_STATE_EDITABLE: # noqa: F821
         state_strings.append("EDITABLE")
-    if states & IA2_STATE_HORIZONTAL:
+    if states & IA2_STATE_HORIZONTAL: # noqa: F821
         state_strings.append("HORIZONTAL")
-    if states & IA2_STATE_ICONIFIED:
+    if states & IA2_STATE_ICONIFIED: # noqa: F821
         state_strings.append("ICONIFIED")
-    if states & IA2_STATE_INVALID_ENTRY:
+    if states & IA2_STATE_INVALID_ENTRY: # noqa: F821
         state_strings.append("INVALID_ENTRY")
-    if states & IA2_STATE_MANAGES_DESCENDANTS:
+    if states & IA2_STATE_MANAGES_DESCENDANTS: # noqa: F821
         state_strings.append("MANAGES_DESCENDANTS")
-    if states & IA2_STATE_MODAL:
+    if states & IA2_STATE_MODAL: # noqa: F821
         state_strings.append("MODAL")
-    if states & IA2_STATE_MULTI_LINE:
+    if states & IA2_STATE_MULTI_LINE: # noqa: F821
         state_strings.append("MULTI_LINE")
-    if states & IA2_STATE_OPAQUE:
+    if states & IA2_STATE_OPAQUE: # noqa: F821
         state_strings.append("OPAQUE")
-    if states & IA2_STATE_PINNED:
+    if states & IA2_STATE_PINNED: # noqa: F821
         state_strings.append("PINNED")
-    if states & IA2_STATE_REQUIRED:
+    if states & IA2_STATE_REQUIRED: # noqa: F821
         state_strings.append("REQUIRED")
-    if states & IA2_STATE_SELECTABLE_TEXT:
+    if states & IA2_STATE_SELECTABLE_TEXT: # noqa: F821
         state_strings.append("SELECTABLE_TEXT")
-    if states & IA2_STATE_SINGLE_LINE:
+    if states & IA2_STATE_SINGLE_LINE: # noqa: F821
         state_strings.append("SINGLE_LINE")
-    if states & IA2_STATE_STALE:
+    if states & IA2_STATE_STALE: # noqa: F821
         state_strings.append("STALE")
-    if states & IA2_STATE_SUPPORTS_AUTOCOMPLETION:
+    if states & IA2_STATE_SUPPORTS_AUTOCOMPLETION: # noqa: F821
         state_strings.append("SUPPORTS_AUTOCOMPLETION")
-    if states & IA2_STATE_TRANSIENT:
+    if states & IA2_STATE_TRANSIENT: # noqa: F821
         state_strings.append("TRANSIENT")
-    if states & IA2_STATE_VERTICAL:
+    if states & IA2_STATE_VERTICAL: # noqa: F821
         state_strings.append("VERTICAL")
 
     return state_strings

From 46854bbcfd7207d4798842df0f42d8a2f386aeb8 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Tue, 22 Jul 2025 14:07:34 -0700
Subject: [PATCH 10/38] Test mistake in tag for docker image

---
 .taskcluster.yml           | 2 +-
 tools/ci/tc/tasks/test.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.taskcluster.yml b/.taskcluster.yml
index d120d54d3960f1..660a3e6c962225 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -57,7 +57,7 @@ tasks:
             owner: ${owner}
             source: ${event.repository.clone_url}
           payload:
-            image: ghcr.io/web-platform-tests/wpt:3
+            image: ghcr.io/web-platform-tests/wpt:ghcr.io-web-platform-tests-wpt-3
             maxRunTime: 7200
             artifacts:
               public/results:
diff --git a/tools/ci/tc/tasks/test.yml b/tools/ci/tc/tasks/test.yml
index e28eb22f160576..49fe4d5c9e8b63 100644
--- a/tools/ci/tc/tasks/test.yml
+++ b/tools/ci/tc/tasks/test.yml
@@ -4,7 +4,7 @@ components:
     workerType: ci
     schedulerId: taskcluster-github
     deadline: "24 hours"
-    image: ghcr.io/web-platform-tests/wpt:3
+    image: ghcr.io/web-platform-tests/wpt:ghcr.io-web-platform-tests-wpt-3
     maxRunTime: 7200
     artifacts:
       public/results:

From 3b32b44e8e90b5d9c1806ee987ab1d6160c5c06c Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Wed, 30 Jul 2025 14:25:00 -0700
Subject: [PATCH 11/38] More flake8 fixes

---
 .../executorwindowsaccessibility.py           |  18 +-
 .../platformaccessibility/ia2/constants.py    | 280 +++++++++---------
 tools/wptrunner/wptrunner/wptcommandline.py   |   2 +-
 3 files changed, 150 insertions(+), 150 deletions(-)

diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
index f36b2282483c3f..ecf2b1dedcf719 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
@@ -1,4 +1,4 @@
-from ..platformaccessibility.ia2.constants import *
+from ..platformaccessibility.ia2.constants import *  # noqa: F403
 
 import time
 
@@ -15,7 +15,7 @@
 user32 = ctypes.windll.user32
 oleacc = ctypes.oledll.oleacc
 oleacc_mod = comtypes.client.GetModule("oleacc.dll")
-IAccessible = oleacc_mod.IAccessible # noqa: N816
+IAccessible = oleacc_mod.IAccessible  # noqa: N816
 
 # CoCreateInstance of UIA also initializes IA2
 uia_mod = comtypes.client.GetModule("UIAutomationCore.dll")
@@ -45,7 +45,7 @@ def get_browser_hwnd(product_name):
     found = []
 
     @ctypes.WINFUNCTYPE(BOOL, HWND, LPARAM)
-    def check_window_name(hwnd, lParam): # noqa: N803
+    def check_window_name(hwnd, lParam):  # noqa: N803
         window_name = name_from_hwnd(hwnd)
         if product_name not in window_name.lower():
             # EnumWindows should continue enumerating
@@ -62,7 +62,7 @@ def check_window_name(hwnd, lParam): # noqa: N803
 
 def to_ia2(node):
     service = node.QueryInterface(IServiceProvider)
-    return service.QueryService(IAccessible2._iid_, IAccessible2) # noqa: F405
+    return service.QueryService(IAccessible2._iid_, IAccessible2)  # noqa: F405
 
 
 def find_browser(product_name):
@@ -82,7 +82,7 @@ def poll_for_tab(url, root):
 def find_tab(url, root):
     for i in range(1, root.accChildCount + 1):
         child = to_ia2(root.accChild(i))
-        if child.accRole(CHILDID_SELF) == ROLE_SYSTEM_DOCUMENT: # noqa: F405
+        if child.accRole(CHILDID_SELF) == ROLE_SYSTEM_DOCUMENT:  # noqa: F405
             if child.accValue(CHILDID_SELF) == url:
                 return child
             # No need to search within documents.
@@ -109,12 +109,12 @@ def serialize_node(node):
 
     # MSAA properties
     node_dictionary["name"] = node.accName(CHILDID_SELF)
-    node_dictionary["msaa_role"] = role_to_string[node.accRole(CHILDID_SELF)] # noqa: F405
-    node_dictionary["msaa_states"] = get_msaa_state_list(node.accState(CHILDID_SELF)) # noqa: F405
+    node_dictionary["msaa_role"] = role_to_string[node.accRole(CHILDID_SELF)]  # noqa: F405
+    node_dictionary["msaa_states"] = get_msaa_state_list(node.accState(CHILDID_SELF))  # noqa: F405
 
     # IAccessible2 properties
-    node_dictionary["ia2_role"] = role_to_string[node.role()] # noqa: F405
-    node_dictionary["ia2_states"] = get_state_list(node.states) # noqa: F405
+    node_dictionary["ia2_role"] = role_to_string[node.role()]  # noqa: F405
+    node_dictionary["ia2_states"] = get_state_list(node.states)  # noqa: F405
 
     return node_dictionary
 
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py
index 67ccd3f6b6ecb1..e6f042ed7cf665 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py
@@ -2,14 +2,14 @@
 import comtypes.client
 
 # Get IAccessible2 constants for helper functions below
-ia2Tlb = os.path.join(
+ia2_tlb = os.path.join(
     os.path.dirname(os.path.realpath(__file__)),
     "ia2_api_all.tlb",
 )
-ia2Mod = comtypes.client.GetModule(ia2Tlb)
+ia2_mod = comtypes.client.GetModule(ia2_tlb)
 # Add to globals the many IAccessible2 constants. These will also be imported
 # when this file is imported.
-globals().update((k, getattr(ia2Mod, k)) for k in ia2Mod.__all__)
+globals().update((k, getattr(ia2_mod, k)) for k in ia2_mod.__all__)
 
 # Some constants are not provided via oleacc, specifically those for MSAA
 ROLE_SYSTEM_TITLEBAR = 1
@@ -78,123 +78,123 @@
 ROLE_SYSTEM_OUTLINEBUTTON = 64
 
 role_to_string = {
-  ROLE_SYSTEM_TITLEBAR: "ROLE_SYSTEM_TITLEBAR",
-  ROLE_SYSTEM_MENUBAR: "ROLE_SYSTEM_MENUBAR",
-  ROLE_SYSTEM_SCROLLBAR: "ROLE_SYSTEM_SCROLLBAR",
-  ROLE_SYSTEM_GRIP: "ROLE_SYSTEM_GRIP",
-  ROLE_SYSTEM_SOUND: "ROLE_SYSTEM_SOUND",
-  ROLE_SYSTEM_CURSOR: "ROLE_SYSTEM_CURSOR",
-  ROLE_SYSTEM_CARET: "ROLE_SYSTEM_CARET",
-  ROLE_SYSTEM_ALERT: "ROLE_SYSTEM_ALERT",
-  ROLE_SYSTEM_WINDOW: "ROLE_SYSTEM_WINDOW",
-  ROLE_SYSTEM_CLIENT: "ROLE_SYSTEM_CLIENT",
-  ROLE_SYSTEM_MENUPOPUP: "ROLE_SYSTEM_MENUPOPUP",
-  ROLE_SYSTEM_MENUITEM: "ROLE_SYSTEM_MENUITEM",
-  ROLE_SYSTEM_TOOLTIP: "ROLE_SYSTEM_TOOLTIP",
-  ROLE_SYSTEM_APPLICATION: "ROLE_SYSTEM_APPLICATION",
-  ROLE_SYSTEM_DOCUMENT: "ROLE_SYSTEM_DOCUMENT",
-  ROLE_SYSTEM_PANE: "ROLE_SYSTEM_PANE",
-  ROLE_SYSTEM_CHART: "ROLE_SYSTEM_CHART",
-  ROLE_SYSTEM_DIALOG: "ROLE_SYSTEM_DIALOG",
-  ROLE_SYSTEM_BORDER: "ROLE_SYSTEM_BORDER",
-  ROLE_SYSTEM_GROUPING: "ROLE_SYSTEM_GROUPING",
-  ROLE_SYSTEM_SEPARATOR: "ROLE_SYSTEM_SEPARATOR",
-  ROLE_SYSTEM_TOOLBAR: "ROLE_SYSTEM_TOOLBAR",
-  ROLE_SYSTEM_STATUSBAR: "ROLE_SYSTEM_STATUSBAR",
-  ROLE_SYSTEM_TABLE: "ROLE_SYSTEM_TABLE",
-  ROLE_SYSTEM_COLUMNHEADER: "ROLE_SYSTEM_COLUMNHEADER",
-  ROLE_SYSTEM_ROWHEADER: "ROLE_SYSTEM_ROWHEADER",
-  ROLE_SYSTEM_COLUMN: "ROLE_SYSTEM_COLUMN",
-  ROLE_SYSTEM_ROW: "ROLE_SYSTEM_ROW",
-  ROLE_SYSTEM_CELL: "ROLE_SYSTEM_CEL",
-  ROLE_SYSTEM_LINK: "ROLE_SYSTEM_LINK",
-  ROLE_SYSTEM_HELPBALLOON: "ROLE_SYSTEM_HELPBALLOON",
-  ROLE_SYSTEM_CHARACTER: "ROLE_SYSTEM_CHARACTER",
-  ROLE_SYSTEM_LIST: "ROLE_SYSTEM_LIST",
-  ROLE_SYSTEM_LISTITEM: "ROLE_SYSTEM_LISTITEM",
-  ROLE_SYSTEM_OUTLINE: "ROLE_SYSTEM_OUTLINE",
-  ROLE_SYSTEM_OUTLINEITEM: "ROLE_SYSTEM_OUTLINEITEM",
-  ROLE_SYSTEM_PAGETAB: "ROLE_SYSTEM_PAGETAB",
-  ROLE_SYSTEM_PROPERTYPAGE: "ROLE_SYSTEM_PROPERTYPAGE",
-  ROLE_SYSTEM_INDICATOR: "ROLE_SYSTEM_INDICATOR",
-  ROLE_SYSTEM_GRAPHIC: "ROLE_SYSTEM_GRAPHIC",
-  ROLE_SYSTEM_STATICTEXT: "ROLE_SYSTEM_STATICTEXT",
-  ROLE_SYSTEM_TEXT: "ROLE_SYSTEM_TEXT",
-  ROLE_SYSTEM_PUSHBUTTON: "ROLE_SYSTEM_PUSHBUTTON",
-  ROLE_SYSTEM_CHECKBUTTON: "ROLE_SYSTEM_CHECKBUTTON",
-  ROLE_SYSTEM_RADIOBUTTON: "ROLE_SYSTEM_RADIOBUTTON",
-  ROLE_SYSTEM_COMBOBOX: "ROLE_SYSTEM_COMBOBOX",
-  ROLE_SYSTEM_DROPLIST: "ROLE_SYSTEM_DROPLIST",
-  ROLE_SYSTEM_PROGRESSBAR: "ROLE_SYSTEM_PROGRESSBAR",
-  ROLE_SYSTEM_DIAL: "ROLE_SYSTEM_DIAL",
-  ROLE_SYSTEM_HOTKEYFIELD: "ROLE_SYSTEM_HOTKEYFIELD",
-  ROLE_SYSTEM_SLIDER: "ROLE_SYSTEM_SLIDER",
-  ROLE_SYSTEM_SPINBUTTON: "ROLE_SYSTEM_SPINBUTTON",
-  ROLE_SYSTEM_DIAGRAM: "ROLE_SYSTEM_DIAGRAM",
-  ROLE_SYSTEM_ANIMATION: "ROLE_SYSTEM_ANIMATION",
-  ROLE_SYSTEM_EQUATION: "ROLE_SYSTEM_EQUATION",
-  ROLE_SYSTEM_BUTTONDROPDOWN: "ROLE_SYSTEM_BUTTONDROPDOWN",
-  ROLE_SYSTEM_BUTTONMENU: "ROLE_SYSTEM_BUTTONMENU",
-  ROLE_SYSTEM_BUTTONDROPDOWNGRID: "ROLE_SYSTEM_BUTTONDROPDOWNGRID",
-  ROLE_SYSTEM_WHITESPACE: "ROLE_SYSTEM_WHITESPACE",
-  ROLE_SYSTEM_PAGETABLIST: "ROLE_SYSTEM_PAGETABLIST",
-  ROLE_SYSTEM_CLOCK: "ROLE_SYSTEM_CLOCK",
-  ROLE_SYSTEM_SPLITBUTTON: "ROLE_SYSTEM_SPLITBUTTON",
-  ROLE_SYSTEM_IPADDRESS: "ROLE_SYSTEM_IPADDRESS",
-  ROLE_SYSTEM_OUTLINEBUTTON: "ROLE_SYSTEM_OUTLINEBUTTON",
-  IA2_ROLE_CANVAS: "IA2_ROLE_CANVAS", # noqa: F821
-  IA2_ROLE_CAPTION: "IA2_ROLE_CAPTION", # noqa: F821
-  IA2_ROLE_CHECK_MENU_ITEM: "IA2_ROLE_CHECK_MENU_ITEM", # noqa: F821
-  IA2_ROLE_COLOR_CHOOSER: "IA2_ROLE_COLOR_CHOOSER", # noqa: F821
-  IA2_ROLE_DATE_EDITOR: "IA2_ROLE_DATE_EDITOR", # noqa: F821
-  IA2_ROLE_DESKTOP_ICON: "IA2_ROLE_DESKTOP_ICON", # noqa: F821
-  IA2_ROLE_DESKTOP_PANE: "IA2_ROLE_DESKTOP_PANE", # noqa: F821
-  IA2_ROLE_DIRECTORY_PANE: "IA2_ROLE_DIRECTORY_PANE", # noqa: F821
-  IA2_ROLE_EDITBAR: "IA2_ROLE_EDITBAR", # noqa: F821
-  IA2_ROLE_EMBEDDED_OBJECT: "IA2_ROLE_EMBEDDED_OBJECT", # noqa: F821
-  IA2_ROLE_ENDNOTE: "IA2_ROLE_ENDNOTE", # noqa: F821
-  IA2_ROLE_FILE_CHOOSER: "IA2_ROLE_FILE_CHOOSER", # noqa: F821
-  IA2_ROLE_FONT_CHOOSER: "IA2_ROLE_FONT_CHOOSER", # noqa: F821
-  IA2_ROLE_FOOTER: "IA2_ROLE_FOOTER", # noqa: F821
-  IA2_ROLE_FOOTNOTE: "IA2_ROLE_FOOTNOTE", # noqa: F821
-  IA2_ROLE_FORM: "IA2_ROLE_FORM", # noqa: F821
-  IA2_ROLE_FRAME: "IA2_ROLE_FRAME", # noqa: F821
-  IA2_ROLE_GLASS_PANE: "IA2_ROLE_GLASS_PANE", # noqa: F821
-  IA2_ROLE_HEADER: "IA2_ROLE_HEADER", # noqa: F821
-  IA2_ROLE_HEADING: "IA2_ROLE_HEADING", # noqa: F821
-  IA2_ROLE_ICON: "IA2_ROLE_ICON", # noqa: F821
-  IA2_ROLE_IMAGE_MAP: "IA2_ROLE_IMAGE_MAP", # noqa: F821
-  IA2_ROLE_INPUT_METHOD_WINDOW: "IA2_ROLE_INPUT_METHOD_WINDOW", # noqa: F821
-  IA2_ROLE_INTERNAL_FRAME: "IA2_ROLE_INTERNAL_FRAME", # noqa: F821
-  IA2_ROLE_LABEL: "IA2_ROLE_LABEL", # noqa: F821
-  IA2_ROLE_LAYERED_PANE: "IA2_ROLE_LAYERED_PANE", # noqa: F821
-  IA2_ROLE_NOTE: "IA2_ROLE_NOTE", # noqa: F821
-  IA2_ROLE_OPTION_PANE: "IA2_ROLE_OPTION_PANE", # noqa: F821
-  IA2_ROLE_PAGE: "IA2_ROLE_PAGE", # noqa: F821
-  IA2_ROLE_PARAGRAPH: "IA2_ROLE_PARAGRAPH", # noqa: F821
-  IA2_ROLE_RADIO_MENU_ITEM: "IA2_ROLE_RADIO_MENU_ITEM", # noqa: F821
-  IA2_ROLE_REDUNDANT_OBJECT: "IA2_ROLE_REDUNDANT_OBJECT", # noqa: F821
-  IA2_ROLE_ROOT_PANE: "IA2_ROLE_ROOT_PANE", # noqa: F821
-  IA2_ROLE_RULER: "IA2_ROLE_RULER", # noqa: F821
-  IA2_ROLE_SCROLL_PANE: "IA2_ROLE_SCROLL_PANE", # noqa: F821
-  IA2_ROLE_SECTION: "IA2_ROLE_SECTION", # noqa: F821
-  IA2_ROLE_SHAPE: "IA2_ROLE_SHAPE", # noqa: F821
-  IA2_ROLE_SPLIT_PANE: "IA2_ROLE_SPLIT_PANE", # noqa: F821
-  IA2_ROLE_TEAR_OFF_MENU: "IA2_ROLE_TEAR_OFF_MENU", # noqa: F821
-  IA2_ROLE_TERMINAL: "IA2_ROLE_TERMINAL", # noqa: F821
-  IA2_ROLE_TEXT_FRAME: "IA2_ROLE_TEXT_FRAME", # noqa: F821
-  IA2_ROLE_TOGGLE_BUTTON: "IA2_ROLE_TOGGLE_BUTTON", # noqa: F821
-  IA2_ROLE_UNKNOWN: "IA2_ROLE_UNKNOWN", # noqa: F821
-  IA2_ROLE_VIEW_PORT: "IA2_ROLE_VIEW_PORT", # noqa: F821
-  IA2_ROLE_COMPLEMENTARY_CONTENT: "IA2_ROLE_COMPLEMENTARY_CONTENT", # noqa: F821
-  IA2_ROLE_LANDMARK: "IA2_ROLE_LANDMARK", # noqa: F821
-  IA2_ROLE_LEVEL_BAR: "IA2_ROLE_LEVEL_BAR", # noqa: F821
-  IA2_ROLE_CONTENT_DELETION: "IA2_ROLE_CONTENT_DELETION", # noqa: F821
-  IA2_ROLE_CONTENT_INSERTION: "IA2_ROLE_CONTENT_INSERTION", # noqa: F821
-  IA2_ROLE_BLOCK_QUOTE: "IA2_ROLE_BLOCK_QUOTE", # noqa: F821
-  IA2_ROLE_MARK: "IA2_ROLE_MARK", # noqa: F821
-  IA2_ROLE_SUGGESTION: "IA2_ROLE_SUGGESTION", # noqa: F821
-  IA2_ROLE_COMMENT: "IA2_ROLE_COMMENT", # noqa: F821
+    ROLE_SYSTEM_TITLEBAR: "ROLE_SYSTEM_TITLEBAR",
+    ROLE_SYSTEM_MENUBAR: "ROLE_SYSTEM_MENUBAR",
+    ROLE_SYSTEM_SCROLLBAR: "ROLE_SYSTEM_SCROLLBAR",
+    ROLE_SYSTEM_GRIP: "ROLE_SYSTEM_GRIP",
+    ROLE_SYSTEM_SOUND: "ROLE_SYSTEM_SOUND",
+    ROLE_SYSTEM_CURSOR: "ROLE_SYSTEM_CURSOR",
+    ROLE_SYSTEM_CARET: "ROLE_SYSTEM_CARET",
+    ROLE_SYSTEM_ALERT: "ROLE_SYSTEM_ALERT",
+    ROLE_SYSTEM_WINDOW: "ROLE_SYSTEM_WINDOW",
+    ROLE_SYSTEM_CLIENT: "ROLE_SYSTEM_CLIENT",
+    ROLE_SYSTEM_MENUPOPUP: "ROLE_SYSTEM_MENUPOPUP",
+    ROLE_SYSTEM_MENUITEM: "ROLE_SYSTEM_MENUITEM",
+    ROLE_SYSTEM_TOOLTIP: "ROLE_SYSTEM_TOOLTIP",
+    ROLE_SYSTEM_APPLICATION: "ROLE_SYSTEM_APPLICATION",
+    ROLE_SYSTEM_DOCUMENT: "ROLE_SYSTEM_DOCUMENT",
+    ROLE_SYSTEM_PANE: "ROLE_SYSTEM_PANE",
+    ROLE_SYSTEM_CHART: "ROLE_SYSTEM_CHART",
+    ROLE_SYSTEM_DIALOG: "ROLE_SYSTEM_DIALOG",
+    ROLE_SYSTEM_BORDER: "ROLE_SYSTEM_BORDER",
+    ROLE_SYSTEM_GROUPING: "ROLE_SYSTEM_GROUPING",
+    ROLE_SYSTEM_SEPARATOR: "ROLE_SYSTEM_SEPARATOR",
+    ROLE_SYSTEM_TOOLBAR: "ROLE_SYSTEM_TOOLBAR",
+    ROLE_SYSTEM_STATUSBAR: "ROLE_SYSTEM_STATUSBAR",
+    ROLE_SYSTEM_TABLE: "ROLE_SYSTEM_TABLE",
+    ROLE_SYSTEM_COLUMNHEADER: "ROLE_SYSTEM_COLUMNHEADER",
+    ROLE_SYSTEM_ROWHEADER: "ROLE_SYSTEM_ROWHEADER",
+    ROLE_SYSTEM_COLUMN: "ROLE_SYSTEM_COLUMN",
+    ROLE_SYSTEM_ROW: "ROLE_SYSTEM_ROW",
+    ROLE_SYSTEM_CELL: "ROLE_SYSTEM_CEL",
+    ROLE_SYSTEM_LINK: "ROLE_SYSTEM_LINK",
+    ROLE_SYSTEM_HELPBALLOON: "ROLE_SYSTEM_HELPBALLOON",
+    ROLE_SYSTEM_CHARACTER: "ROLE_SYSTEM_CHARACTER",
+    ROLE_SYSTEM_LIST: "ROLE_SYSTEM_LIST",
+    ROLE_SYSTEM_LISTITEM: "ROLE_SYSTEM_LISTITEM",
+    ROLE_SYSTEM_OUTLINE: "ROLE_SYSTEM_OUTLINE",
+    ROLE_SYSTEM_OUTLINEITEM: "ROLE_SYSTEM_OUTLINEITEM",
+    ROLE_SYSTEM_PAGETAB: "ROLE_SYSTEM_PAGETAB",
+    ROLE_SYSTEM_PROPERTYPAGE: "ROLE_SYSTEM_PROPERTYPAGE",
+    ROLE_SYSTEM_INDICATOR: "ROLE_SYSTEM_INDICATOR",
+    ROLE_SYSTEM_GRAPHIC: "ROLE_SYSTEM_GRAPHIC",
+    ROLE_SYSTEM_STATICTEXT: "ROLE_SYSTEM_STATICTEXT",
+    ROLE_SYSTEM_TEXT: "ROLE_SYSTEM_TEXT",
+    ROLE_SYSTEM_PUSHBUTTON: "ROLE_SYSTEM_PUSHBUTTON",
+    ROLE_SYSTEM_CHECKBUTTON: "ROLE_SYSTEM_CHECKBUTTON",
+    ROLE_SYSTEM_RADIOBUTTON: "ROLE_SYSTEM_RADIOBUTTON",
+    ROLE_SYSTEM_COMBOBOX: "ROLE_SYSTEM_COMBOBOX",
+    ROLE_SYSTEM_DROPLIST: "ROLE_SYSTEM_DROPLIST",
+    ROLE_SYSTEM_PROGRESSBAR: "ROLE_SYSTEM_PROGRESSBAR",
+    ROLE_SYSTEM_DIAL: "ROLE_SYSTEM_DIAL",
+    ROLE_SYSTEM_HOTKEYFIELD: "ROLE_SYSTEM_HOTKEYFIELD",
+    ROLE_SYSTEM_SLIDER: "ROLE_SYSTEM_SLIDER",
+    ROLE_SYSTEM_SPINBUTTON: "ROLE_SYSTEM_SPINBUTTON",
+    ROLE_SYSTEM_DIAGRAM: "ROLE_SYSTEM_DIAGRAM",
+    ROLE_SYSTEM_ANIMATION: "ROLE_SYSTEM_ANIMATION",
+    ROLE_SYSTEM_EQUATION: "ROLE_SYSTEM_EQUATION",
+    ROLE_SYSTEM_BUTTONDROPDOWN: "ROLE_SYSTEM_BUTTONDROPDOWN",
+    ROLE_SYSTEM_BUTTONMENU: "ROLE_SYSTEM_BUTTONMENU",
+    ROLE_SYSTEM_BUTTONDROPDOWNGRID: "ROLE_SYSTEM_BUTTONDROPDOWNGRID",
+    ROLE_SYSTEM_WHITESPACE: "ROLE_SYSTEM_WHITESPACE",
+    ROLE_SYSTEM_PAGETABLIST: "ROLE_SYSTEM_PAGETABLIST",
+    ROLE_SYSTEM_CLOCK: "ROLE_SYSTEM_CLOCK",
+    ROLE_SYSTEM_SPLITBUTTON: "ROLE_SYSTEM_SPLITBUTTON",
+    ROLE_SYSTEM_IPADDRESS: "ROLE_SYSTEM_IPADDRESS",
+    ROLE_SYSTEM_OUTLINEBUTTON: "ROLE_SYSTEM_OUTLINEBUTTON",
+    IA2_ROLE_CANVAS: "IA2_ROLE_CANVAS",  # noqa: F821
+    IA2_ROLE_CAPTION: "IA2_ROLE_CAPTION",  # noqa: F821
+    IA2_ROLE_CHECK_MENU_ITEM: "IA2_ROLE_CHECK_MENU_ITEM",  # noqa: F821
+    IA2_ROLE_COLOR_CHOOSER: "IA2_ROLE_COLOR_CHOOSER",  # noqa: F821
+    IA2_ROLE_DATE_EDITOR: "IA2_ROLE_DATE_EDITOR",  # noqa: F821
+    IA2_ROLE_DESKTOP_ICON: "IA2_ROLE_DESKTOP_ICON",  # noqa: F821
+    IA2_ROLE_DESKTOP_PANE: "IA2_ROLE_DESKTOP_PANE",  # noqa: F821
+    IA2_ROLE_DIRECTORY_PANE: "IA2_ROLE_DIRECTORY_PANE",  # noqa: F821
+    IA2_ROLE_EDITBAR: "IA2_ROLE_EDITBAR",  # noqa: F821
+    IA2_ROLE_EMBEDDED_OBJECT: "IA2_ROLE_EMBEDDED_OBJECT",  # noqa: F821
+    IA2_ROLE_ENDNOTE: "IA2_ROLE_ENDNOTE",  # noqa: F821
+    IA2_ROLE_FILE_CHOOSER: "IA2_ROLE_FILE_CHOOSER",  # noqa: F821
+    IA2_ROLE_FONT_CHOOSER: "IA2_ROLE_FONT_CHOOSER",  # noqa: F821
+    IA2_ROLE_FOOTER: "IA2_ROLE_FOOTER",  # noqa: F821
+    IA2_ROLE_FOOTNOTE: "IA2_ROLE_FOOTNOTE",  # noqa: F821
+    IA2_ROLE_FORM: "IA2_ROLE_FORM",  # noqa: F821
+    IA2_ROLE_FRAME: "IA2_ROLE_FRAME",  # noqa: F821
+    IA2_ROLE_GLASS_PANE: "IA2_ROLE_GLASS_PANE",  # noqa: F821
+    IA2_ROLE_HEADER: "IA2_ROLE_HEADER",  # noqa: F821
+    IA2_ROLE_HEADING: "IA2_ROLE_HEADING",  # noqa: F821
+    IA2_ROLE_ICON: "IA2_ROLE_ICON",  # noqa: F821
+    IA2_ROLE_IMAGE_MAP: "IA2_ROLE_IMAGE_MAP",  # noqa: F821
+    IA2_ROLE_INPUT_METHOD_WINDOW: "IA2_ROLE_INPUT_METHOD_WINDOW",  # noqa: F821
+    IA2_ROLE_INTERNAL_FRAME: "IA2_ROLE_INTERNAL_FRAME",  # noqa: F821
+    IA2_ROLE_LABEL: "IA2_ROLE_LABEL",  # noqa: F821
+    IA2_ROLE_LAYERED_PANE: "IA2_ROLE_LAYERED_PANE",  # noqa: F821
+    IA2_ROLE_NOTE: "IA2_ROLE_NOTE",  # noqa: F821
+    IA2_ROLE_OPTION_PANE: "IA2_ROLE_OPTION_PANE",  # noqa: F821
+    IA2_ROLE_PAGE: "IA2_ROLE_PAGE",  # noqa: F821
+    IA2_ROLE_PARAGRAPH: "IA2_ROLE_PARAGRAPH",  # noqa: F821
+    IA2_ROLE_RADIO_MENU_ITEM: "IA2_ROLE_RADIO_MENU_ITEM",  # noqa: F821
+    IA2_ROLE_REDUNDANT_OBJECT: "IA2_ROLE_REDUNDANT_OBJECT",  # noqa: F821
+    IA2_ROLE_ROOT_PANE: "IA2_ROLE_ROOT_PANE",  # noqa: F821
+    IA2_ROLE_RULER: "IA2_ROLE_RULER",  # noqa: F821
+    IA2_ROLE_SCROLL_PANE: "IA2_ROLE_SCROLL_PANE",  # noqa: F821
+    IA2_ROLE_SECTION: "IA2_ROLE_SECTION",  # noqa: F821
+    IA2_ROLE_SHAPE: "IA2_ROLE_SHAPE",  # noqa: F821
+    IA2_ROLE_SPLIT_PANE: "IA2_ROLE_SPLIT_PANE",  # noqa: F821
+    IA2_ROLE_TEAR_OFF_MENU: "IA2_ROLE_TEAR_OFF_MENU",  # noqa: F821
+    IA2_ROLE_TERMINAL: "IA2_ROLE_TERMINAL",  # noqa: F821
+    IA2_ROLE_TEXT_FRAME: "IA2_ROLE_TEXT_FRAME",  # noqa: F821
+    IA2_ROLE_TOGGLE_BUTTON: "IA2_ROLE_TOGGLE_BUTTON",  # noqa: F821
+    IA2_ROLE_UNKNOWN: "IA2_ROLE_UNKNOWN",  # noqa: F821
+    IA2_ROLE_VIEW_PORT: "IA2_ROLE_VIEW_PORT",  # noqa: F821
+    IA2_ROLE_COMPLEMENTARY_CONTENT: "IA2_ROLE_COMPLEMENTARY_CONTENT",  # noqa: F821
+    IA2_ROLE_LANDMARK: "IA2_ROLE_LANDMARK",  # noqa: F821
+    IA2_ROLE_LEVEL_BAR: "IA2_ROLE_LEVEL_BAR",  # noqa: F821
+    IA2_ROLE_CONTENT_DELETION: "IA2_ROLE_CONTENT_DELETION",  # noqa: F821
+    IA2_ROLE_CONTENT_INSERTION: "IA2_ROLE_CONTENT_INSERTION",  # noqa: F821
+    IA2_ROLE_BLOCK_QUOTE: "IA2_ROLE_BLOCK_QUOTE",  # noqa: F821
+    IA2_ROLE_MARK: "IA2_ROLE_MARK",  # noqa: F821
+    IA2_ROLE_SUGGESTION: "IA2_ROLE_SUGGESTION",  # noqa: F821
+    IA2_ROLE_COMMENT: "IA2_ROLE_COMMENT",  # noqa: F821
 }
 
 STATE_SYSTEM_UNAVAILABLE = 0x00000001
@@ -300,45 +300,45 @@ def get_msaa_state_list(states):
 
 def get_state_list(states):
     state_strings = []
-    if states & IA2_STATE_ACTIVE: # noqa: F821
+    if states & IA2_STATE_ACTIVE:  # noqa: F821
         state_strings.append("ACTIVE")
-    if states & IA2_STATE_ARMED: # noqa: F821
+    if states & IA2_STATE_ARMED:  # noqa: F821
         state_strings.append("ARMED")
-    if states & IA2_STATE_CHECKABLE: # noqa: F821
+    if states & IA2_STATE_CHECKABLE:  # noqa: F821
         state_strings.append("CHECKABLE")
-    if states & IA2_STATE_DEFUNCT: # noqa: F821
+    if states & IA2_STATE_DEFUNCT:  # noqa: F821
         state_strings.append("DEFUNCT")
-    if states & IA2_STATE_EDITABLE: # noqa: F821
+    if states & IA2_STATE_EDITABLE:  # noqa: F821
         state_strings.append("EDITABLE")
-    if states & IA2_STATE_HORIZONTAL: # noqa: F821
+    if states & IA2_STATE_HORIZONTAL:  # noqa: F821
         state_strings.append("HORIZONTAL")
-    if states & IA2_STATE_ICONIFIED: # noqa: F821
+    if states & IA2_STATE_ICONIFIED:  # noqa: F821
         state_strings.append("ICONIFIED")
-    if states & IA2_STATE_INVALID_ENTRY: # noqa: F821
+    if states & IA2_STATE_INVALID_ENTRY:  # noqa: F821
         state_strings.append("INVALID_ENTRY")
-    if states & IA2_STATE_MANAGES_DESCENDANTS: # noqa: F821
+    if states & IA2_STATE_MANAGES_DESCENDANTS:  # noqa: F821
         state_strings.append("MANAGES_DESCENDANTS")
-    if states & IA2_STATE_MODAL: # noqa: F821
+    if states & IA2_STATE_MODAL:  # noqa: F821
         state_strings.append("MODAL")
-    if states & IA2_STATE_MULTI_LINE: # noqa: F821
+    if states & IA2_STATE_MULTI_LINE:  # noqa: F821
         state_strings.append("MULTI_LINE")
-    if states & IA2_STATE_OPAQUE: # noqa: F821
+    if states & IA2_STATE_OPAQUE:  # noqa: F821
         state_strings.append("OPAQUE")
-    if states & IA2_STATE_PINNED: # noqa: F821
+    if states & IA2_STATE_PINNED:  # noqa: F821
         state_strings.append("PINNED")
-    if states & IA2_STATE_REQUIRED: # noqa: F821
+    if states & IA2_STATE_REQUIRED:  # noqa: F821
         state_strings.append("REQUIRED")
-    if states & IA2_STATE_SELECTABLE_TEXT: # noqa: F821
+    if states & IA2_STATE_SELECTABLE_TEXT:  # noqa: F821
         state_strings.append("SELECTABLE_TEXT")
-    if states & IA2_STATE_SINGLE_LINE: # noqa: F821
+    if states & IA2_STATE_SINGLE_LINE:  # noqa: F821
         state_strings.append("SINGLE_LINE")
-    if states & IA2_STATE_STALE: # noqa: F821
+    if states & IA2_STATE_STALE:  # noqa: F821
         state_strings.append("STALE")
-    if states & IA2_STATE_SUPPORTS_AUTOCOMPLETION: # noqa: F821
+    if states & IA2_STATE_SUPPORTS_AUTOCOMPLETION:  # noqa: F821
         state_strings.append("SUPPORTS_AUTOCOMPLETION")
-    if states & IA2_STATE_TRANSIENT: # noqa: F821
+    if states & IA2_STATE_TRANSIENT:  # noqa: F821
         state_strings.append("TRANSIENT")
-    if states & IA2_STATE_VERTICAL: # noqa: F821
+    if states & IA2_STATE_VERTICAL:  # noqa: F821
         state_strings.append("VERTICAL")
 
     return state_strings
diff --git a/tools/wptrunner/wptrunner/wptcommandline.py b/tools/wptrunner/wptrunner/wptcommandline.py
index 63c6ac567feb04..4e82d754c0ed7f 100644
--- a/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tools/wptrunner/wptrunner/wptcommandline.py
@@ -283,7 +283,7 @@ def create_parser(product_choices=None):
                               help="Don't update test status to CRASH if a crash dump is found")
     config_group.add_argument("--ws-extra", action="append",
                               help="Extra paths containing websockets handlers")
-    config_group.add_argument( "--force-accessibility", action="store_true",
+    config_group.add_argument("--force-accessibility", action="store_true",
                               dest="force_accessibility",help="Turn on accessibility.")
 
     build_type = parser.add_mutually_exclusive_group()

From 7ced2292ff070e4d9056c4657f40733c7430d1f8 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Wed, 30 Jul 2025 15:18:37 -0700
Subject: [PATCH 12/38] Fix mypy errors

---
 tools/mypy.ini                                           | 9 +++++++++
 .../wptrunner/executors/executorplatformaccessibility.py | 2 ++
 .../executors/platformaccessibility/executoratspi.py     | 2 ++
 .../executors/platformaccessibility/executoraxapi.py     | 2 ++
 .../executorwindowsaccessibility.py                      | 6 ++++--
 .../executors/platformaccessibility/ia2/constants.py     | 2 ++
 6 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/tools/mypy.ini b/tools/mypy.ini
index 22259b03aab751..9dffef7433eccf 100644
--- a/tools/mypy.ini
+++ b/tools/mypy.ini
@@ -42,6 +42,9 @@ follow_imports = silent
 follow_imports = silent
 
 # Ignore missing or untyped libraries.
+[mypy-ApplicationServices.*]
+ignore_missing_imports = True
+
 [mypy-Cocoa.*]
 ignore_missing_imports = True
 
@@ -51,6 +54,12 @@ ignore_missing_imports = True
 [mypy-Quartz.*]
 ignore_missing_imports = True
 
+[mypy-comtypes.*]
+ignore_missing_imports = True
+
+[mypy-gi.*]
+ignore_missing_imports = True
+
 [mypy-marionette_driver.*]
 ignore_missing_imports = True
 
diff --git a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
index 45f489214dde53..de9a95d586f142 100644
--- a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
@@ -1,3 +1,5 @@
+# mypy: allow-untyped-defs
+
 from .protocol import ProtocolPart
 
 from sys import platform
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
index 5140348b440086..bba50034f41547 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
@@ -1,3 +1,5 @@
+# mypy: allow-untyped-defs
+
 import gi
 
 gi.require_version("Atspi", "2.0")
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
index 1c054b906b9f62..a08f7457ce34d0 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
@@ -1,3 +1,5 @@
+# mypy: allow-untyped-defs
+
 from ApplicationServices import (
     AXUIElementCopyAttributeNames,
     AXUIElementCopyAttributeValue,
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
index ecf2b1dedcf719..86289ccb5ebfa8 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
@@ -1,3 +1,5 @@
+# mypy: allow-untyped-defs
+
 from ..platformaccessibility.ia2.constants import *  # noqa: F403
 
 import time
@@ -12,8 +14,8 @@
 CHILDID_SELF = 0
 OBJID_CLIENT = -4
 
-user32 = ctypes.windll.user32
-oleacc = ctypes.oledll.oleacc
+user32 = ctypes.windll.user32  # type: ignore
+oleacc = ctypes.oledll.oleacc  # type: ignore
 oleacc_mod = comtypes.client.GetModule("oleacc.dll")
 IAccessible = oleacc_mod.IAccessible  # noqa: N816
 
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py
index e6f042ed7cf665..8ce24f7b22472c 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py
@@ -1,3 +1,5 @@
+# type: ignore
+
 import os
 import comtypes.client
 

From fcb3afeb747ab37f2c027240b1dc100de4d7246f Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Wed, 30 Jul 2025 16:50:33 -0700
Subject: [PATCH 13/38] Use properly tagged docker image

---
 .taskcluster.yml           | 2 +-
 tools/ci/tc/tasks/test.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.taskcluster.yml b/.taskcluster.yml
index 660a3e6c962225..d120d54d3960f1 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -57,7 +57,7 @@ tasks:
             owner: ${owner}
             source: ${event.repository.clone_url}
           payload:
-            image: ghcr.io/web-platform-tests/wpt:ghcr.io-web-platform-tests-wpt-3
+            image: ghcr.io/web-platform-tests/wpt:3
             maxRunTime: 7200
             artifacts:
               public/results:
diff --git a/tools/ci/tc/tasks/test.yml b/tools/ci/tc/tasks/test.yml
index 49fe4d5c9e8b63..e28eb22f160576 100644
--- a/tools/ci/tc/tasks/test.yml
+++ b/tools/ci/tc/tasks/test.yml
@@ -4,7 +4,7 @@ components:
     workerType: ci
     schedulerId: taskcluster-github
     deadline: "24 hours"
-    image: ghcr.io/web-platform-tests/wpt:ghcr.io-web-platform-tests-wpt-3
+    image: ghcr.io/web-platform-tests/wpt:3
     maxRunTime: 7200
     artifacts:
       public/results:

From 35ab009840fb50eff479c211fd88767eabdce021 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Tue, 5 Aug 2025 11:54:32 -0700
Subject: [PATCH 14/38] Change errors to warnings

---
 .../wptrunner/executors/platformaccessibility/executoratspi.py  | 2 +-
 .../wptrunner/executors/platformaccessibility/executoraxapi.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
index bba50034f41547..53093a28c3f378 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
@@ -133,7 +133,7 @@ def setup(self, product_name, logger):
 
         self.root = find_browser(self.product_name)
         if not self.root:
-            self.logger.error(
+            self.logger.warning(
                 f"Couldn't find browser {self.product_name} in accessibility API ATSPI. Accessibility API queries will not succeeded."
             )
 
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
index a08f7457ce34d0..b911644b2c2769 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
@@ -120,7 +120,7 @@ def setup(self, product_name, logger):
         self.root = find_browser(self.product_name)
 
         if not self.root:
-            self.logger.error(
+            self.logger.warning(
                 f"Couldn't find browser {self.product_name} in accessibility API AX API. Accessibility API queries will not succeeded."
             )
 

From 51036796f991e6e58f686ec95519630c29b6fd60 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Tue, 5 Aug 2025 14:30:04 -0700
Subject: [PATCH 15/38] logger

---
 .../wptrunner/executors/platformaccessibility/executoraxapi.py   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
index b911644b2c2769..8d793ca79f5539 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
@@ -117,6 +117,7 @@ def setup(self, product_name, logger):
         :logger: Logger for logging errors.
         """
         self.product_name = product_name
+        self.logger = logger
         self.root = find_browser(self.product_name)
 
         if not self.root:

From 31f79204a6f8ffea6124fcb7bd2b42388fabf017 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Wed, 6 Aug 2025 10:46:45 -0700
Subject: [PATCH 16/38] update comment

---
 resources/testdriver.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/testdriver.js b/resources/testdriver.js
index e09c666127cc9b..6c58d04481251f 100644
--- a/resources/testdriver.js
+++ b/resources/testdriver.js
@@ -2312,7 +2312,7 @@
         /**
          * Test properties of API's accessibility node. This test API endpoint
          * is still under development and subject to change, and for now should
-         * only be used for core-aam and html-aam tests.
+         * only be used for /core-aam and /html-aam tests.
          *
          * @param {id}         id of element
          * @param {test}       an object of tests

From 6de8026ec5d63c53c66d04b31d658c4179c83188 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Fri, 8 Aug 2025 10:42:51 -0700
Subject: [PATCH 17/38] Change API name, set environmment variable for
 accessibility runs

---
 tools/wpt/run.py                            | 6 ++++--
 tools/wptrunner/wptrunner/wptcommandline.py | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/wpt/run.py b/tools/wpt/run.py
index fd100d4c87d611..2f04148db3afe2 100644
--- a/tools/wpt/run.py
+++ b/tools/wpt/run.py
@@ -327,7 +327,7 @@ def setup_kwargs(self, kwargs):
         if kwargs["browser_channel"] == "nightly" and kwargs["enable_webtransport_h3"] is None:
             kwargs["enable_webtransport_h3"] = True
 
-        if kwargs["force_accessibility"]:
+        if kwargs["enable_accessibility_api"]:
             kwargs["extra_prefs"].append("accessibility.force_disabled=-1")
 
 
@@ -524,7 +524,9 @@ def setup_kwargs(self, kwargs):
             # We are on Taskcluster, where our Docker container does not have
             # enough capabilities to run Chrome with sandboxing. (gh-20133)
             kwargs["binary_args"].append("--no-sandbox")
-        if kwargs["force_accessibility"]:
+        if kwargs["enable_accessibility_api"]:
+            # Necessary to force chrome to register in AT-SPI2.
+            os.environ["ACCESSIBILITY_ENABLED"] = "1"
             kwargs["binary_args"].append("--force-renderer-accessibility")
 
 class HeadlessShell(BrowserSetup):
diff --git a/tools/wptrunner/wptrunner/wptcommandline.py b/tools/wptrunner/wptrunner/wptcommandline.py
index 4e82d754c0ed7f..0fbdd73a2cb5ed 100644
--- a/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tools/wptrunner/wptrunner/wptcommandline.py
@@ -161,6 +161,11 @@ def create_parser(product_choices=None):
                                       action="append",
                                       choices=["not-implementing", "backlog", "implementing"],
                                       help="Skip tests that have the given implementation status")
+    test_selection_group.add_argument("--enable-accessibility-api",
+                                      dest="enable_accessibility_api",
+                                      action="store_true",
+                                      default=None,
+                                      help="Enable test infrastructure and browser configurations for accessibility API tests")
     # TODO(bashi): Remove this when WebTransport over HTTP/3 server is enabled by default.
     test_selection_group.add_argument("--enable-webtransport-h3",
                                       action="store_true",
@@ -283,8 +288,6 @@ def create_parser(product_choices=None):
                               help="Don't update test status to CRASH if a crash dump is found")
     config_group.add_argument("--ws-extra", action="append",
                               help="Extra paths containing websockets handlers")
-    config_group.add_argument("--force-accessibility", action="store_true",
-                              dest="force_accessibility",help="Turn on accessibility.")
 
     build_type = parser.add_mutually_exclusive_group()
     build_type.add_argument("--debug-build", dest="debug", action="store_true",

From c0d793cec7317a001425216ddf982a7fb5a934ed Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Fri, 8 Aug 2025 11:03:25 -0700
Subject: [PATCH 18/38] Move accessibility API requirements to their own file

---
 tools/wptrunner/requirements.txt                       | 10 ----------
 .../wptrunner/requirements_platform_accessibility.txt  |  8 ++++++++
 2 files changed, 8 insertions(+), 10 deletions(-)
 create mode 100644 tools/wptrunner/requirements_platform_accessibility.txt

diff --git a/tools/wptrunner/requirements.txt b/tools/wptrunner/requirements.txt
index 9db6517cff5f28..3890ee225def25 100644
--- a/tools/wptrunner/requirements.txt
+++ b/tools/wptrunner/requirements.txt
@@ -10,13 +10,3 @@ requests==2.32.3
 types-requests==2.32.0.20241016
 urllib3==2.2.2
 aioquic==1.2.0
-
-# For executorplatformaccessibility
-comtypes==1.4.11; sys_platform == 'win32'
-PyGObject==3.50.1; sys_platform == 'linux' and python_version >= '3.9'
-PyGObject==3.48.2; sys_platform == 'linux' and python_version < '3.9'
-pyobjc-framework-Accessibility==11.1; sys_platform == 'darwin' and python_version >= '3.9'
-pyobjc-framework-ApplicationServices==11.1; sys_platform == 'darwin' and python_version >= '3.9'
-pyobjc==10.3.2; sys_platform == 'darwin' and python_version < '3.9'
-pyobjc-framework-Accessibility==10.3.2; sys_platform == 'darwin' and python_version < '3.9'
-pyobjc-framework-ApplicationServices==10.3.2; sys_platform == 'darwin' and python_version < '3.9'
diff --git a/tools/wptrunner/requirements_platform_accessibility.txt b/tools/wptrunner/requirements_platform_accessibility.txt
new file mode 100644
index 00000000000000..b14331f7e25e93
--- /dev/null
+++ b/tools/wptrunner/requirements_platform_accessibility.txt
@@ -0,0 +1,8 @@
+comtypes==1.4.11; sys_platform == 'win32'
+PyGObject==3.50.1; sys_platform == 'linux' and python_version >= '3.9'
+PyGObject==3.48.2; sys_platform == 'linux' and python_version < '3.9'
+pyobjc-framework-Accessibility==11.1; sys_platform == 'darwin' and python_version >= '3.9'
+pyobjc-framework-ApplicationServices==11.1; sys_platform == 'darwin' and python_version >= '3.9'
+pyobjc==10.3.2; sys_platform == 'darwin' and python_version < '3.9'
+pyobjc-framework-Accessibility==10.3.2; sys_platform == 'darwin' and python_version < '3.9'
+pyobjc-framework-ApplicationServices==10.3.2; sys_platform == 'darwin' and python_version < '3.9'

From d6e62b7fa00356d489899d51e04c2a810ace7fb8 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Fri, 8 Aug 2025 11:46:59 -0700
Subject: [PATCH 19/38] Only install accessibility python requirements when
 running accessibility tests

---
 tools/wpt/run.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/wpt/run.py b/tools/wpt/run.py
index 2f04148db3afe2..d645a6932e8544 100644
--- a/tools/wpt/run.py
+++ b/tools/wpt/run.py
@@ -949,6 +949,10 @@ def setup_wptrunner(venv, **kwargs):
     if not venv.skip_virtualenv_setup:
         requirements = [os.path.join(wpt_root, "tools", "wptrunner", "requirements.txt")]
         requirements.extend(setup_cls.requirements())
+
+        if kwargs["enable_accessibility_api"]:
+            requirements.append(os.path.join(wpt_root, "tools", "wptrunner", "requirements_platform_accessibility.txt"))
+
         venv.install_requirements(*requirements)
 
     affected_revish = kwargs.get("affected")

From 270619343e6135c23f81811880ff893f333306fb Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Fri, 8 Aug 2025 15:26:31 -0700
Subject: [PATCH 20/38] Do not fail if accessibility requirements not installed

---
 .../executorplatformaccessibility.py          | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
index de9a95d586f142..11e1a3799af667 100644
--- a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
@@ -9,13 +9,10 @@
 windows = False
 if platform == "linux":
     linux = True
-    from .platformaccessibility.executoratspi import AtspiExecutorImpl
 if platform == "darwin":
     mac = True
-    from .platformaccessibility.executoraxapi import AXAPIExecutorImpl
 if platform == "win32":
     windows = True
-    from .platformaccessibility.executorwindowsaccessibility import WindowsAccessibilityExecutorImpl
 
 def valid_api_for_platform(api):
     if (linux and api == "Atspi"):
@@ -33,13 +30,37 @@ class PlatformAccessibilityProtocolPart(ProtocolPart):
     def setup(self):
         self.product_name = self.parent.product_name
         self.impl = None
+        self.__init_platform_executor()
+
+
+    def __init_platform_executor(self):
         if linux:
+            try:
+                from .platformaccessibility.executoratspi import AtspiExecutorImpl
+            except ModuleNotFoundError:
+                self.logger.warning("Accessibility API testing was not enabled, accessibility API tests will fail.")
+                return
+
             self.impl = AtspiExecutorImpl()
             self.impl.setup(self.product_name, self.logger)
+
         if mac:
+            try:
+                from .platformaccessibility.executoraxapi import AXAPIExecutorImpl
+            except ModuleNotFoundError:
+                self.logger.warning("Accessibility API testing was not enabled, accessibility API tests will fail.")
+                return
+
             self.impl = AXAPIExecutorImpl()
             self.impl.setup(self.product_name, self.logger)
+
         if windows:
+            try:
+                from .platformaccessibility.executorwindowsaccessibility import WindowsAccessibilityExecutorImpl
+            except ModuleNotFoundError:
+                self.logger.warning("Accessibility API testing was not enabled, accessibility API tests will fail.")
+                return
+
             self.impl = WindowsAccessibilityExecutorImpl()
             self.impl.setup(self.product_name, self.logger)
 
@@ -50,4 +71,11 @@ def test_accessibility_api(self, dom_id, test, api, url):
         if not valid_api_for_platform(api):
             return ""
 
+        # self.impl will not exist if --enable-accessibility-api was not included
+        # or the necessary python requirements for accessibility API tests have not
+        # been installed.
+        if (not self.impl):
+            subtests = len(test[api]) if test[api] else 1
+            return ["Accessibility API testing not enabled."] * subtests
+
         return self.impl.test_accessibility_api(dom_id, test, api, url)

From 70251d5b4f67d23299639dfc8d71b7cbf818ae9a Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Wed, 13 Aug 2025 11:21:43 -0700
Subject: [PATCH 21/38] Switch CLI arg --enable-accessibility-api to true by
 default

---
 tools/wptrunner/wptrunner/wptcommandline.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/wptrunner/wptrunner/wptcommandline.py b/tools/wptrunner/wptrunner/wptcommandline.py
index 0fbdd73a2cb5ed..0d41399f1ebb19 100644
--- a/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tools/wptrunner/wptrunner/wptcommandline.py
@@ -164,7 +164,7 @@ def create_parser(product_choices=None):
     test_selection_group.add_argument("--enable-accessibility-api",
                                       dest="enable_accessibility_api",
                                       action="store_true",
-                                      default=None,
+                                      default=True,
                                       help="Enable test infrastructure and browser configurations for accessibility API tests")
     # TODO(bashi): Remove this when WebTransport over HTTP/3 server is enabled by default.
     test_selection_group.add_argument("--enable-webtransport-h3",

From 8585c8e0bae9f18272c2992050b6465e9a0922f8 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Wed, 13 Aug 2025 14:25:23 -0700
Subject: [PATCH 22/38] Revert "Switch CLI arg --enable-accessibility-api to
 true by default"

This reverts commit d508e4016d0d4d7403553a860e020c48992dfb0c.
---
 tools/wptrunner/wptrunner/wptcommandline.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/wptrunner/wptrunner/wptcommandline.py b/tools/wptrunner/wptrunner/wptcommandline.py
index 0d41399f1ebb19..0fbdd73a2cb5ed 100644
--- a/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tools/wptrunner/wptrunner/wptcommandline.py
@@ -164,7 +164,7 @@ def create_parser(product_choices=None):
     test_selection_group.add_argument("--enable-accessibility-api",
                                       dest="enable_accessibility_api",
                                       action="store_true",
-                                      default=True,
+                                      default=None,
                                       help="Enable test infrastructure and browser configurations for accessibility API tests")
     # TODO(bashi): Remove this when WebTransport over HTTP/3 server is enabled by default.
     test_selection_group.add_argument("--enable-webtransport-h3",

From 23cace62549f225e9065606e78a32f2f61c18a78 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Mon, 1 Sep 2025 13:42:44 -0700
Subject: [PATCH 23/38] Minor review points from ms2ger

---
 core-aam/scripts/aam-utils.js                 | 13 +++++-----
 resources/testdriver.js                       |  2 +-
 .../wptrunner/executors/executormarionette.py |  2 +-
 .../executorplatformaccessibility.py          | 24 ++++++-------------
 .../platformaccessibility/executoratspi.py    |  7 +++---
 5 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/core-aam/scripts/aam-utils.js b/core-aam/scripts/aam-utils.js
index 3bc0008b23bd20..5b02546f05a331 100644
--- a/core-aam/scripts/aam-utils.js
+++ b/core-aam/scripts/aam-utils.js
@@ -13,10 +13,11 @@ const AAMUtils = {
       return;
     }
 
-    if (results.length !== test_statements.length)
-      assert_unreached(`Recieved a different number of results than test statements: ${results}`)
+    if (results.length !== test_statements.length) {
+      assert_unreached(`Recieved a different number of results than test statements: ${results}`);
+    }
 
-    for (i = 0; i < results.length; i++) {
+    for (let i = 0; i < results.length; i++) {
       assert_equals(results[i], "Pass", `${test_statements[i].join(' ')}`)
     }
   },
@@ -25,9 +26,9 @@ const AAMUtils = {
   /*
     Creates a subtest for each API. Runs no asserts for APIs not found.
 
-    id:     id of element to test the accessibility node of
-    map:    entry in role-map.js, or similar
-    name:   name of the test
+    test_name: name of the test
+    id:        id of element to test the accessibility node of
+    map:       map of APIs to lists of test statements
   */
 
   verifyAPI: function(test_name, id, map) {
diff --git a/resources/testdriver.js b/resources/testdriver.js
index 6c58d04481251f..04e26b5ff1f2b7 100644
--- a/resources/testdriver.js
+++ b/resources/testdriver.js
@@ -2322,7 +2322,7 @@
          */
         test_accessibility_api: async function(dom_id, test, api) {
             return window.test_driver_internal.test_accessibility_api(
-              dom_id, test, api, location.href
+                dom_id, test, api, location.href
             );
         }
     };
diff --git a/tools/wptrunner/wptrunner/executors/executormarionette.py b/tools/wptrunner/wptrunner/executors/executormarionette.py
index 467acb491bdf8c..2012af80e08e37 100644
--- a/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -51,7 +51,7 @@
                        WindowProtocolPart,
                        merge_dicts)
 
-from .executorplatformaccessibility import (PlatformAccessibilityProtocolPart)
+from .executorplatformaccessibility import PlatformAccessibilityProtocolPart
 
 def do_delayed_imports():
     global errors, marionette, Addons, WebAuthn
diff --git a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
index 11e1a3799af667..bcdf6284b0058c 100644
--- a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
@@ -4,22 +4,12 @@
 
 from sys import platform
 
-linux = False
-mac = False
-windows = False
-if platform == "linux":
-    linux = True
-if platform == "darwin":
-    mac = True
-if platform == "win32":
-    windows = True
-
 def valid_api_for_platform(api):
-    if (linux and api == "Atspi"):
+    if platform == "linux" and api == "Atspi":
         return True
-    if (mac and api == "AXAPI"):
+    if platform == "darwin" and api == "AXAPI":
         return True
-    if (windows and (api == "UIA" or api == "IAccessible2")):
+    if platform == "win32" and (api == "UIA" or api == "IAccessible2"):
         return True
     return False
 
@@ -34,7 +24,7 @@ def setup(self):
 
 
     def __init_platform_executor(self):
-        if linux:
+        if platform == "linux":
             try:
                 from .platformaccessibility.executoratspi import AtspiExecutorImpl
             except ModuleNotFoundError:
@@ -44,7 +34,7 @@ def __init_platform_executor(self):
             self.impl = AtspiExecutorImpl()
             self.impl.setup(self.product_name, self.logger)
 
-        if mac:
+        if platform == "darwin":
             try:
                 from .platformaccessibility.executoraxapi import AXAPIExecutorImpl
             except ModuleNotFoundError:
@@ -54,7 +44,7 @@ def __init_platform_executor(self):
             self.impl = AXAPIExecutorImpl()
             self.impl.setup(self.product_name, self.logger)
 
-        if windows:
+        if platform == "win32":
             try:
                 from .platformaccessibility.executorwindowsaccessibility import WindowsAccessibilityExecutorImpl
             except ModuleNotFoundError:
@@ -74,7 +64,7 @@ def test_accessibility_api(self, dom_id, test, api, url):
         # self.impl will not exist if --enable-accessibility-api was not included
         # or the necessary python requirements for accessibility API tests have not
         # been installed.
-        if (not self.impl):
+        if not self.impl:
             subtests = len(test[api]) if test[api] else 1
             return ["Accessibility API testing not enabled."] * subtests
 
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
index 53093a28c3f378..12d08a188d47ff 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
@@ -9,7 +9,7 @@
 def poll_for_tab(root, product, url):
     """Poll until the tab with the test url is loaded and available in the
        accessibility API. Assumes wptrunner has already started a browser
-       process and navigated to the test test page.
+       process and navigated to the test page.
 
     :param root: The node in the accessibility API representing the browser process.
     :param product: The name of the browser.
@@ -254,9 +254,8 @@ def run_relation_test(self, statement):
         relations_dict = self.get_relations_dictionary()
         if expected_relation not in relations_dict:
             return f"Fail: relation not in list: {list(relations_dict.keys())}"
-        id_str = ",".join(relations_dict[expected_relation])
-        expected_ids.sort()
-        expected_id_str = ",".join(expected_ids)
+        id_str = ",".join(relations_dict[expected_relation].sort())
+        expected_id_str = ",".join(expected_ids.sort())
         if id_str != expected_id_str:
             return f"Fail: {expected_relation}={relations_dict[expected_relation]}"
         return "Pass"

From 2903ee9e45005a728035299226178ffd592e7867 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Mon, 1 Sep 2025 13:56:12 -0700
Subject: [PATCH 24/38] Only pass back test[api], not the whole object

---
 core-aam/scripts/aam-utils.js                                 | 2 +-
 resources/testdriver.js                                       | 2 +-
 .../wptrunner/executors/executorplatformaccessibility.py      | 2 +-
 .../executors/platformaccessibility/executoratspi.py          | 4 ++--
 .../executors/platformaccessibility/executoraxapi.py          | 4 ++--
 .../platformaccessibility/executorwindowsaccessibility.py     | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core-aam/scripts/aam-utils.js b/core-aam/scripts/aam-utils.js
index 5b02546f05a331..6118aa992e8b7c 100644
--- a/core-aam/scripts/aam-utils.js
+++ b/core-aam/scripts/aam-utils.js
@@ -41,7 +41,7 @@ const AAMUtils = {
         promise_test(async t => {
           let results = await test_driver.test_accessibility_api(
             id,
-            map,
+            map[api],
             api
           );
 
diff --git a/resources/testdriver.js b/resources/testdriver.js
index 04e26b5ff1f2b7..78f6df7eb15d0f 100644
--- a/resources/testdriver.js
+++ b/resources/testdriver.js
@@ -2315,7 +2315,7 @@
          * only be used for /core-aam and /html-aam tests.
          *
          * @param {id}         id of element
-         * @param {test}       an object of tests
+         * @param {test}       list of test statements
          * @param {api}        string indicating the API to test
          * @returns {Promise}  The string "match" when the test succeeds,
          *                     a failure message otherwise
diff --git a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
index bcdf6284b0058c..fc9cfc6a68fe5a 100644
--- a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
@@ -65,7 +65,7 @@ def test_accessibility_api(self, dom_id, test, api, url):
         # or the necessary python requirements for accessibility API tests have not
         # been installed.
         if not self.impl:
-            subtests = len(test[api]) if test[api] else 1
+            subtests = len(test) if test else 1
             return ["Accessibility API testing not enabled."] * subtests
 
         return self.impl.test_accessibility_api(dom_id, test, api, url)
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
index 12d08a188d47ff..2b853c3f1a127e 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
@@ -156,7 +156,7 @@ def test_accessibility_api(self, dom_id, test, api, url):
         """Execute a test of the accessibility API.
 
         :param dom_id: The dom id of the node to test.
-        :param test: The test statement.
+        :param test: List of test statements.
         :param api: The API to test.
         :param url: The url of the test.
         """
@@ -170,7 +170,7 @@ def test_accessibility_api(self, dom_id, test, api, url):
             )
 
         results = []
-        for test_statement in test["Atspi"]:
+        for test_statement in test:
             results.append(test_node.run_test_statement(TestStatement(test_statement)))
 
         return results
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
index 8d793ca79f5539..4475073c2e81ea 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
@@ -129,7 +129,7 @@ def test_accessibility_api(self, dom_id, test, api, url):
         """Execute a test of the accessibility API.
 
         :param dom_id: The dom id of the node to test.
-        :param test: The test statement.
+        :param test: List of test statements.
         :param api: The API to test.
         :param url: The url of the test.
         """
@@ -141,7 +141,7 @@ def test_accessibility_api(self, dom_id, test, api, url):
             )
 
         results = []
-        for test_statement in test["AXAPI"]:
+        for test_statement in test:
             results.append("Fail: Test not implemented.")
 
         return results
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
index 86289ccb5ebfa8..e0b15a7647cc21 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
@@ -129,7 +129,7 @@ def test_accessibility_api(self, dom_id, test, api, url):
         """Execute a test of the accessibility API.
 
         :param dom_id: The dom id of the node to test.
-        :param test: The test statement.
+        :param test: List of test statements.
         :param api: The API to test.
         :param url: The url of the test.
         """
@@ -143,7 +143,7 @@ def test_accessibility_api(self, dom_id, test, api, url):
             raise Exception(f"Couldn't find node with ID {dom_id}.")
 
         results = []
-        for test_statement in test["AXAPI"]:
+        for test_statement in test:
             results.append("Fail: Test not implemented.")
 
         return results

From a6f3d95fc8b24489753fa54448ec272f8c7f854d Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Tue, 2 Sep 2025 13:39:47 -0700
Subject: [PATCH 25/38] URL to URI

---
 .../wptrunner/executors/platformaccessibility/executoratspi.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
index 2b853c3f1a127e..b77318a07535b0 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
@@ -70,7 +70,7 @@ def is_ready(tab, product, url):
         return not Atspi.StateSet.contains(state_set, Atspi.StateType.BUSY)
 
     # Chromium family browsers do not use "BUSY", but you can
-    # tell if the document can be queried by URL attribute. If the 'URL'
+    # tell if the document can be queried by URL attribute. If the 'URI'
     # attribute is not here, we need to query for a new accessible object.
     document = Atspi.Accessible.get_document_iface(tab)
     document_attributes = Atspi.Document.get_document_attributes(document)

From 8d39f8bbab5707a4664cbf8d513687e4dd5b3fe0 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Wed, 22 Oct 2025 18:02:16 -0700
Subject: [PATCH 26/38] Update test names

---
 core-aam/attribute/aria-autocomplete.tentative.html  |  6 +++---
 core-aam/attribute/aria-braillelabel.tentative.html  |  2 +-
 core-aam/attribute/aria-errormessage.tentative.html  |  4 ++--
 core-aam/role/blockquote.tentative.html              |  2 +-
 ...for_aria-pressed_and_aria-haspopup.tentative.html | 10 +++++-----
 ...ith_defined_value_for_aria-pressed.tentative.html |  4 ++--
 ..._non_false_value_for_aria-haspopup.tentative.html | 12 ++++++------
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/core-aam/attribute/aria-autocomplete.tentative.html b/core-aam/attribute/aria-autocomplete.tentative.html
index 248ae23a4238f1..b83dcf5b1c2ebd 100644
--- a/core-aam/attribute/aria-autocomplete.tentative.html
+++ b/core-aam/attribute/aria-autocomplete.tentative.html
@@ -23,7 +23,7 @@
 
 <script>
   AAMUtils.verifyAPI(
-    'aria-autocomplete=both',
+    'input[role=combobox][aria-autocomplete=both]',
     'test1',
     {
       "Atspi" : [
@@ -58,7 +58,7 @@
   );
 
   AAMUtils.verifyAPI(
-    'aria-autocomplete=inline',
+    'input[role=combobox][aria-autocomplete=inline]',
     'test2',
     {
       "Atspi" : [
@@ -93,7 +93,7 @@
   );
 
   AAMUtils.verifyAPI(
-    'aria-autocomplete=list',
+    'input[role=combobox][aria-autocomplete=list]',
     'test3',
     {
       "Atspi" : [
diff --git a/core-aam/attribute/aria-braillelabel.tentative.html b/core-aam/attribute/aria-braillelabel.tentative.html
index 0bed0de7dc96aa..3e4e76c7d8fbae 100644
--- a/core-aam/attribute/aria-braillelabel.tentative.html
+++ b/core-aam/attribute/aria-braillelabel.tentative.html
@@ -21,7 +21,7 @@
 
 <script>
   AAMUtils.verifyAPI(
-    'aria-braillelabel',
+    'button[aria-braillelabel=foobar]',
     'test',
     {
       "Atspi" : [
diff --git a/core-aam/attribute/aria-errormessage.tentative.html b/core-aam/attribute/aria-errormessage.tentative.html
index 9edacbaa4cd756..5f9fa57d1a40a9 100644
--- a/core-aam/attribute/aria-errormessage.tentative.html
+++ b/core-aam/attribute/aria-errormessage.tentative.html
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <html>
 <head>
-  <title>aria-flowto</title>
+  <title>aria-errormessage</title>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="/resources/testdriver.js"></script>
@@ -23,7 +23,7 @@
 
 <script>
   AAMUtils.verifyAPI(
-    'aria-flowto',
+    "div[role=checkbox][aria-errormessage='error1 error2'][aria-invalid='true']",
     'test',
     {
       "Atspi" : [
diff --git a/core-aam/role/blockquote.tentative.html b/core-aam/role/blockquote.tentative.html
index 5b4d256c60d377..873cdaacf86f18 100644
--- a/core-aam/role/blockquote.tentative.html
+++ b/core-aam/role/blockquote.tentative.html
@@ -21,7 +21,7 @@
 
 <script>
   AAMUtils.verifyAPI(
-    'role=blockquote',
+    'div[role=blockquote]',
     'test',
     {
       "Atspi" : [
diff --git a/core-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup.tentative.html b/core-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup.tentative.html
index bbd1c696ad1cc3..9f8fe5ed5bbfcc 100644
--- a/core-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup.tentative.html
+++ b/core-aam/role/button_with_default_values_for_aria-pressed_and_aria-haspopup.tentative.html
@@ -65,11 +65,11 @@
     ]
   };
 
-  AAMUtils.verifyAPI('role=button', 'test1', test_statements);
-  AAMUtils.verifyAPI('role=button aria-pressed', 'test2', test_statements);
-  AAMUtils.verifyAPI('role=button aria-pressed aria-haspopup', 'test3', test_statements);
-  AAMUtils.verifyAPI('role=button aria-haspopup', 'test4', test_statements);
-  AAMUtils.verifyAPI('role=button aria-haspopup=false', 'test5', test_statements);
+  AAMUtils.verifyAPI('div[role="button"]', 'test1', test_statements);
+  AAMUtils.verifyAPI('div[role="button"][aria-pressed]', 'test2', test_statements);
+  AAMUtils.verifyAPI('div[role="button"][aria-pressed][aria-haspopup]', 'test3', test_statements);
+  AAMUtils.verifyAPI('div[role="button"][aria-haspopup]', 'test4', test_statements);
+  AAMUtils.verifyAPI('div[role="button"][aria-haspopup="false"]', 'test5', test_statements);
 </script>
 
 </body>
diff --git a/core-aam/role/button_with_defined_value_for_aria-pressed.tentative.html b/core-aam/role/button_with_defined_value_for_aria-pressed.tentative.html
index 0e8e2cead1ac6d..85e7cb78c94eb8 100644
--- a/core-aam/role/button_with_defined_value_for_aria-pressed.tentative.html
+++ b/core-aam/role/button_with_defined_value_for_aria-pressed.tentative.html
@@ -67,7 +67,7 @@
     ]
   };
 
-  AAMUtils.verifyAPI('role=button aria-pressed=true', 'test1', test_statements);
-  AAMUtils.verifyAPI('role=button aria-pressed=false','test2', test_statements);
+  AAMUtils.verifyAPI('div[role="button"][aria-pressed="true"]', 'test1', test_statements);
+  AAMUtils.verifyAPI('div[role="button"][aria-pressed="false"]','test2', test_statements);
 </script>
 </body>
diff --git a/core-aam/role/button_with_non_false_value_for_aria-haspopup.tentative.html b/core-aam/role/button_with_non_false_value_for_aria-haspopup.tentative.html
index d2871e4549da72..7dfec7bdd76665 100644
--- a/core-aam/role/button_with_non_false_value_for_aria-haspopup.tentative.html
+++ b/core-aam/role/button_with_non_false_value_for_aria-haspopup.tentative.html
@@ -75,37 +75,37 @@
 
 
   AAMUtils.verifyAPI(
-    'role=button aria-haspopup=true',
+    'div[role="button"][aria-haspopup="true"]',
     'test1',
     test_statements
   );
 
   AAMUtils.verifyAPI(
-    'role=button aria-haspopup=menu',
+    'div[role="button"][aria-haspopup="menu"]',
     'test2',
     test_statements
   );
 
   AAMUtils.verifyAPI(
-    'role=button aria-haspopup=listbox',
+    'div[role="button"][aria-haspopup="listbox"]',
     'test3',
     test_statements
   );
 
   AAMUtils.verifyAPI(
-    'role=button aria-haspopup=tree',
+    'div[role="button"][aria-haspopup="tree"]',
     'test4',
     test_statements
   );
 
   AAMUtils.verifyAPI(
-    'role=button aria-haspopup=grid',
+    'div[role="button"][aria-haspopup="grid"]',
     'test5',
     test_statements
   );
 
   AAMUtils.verifyAPI(
-    'role=button aria-haspopup=dialog',
+    'div[role="button"][aria-haspopup="dialog"]',
     'test6',
     test_statements
   );

From cd6113536ee8809d0fa64ee7a45f44538d090375 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Mon, 1 Dec 2025 13:48:05 -0800
Subject: [PATCH 27/38] Apply suggestions from code review

Co-authored-by: Jonathan Lee <jonathan-j-lee@users.noreply.github.com>
---
 tools/wptrunner/wptrunner/executors/executorwebdriver.py      | 2 +-
 .../executors/platformaccessibility/executoratspi.py          | 4 +---
 tools/wptrunner/wptrunner/wptcommandline.py                   | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/tools/wptrunner/wptrunner/executors/executorwebdriver.py b/tools/wptrunner/wptrunner/executors/executorwebdriver.py
index 1040adbab8fde0..aa429a16201e91 100644
--- a/tools/wptrunner/wptrunner/executors/executorwebdriver.py
+++ b/tools/wptrunner/wptrunner/executors/executorwebdriver.py
@@ -52,7 +52,7 @@
                        WebExtensionsProtocolPart,
                        merge_dicts)
 
-from .executorplatformaccessibility import (PlatformAccessibilityProtocolPart)
+from .executorplatformaccessibility import PlatformAccessibilityProtocolPart
 
 from typing import Any, List, Dict, Optional, Tuple
 from webdriver.client import Session
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
index b77318a07535b0..768317e3f9ef82 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
@@ -74,9 +74,7 @@ def is_ready(tab, product, url):
     # attribute is not here, we need to query for a new accessible object.
     document = Atspi.Accessible.get_document_iface(tab)
     document_attributes = Atspi.Document.get_document_attributes(document)
-    if "URI" in document_attributes and document_attributes["URI"] == url:
-        return True
-    return False
+    return "URI" in document_attributes and document_attributes["URI"] == url
 
 
 def find_browser(name):
diff --git a/tools/wptrunner/wptrunner/wptcommandline.py b/tools/wptrunner/wptrunner/wptcommandline.py
index 0fbdd73a2cb5ed..daf0980b799356 100644
--- a/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tools/wptrunner/wptrunner/wptcommandline.py
@@ -162,9 +162,7 @@ def create_parser(product_choices=None):
                                       choices=["not-implementing", "backlog", "implementing"],
                                       help="Skip tests that have the given implementation status")
     test_selection_group.add_argument("--enable-accessibility-api",
-                                      dest="enable_accessibility_api",
                                       action="store_true",
-                                      default=None,
                                       help="Enable test infrastructure and browser configurations for accessibility API tests")
     # TODO(bashi): Remove this when WebTransport over HTTP/3 server is enabled by default.
     test_selection_group.add_argument("--enable-webtransport-h3",

From 67ef0794ea70833759eb5c76ce012e5c61b0da65 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Mon, 1 Dec 2025 13:54:43 -0800
Subject: [PATCH 28/38] Code review comments from Jonathan

---
 .../platformaccessibility/executoraxapi.py       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
index 4475073c2e81ea..5bf5a98714a69c 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
@@ -50,13 +50,13 @@ def find_active_tab(browser):
     while stack:
         node = stack.pop()
 
-        (err, role) = AXUIElementCopyAttributeValue(node, "AXRole", None)
+        err, role = AXUIElementCopyAttributeValue(node, "AXRole", None)
         if err:
             continue
         if role == "AXWebArea":
             return node
 
-        (err, children) = AXUIElementCopyAttributeValue(node, "AXChildren", None)
+        err, children = AXUIElementCopyAttributeValue(node, "AXChildren", None)
         if err:
             continue
         stack.extend(children)
@@ -75,17 +75,17 @@ def find_node(root, attribute, expected_value):
     while stack:
         node = stack.pop()
 
-        (err, attributes) = AXUIElementCopyAttributeNames(node, None)
+        err, attributes = AXUIElementCopyAttributeNames(node, None)
         if err:
             continue
         if attribute in attributes:
-            (err, value) = AXUIElementCopyAttributeValue(node, attribute, None)
+            err, value = AXUIElementCopyAttributeValue(node, attribute, None)
             if err:
                 continue
             if value == expected_value:
                 return node
 
-        (err, children) = AXUIElementCopyAttributeValue(node, "AXChildren", None)
+        err, children = AXUIElementCopyAttributeValue(node, "AXChildren", None)
         if err:
             continue
         stack.extend(children)
@@ -99,11 +99,11 @@ def serialize_node(node):
     """
     props = {}
     props["API"] = "axapi"
-    (err, role) = AXUIElementCopyAttributeValue(node, "AXRole", None)
+    err, role = AXUIElementCopyAttributeValue(node, "AXRole", None)
     props["role"] = role
-    (err, name) = AXUIElementCopyAttributeValue(node, "AXTitle", None)
+    err, name = AXUIElementCopyAttributeValue(node, "AXTitle", None)
     props["name"] = name
-    (err, description) = AXUIElementCopyAttributeValue(node, "AXDescription", None)
+    err, description = AXUIElementCopyAttributeValue(node, "AXDescription", None)
     props["description"] = description
 
     return props

From d139de57d7c5e8cf8548c0c96bda1db2809a65f4 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Fri, 5 Dec 2025 15:39:54 -0800
Subject: [PATCH 29/38] Code review comments

---
 .../executors/platformaccessibility/executoratspi.py        | 3 +++
 .../executors/platformaccessibility/executoraxapi.py        | 5 ++++-
 .../platformaccessibility/executorwindowsaccessibility.py   | 6 +++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
index 768317e3f9ef82..0c1fc068fe587c 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
@@ -166,6 +166,9 @@ def test_accessibility_api(self, dom_id, test, api, url):
             raise Exception(
                 f"Couldn't find node with id {dom_id} in accessibility API ATSPI."
             )
+        self.logger.debug(
+            f"Found node with id {dom_id} in accessibility API ATSPI: {test_node.serialize()}"
+        )
 
         results = []
         for test_statement in test:
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
index 5bf5a98714a69c..ff9f7226d10fba 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
@@ -137,8 +137,11 @@ def test_accessibility_api(self, dom_id, test, api, url):
         node = find_node(tab, "AXDOMIdentifier", dom_id)
         if not node:
             raise Exception(
-                f"Couldn't find node with ID {dom_id}. Did you turn on accessibility?"
+                f"Couldn't find node with ID {dom_id} in accessibility API AXAPI."
             )
+        self.logger.debug(
+            f"Found node with id {dom_id} in accessibility API AXAPI: {serialize_node(node)}"
+        )
 
         results = []
         for test_statement in test:
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
index e0b15a7647cc21..248f2d47a250b4 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
@@ -122,8 +122,9 @@ def serialize_node(node):
 
 
 class WindowsAccessibilityExecutorImpl:
-    def setup(self, product_name):
+    def setup(self, product_name, logger):
         self.product_name = product_name
+        self.logger = logger
 
     def test_accessibility_api(self, dom_id, test, api, url):
         """Execute a test of the accessibility API.
@@ -141,6 +142,9 @@ def test_accessibility_api(self, dom_id, test, api, url):
         node = find_ia2_node(tab, dom_id)
         if not node:
             raise Exception(f"Couldn't find node with ID {dom_id}.")
+        self.logger.debug(
+            f"Found node with id {dom_id} in accessibility API IA2: {serialize_node(node)}"
+        )
 
         results = []
         for test_statement in test:

From c8c462e6326e48b7482a028cac6987252e00dea1 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Fri, 5 Dec 2025 16:53:11 -0800
Subject: [PATCH 30/38] Use ENUMS per code review comment

---
 .../executorwindowsaccessibility.py           |  20 +-
 .../platformaccessibility/ia2/constants.py    | 504 +++++++-----------
 2 files changed, 195 insertions(+), 329 deletions(-)

diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
index 248f2d47a250b4..85ad0756eda6b3 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
@@ -1,6 +1,11 @@
 # mypy: allow-untyped-defs
 
-from ..platformaccessibility.ia2.constants import *  # noqa: F403
+from ..platformaccessibility.ia2.constants import ( # type: ignore[attr-defined]
+    IAccessible2,
+    Role,
+    get_msaa_state_list,
+    get_state_list,
+)
 
 import time
 
@@ -19,7 +24,6 @@
 oleacc_mod = comtypes.client.GetModule("oleacc.dll")
 IAccessible = oleacc_mod.IAccessible  # noqa: N816
 
-# CoCreateInstance of UIA also initializes IA2
 uia_mod = comtypes.client.GetModule("UIAutomationCore.dll")
 uia_client = comtypes.CoCreateInstance(
     uia_mod.CUIAutomation._reg_clsid_,
@@ -64,7 +68,7 @@ def check_window_name(hwnd, lParam):  # noqa: N803
 
 def to_ia2(node):
     service = node.QueryInterface(IServiceProvider)
-    return service.QueryService(IAccessible2._iid_, IAccessible2)  # noqa: F405
+    return service.QueryService(IAccessible2._iid_, IAccessible2)
 
 
 def find_browser(product_name):
@@ -84,7 +88,7 @@ def poll_for_tab(url, root):
 def find_tab(url, root):
     for i in range(1, root.accChildCount + 1):
         child = to_ia2(root.accChild(i))
-        if child.accRole(CHILDID_SELF) == ROLE_SYSTEM_DOCUMENT:  # noqa: F405
+        if child.accRole(CHILDID_SELF) == Role.ROLE_SYSTEM_DOCUMENT:
             if child.accValue(CHILDID_SELF) == url:
                 return child
             # No need to search within documents.
@@ -111,12 +115,12 @@ def serialize_node(node):
 
     # MSAA properties
     node_dictionary["name"] = node.accName(CHILDID_SELF)
-    node_dictionary["msaa_role"] = role_to_string[node.accRole(CHILDID_SELF)]  # noqa: F405
-    node_dictionary["msaa_states"] = get_msaa_state_list(node.accState(CHILDID_SELF))  # noqa: F405
+    node_dictionary["msaa_role"] = Role(node.accRole(CHILDID_SELF)).name
+    node_dictionary["msaa_states"] = get_msaa_state_list(node.accState(CHILDID_SELF))
 
     # IAccessible2 properties
-    node_dictionary["ia2_role"] = role_to_string[node.role()]  # noqa: F405
-    node_dictionary["ia2_states"] = get_state_list(node.states)  # noqa: F405
+    node_dictionary["ia2_role"] = Role(node.role()).name
+    node_dictionary["ia2_states"] = get_state_list(node.states)
 
     return node_dictionary
 
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py
index 8ce24f7b22472c..db5c104c6097c8 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/ia2/constants.py
@@ -1,5 +1,6 @@
 # type: ignore
 
+import enum
 import os
 import comtypes.client
 
@@ -13,334 +14,195 @@
 # when this file is imported.
 globals().update((k, getattr(ia2_mod, k)) for k in ia2_mod.__all__)
 
-# Some constants are not provided via oleacc, specifically those for MSAA
-ROLE_SYSTEM_TITLEBAR = 1
-ROLE_SYSTEM_MENUBAR = 2
-ROLE_SYSTEM_SCROLLBAR = 3
-ROLE_SYSTEM_GRIP = 4
-ROLE_SYSTEM_SOUND = 5
-ROLE_SYSTEM_CURSOR = 6
-ROLE_SYSTEM_CARET = 7
-ROLE_SYSTEM_ALERT = 8
-ROLE_SYSTEM_WINDOW = 9
-ROLE_SYSTEM_CLIENT = 10
-ROLE_SYSTEM_MENUPOPUP = 11
-ROLE_SYSTEM_MENUITEM = 12
-ROLE_SYSTEM_TOOLTIP = 13
-ROLE_SYSTEM_APPLICATION = 14
-ROLE_SYSTEM_DOCUMENT = 15
-ROLE_SYSTEM_PANE = 16
-ROLE_SYSTEM_CHART = 17
-ROLE_SYSTEM_DIALOG = 18
-ROLE_SYSTEM_BORDER = 19
-ROLE_SYSTEM_GROUPING = 20
-ROLE_SYSTEM_SEPARATOR = 21
-ROLE_SYSTEM_TOOLBAR = 22
-ROLE_SYSTEM_STATUSBAR = 23
-ROLE_SYSTEM_TABLE = 24
-ROLE_SYSTEM_COLUMNHEADER = 25
-ROLE_SYSTEM_ROWHEADER = 26
-ROLE_SYSTEM_COLUMN = 27
-ROLE_SYSTEM_ROW = 28
-ROLE_SYSTEM_CELL = 29
-ROLE_SYSTEM_LINK = 30
-ROLE_SYSTEM_HELPBALLOON = 31
-ROLE_SYSTEM_CHARACTER = 32
-ROLE_SYSTEM_LIST = 33
-ROLE_SYSTEM_LISTITEM = 34
-ROLE_SYSTEM_OUTLINE = 35
-ROLE_SYSTEM_OUTLINEITEM = 36
-ROLE_SYSTEM_PAGETAB = 37
-ROLE_SYSTEM_PROPERTYPAGE = 38
-ROLE_SYSTEM_INDICATOR = 39
-ROLE_SYSTEM_GRAPHIC = 40
-ROLE_SYSTEM_STATICTEXT = 41
-ROLE_SYSTEM_TEXT = 42
-ROLE_SYSTEM_PUSHBUTTON = 43
-ROLE_SYSTEM_CHECKBUTTON = 44
-ROLE_SYSTEM_RADIOBUTTON = 45
-ROLE_SYSTEM_COMBOBOX = 46
-ROLE_SYSTEM_DROPLIST = 47
-ROLE_SYSTEM_PROGRESSBAR = 48
-ROLE_SYSTEM_DIAL = 49
-ROLE_SYSTEM_HOTKEYFIELD = 50
-ROLE_SYSTEM_SLIDER = 51
-ROLE_SYSTEM_SPINBUTTON = 52
-ROLE_SYSTEM_DIAGRAM = 53
-ROLE_SYSTEM_ANIMATION = 54
-ROLE_SYSTEM_EQUATION = 55
-ROLE_SYSTEM_BUTTONDROPDOWN = 56
-ROLE_SYSTEM_BUTTONMENU = 57
-ROLE_SYSTEM_BUTTONDROPDOWNGRID = 58
-ROLE_SYSTEM_WHITESPACE = 59
-ROLE_SYSTEM_PAGETABLIST = 60
-ROLE_SYSTEM_CLOCK = 61
-ROLE_SYSTEM_SPLITBUTTON = 62
-ROLE_SYSTEM_IPADDRESS = 63
-ROLE_SYSTEM_OUTLINEBUTTON = 64
+class Role(enum.IntEnum):
+    # MSAA roles - constants not provided via oleacc
+    ROLE_SYSTEM_TITLEBAR = 1
+    ROLE_SYSTEM_MENUBAR = 2
+    ROLE_SYSTEM_SCROLLBAR = 3
+    ROLE_SYSTEM_GRIP = 4
+    ROLE_SYSTEM_SOUND = 5
+    ROLE_SYSTEM_CURSOR = 6
+    ROLE_SYSTEM_CARET = 7
+    ROLE_SYSTEM_ALERT = 8
+    ROLE_SYSTEM_WINDOW = 9
+    ROLE_SYSTEM_CLIENT = 10
+    ROLE_SYSTEM_MENUPOPUP = 11
+    ROLE_SYSTEM_MENUITEM = 12
+    ROLE_SYSTEM_TOOLTIP = 13
+    ROLE_SYSTEM_APPLICATION = 14
+    ROLE_SYSTEM_DOCUMENT = 15
+    ROLE_SYSTEM_PANE = 16
+    ROLE_SYSTEM_CHART = 17
+    ROLE_SYSTEM_DIALOG = 18
+    ROLE_SYSTEM_BORDER = 19
+    ROLE_SYSTEM_GROUPING = 20
+    ROLE_SYSTEM_SEPARATOR = 21
+    ROLE_SYSTEM_TOOLBAR = 22
+    ROLE_SYSTEM_STATUSBAR = 23
+    ROLE_SYSTEM_TABLE = 24
+    ROLE_SYSTEM_COLUMNHEADER = 25
+    ROLE_SYSTEM_ROWHEADER = 26
+    ROLE_SYSTEM_COLUMN = 27
+    ROLE_SYSTEM_ROW = 28
+    ROLE_SYSTEM_CELL = 29
+    ROLE_SYSTEM_LINK = 30
+    ROLE_SYSTEM_HELPBALLOON = 31
+    ROLE_SYSTEM_CHARACTER = 32
+    ROLE_SYSTEM_LIST = 33
+    ROLE_SYSTEM_LISTITEM = 34
+    ROLE_SYSTEM_OUTLINE = 35
+    ROLE_SYSTEM_OUTLINEITEM = 36
+    ROLE_SYSTEM_PAGETAB = 37
+    ROLE_SYSTEM_PROPERTYPAGE = 38
+    ROLE_SYSTEM_INDICATOR = 39
+    ROLE_SYSTEM_GRAPHIC = 40
+    ROLE_SYSTEM_STATICTEXT = 41
+    ROLE_SYSTEM_TEXT = 42
+    ROLE_SYSTEM_PUSHBUTTON = 43
+    ROLE_SYSTEM_CHECKBUTTON = 44
+    ROLE_SYSTEM_RADIOBUTTON = 45
+    ROLE_SYSTEM_COMBOBOX = 46
+    ROLE_SYSTEM_DROPLIST = 47
+    ROLE_SYSTEM_PROGRESSBAR = 48
+    ROLE_SYSTEM_DIAL = 49
+    ROLE_SYSTEM_HOTKEYFIELD = 50
+    ROLE_SYSTEM_SLIDER = 51
+    ROLE_SYSTEM_SPINBUTTON = 52
+    ROLE_SYSTEM_DIAGRAM = 53
+    ROLE_SYSTEM_ANIMATION = 54
+    ROLE_SYSTEM_EQUATION = 55
+    ROLE_SYSTEM_BUTTONDROPDOWN = 56
+    ROLE_SYSTEM_BUTTONMENU = 57
+    ROLE_SYSTEM_BUTTONDROPDOWNGRID = 58
+    ROLE_SYSTEM_WHITESPACE = 59
+    ROLE_SYSTEM_PAGETABLIST = 60
+    ROLE_SYSTEM_CLOCK = 61
+    ROLE_SYSTEM_SPLITBUTTON = 62
+    ROLE_SYSTEM_IPADDRESS = 63
+    ROLE_SYSTEM_OUTLINEBUTTON = 64
+    # IAccessible2 roles
+    IA2_ROLE_CANVAS = ia2_mod.IA2_ROLE_CANVAS
+    IA2_ROLE_CAPTION = ia2_mod.IA2_ROLE_CAPTION
+    IA2_ROLE_CHECK_MENU_ITEM = ia2_mod.IA2_ROLE_CHECK_MENU_ITEM
+    IA2_ROLE_COLOR_CHOOSER = ia2_mod.IA2_ROLE_COLOR_CHOOSER
+    IA2_ROLE_DATE_EDITOR = ia2_mod.IA2_ROLE_DATE_EDITOR
+    IA2_ROLE_DESKTOP_ICON = ia2_mod.IA2_ROLE_DESKTOP_ICON
+    IA2_ROLE_DESKTOP_PANE = ia2_mod.IA2_ROLE_DESKTOP_PANE
+    IA2_ROLE_DIRECTORY_PANE = ia2_mod.IA2_ROLE_DIRECTORY_PANE
+    IA2_ROLE_EDITBAR = ia2_mod.IA2_ROLE_EDITBAR
+    IA2_ROLE_EMBEDDED_OBJECT = ia2_mod.IA2_ROLE_EMBEDDED_OBJECT
+    IA2_ROLE_ENDNOTE = ia2_mod.IA2_ROLE_ENDNOTE
+    IA2_ROLE_FILE_CHOOSER = ia2_mod.IA2_ROLE_FILE_CHOOSER
+    IA2_ROLE_FONT_CHOOSER = ia2_mod.IA2_ROLE_FONT_CHOOSER
+    IA2_ROLE_FOOTER = ia2_mod.IA2_ROLE_FOOTER
+    IA2_ROLE_FOOTNOTE = ia2_mod.IA2_ROLE_FOOTNOTE
+    IA2_ROLE_FORM = ia2_mod.IA2_ROLE_FORM
+    IA2_ROLE_FRAME = ia2_mod.IA2_ROLE_FRAME
+    IA2_ROLE_GLASS_PANE = ia2_mod.IA2_ROLE_GLASS_PANE
+    IA2_ROLE_HEADER = ia2_mod.IA2_ROLE_HEADER
+    IA2_ROLE_HEADING = ia2_mod.IA2_ROLE_HEADING
+    IA2_ROLE_ICON = ia2_mod.IA2_ROLE_ICON
+    IA2_ROLE_IMAGE_MAP = ia2_mod.IA2_ROLE_IMAGE_MAP
+    IA2_ROLE_INPUT_METHOD_WINDOW = ia2_mod.IA2_ROLE_INPUT_METHOD_WINDOW
+    IA2_ROLE_INTERNAL_FRAME = ia2_mod.IA2_ROLE_INTERNAL_FRAME
+    IA2_ROLE_LABEL = ia2_mod.IA2_ROLE_LABEL
+    IA2_ROLE_LAYERED_PANE = ia2_mod.IA2_ROLE_LAYERED_PANE
+    IA2_ROLE_NOTE = ia2_mod.IA2_ROLE_NOTE
+    IA2_ROLE_OPTION_PANE = ia2_mod.IA2_ROLE_OPTION_PANE
+    IA2_ROLE_PAGE = ia2_mod.IA2_ROLE_PAGE
+    IA2_ROLE_PARAGRAPH = ia2_mod.IA2_ROLE_PARAGRAPH
+    IA2_ROLE_RADIO_MENU_ITEM = ia2_mod.IA2_ROLE_RADIO_MENU_ITEM
+    IA2_ROLE_REDUNDANT_OBJECT = ia2_mod.IA2_ROLE_REDUNDANT_OBJECT
+    IA2_ROLE_ROOT_PANE = ia2_mod.IA2_ROLE_ROOT_PANE
+    IA2_ROLE_RULER = ia2_mod.IA2_ROLE_RULER
+    IA2_ROLE_SCROLL_PANE = ia2_mod.IA2_ROLE_SCROLL_PANE
+    IA2_ROLE_SECTION = ia2_mod.IA2_ROLE_SECTION
+    IA2_ROLE_SHAPE = ia2_mod.IA2_ROLE_SHAPE
+    IA2_ROLE_SPLIT_PANE = ia2_mod.IA2_ROLE_SPLIT_PANE
+    IA2_ROLE_TEAR_OFF_MENU = ia2_mod.IA2_ROLE_TEAR_OFF_MENU
+    IA2_ROLE_TERMINAL = ia2_mod.IA2_ROLE_TERMINAL
+    IA2_ROLE_TEXT_FRAME = ia2_mod.IA2_ROLE_TEXT_FRAME
+    IA2_ROLE_TOGGLE_BUTTON = ia2_mod.IA2_ROLE_TOGGLE_BUTTON
+    IA2_ROLE_UNKNOWN = ia2_mod.IA2_ROLE_UNKNOWN
+    IA2_ROLE_VIEW_PORT = ia2_mod.IA2_ROLE_VIEW_PORT
+    IA2_ROLE_COMPLEMENTARY_CONTENT = ia2_mod.IA2_ROLE_COMPLEMENTARY_CONTENT
+    IA2_ROLE_LANDMARK = ia2_mod.IA2_ROLE_LANDMARK
+    IA2_ROLE_LEVEL_BAR = ia2_mod.IA2_ROLE_LEVEL_BAR
+    IA2_ROLE_CONTENT_DELETION = ia2_mod.IA2_ROLE_CONTENT_DELETION
+    IA2_ROLE_CONTENT_INSERTION = ia2_mod.IA2_ROLE_CONTENT_INSERTION
+    IA2_ROLE_BLOCK_QUOTE = ia2_mod.IA2_ROLE_BLOCK_QUOTE
+    IA2_ROLE_MARK = ia2_mod.IA2_ROLE_MARK
+    IA2_ROLE_SUGGESTION = ia2_mod.IA2_ROLE_SUGGESTION
+    IA2_ROLE_COMMENT = ia2_mod.IA2_ROLE_COMMENT
 
-role_to_string = {
-    ROLE_SYSTEM_TITLEBAR: "ROLE_SYSTEM_TITLEBAR",
-    ROLE_SYSTEM_MENUBAR: "ROLE_SYSTEM_MENUBAR",
-    ROLE_SYSTEM_SCROLLBAR: "ROLE_SYSTEM_SCROLLBAR",
-    ROLE_SYSTEM_GRIP: "ROLE_SYSTEM_GRIP",
-    ROLE_SYSTEM_SOUND: "ROLE_SYSTEM_SOUND",
-    ROLE_SYSTEM_CURSOR: "ROLE_SYSTEM_CURSOR",
-    ROLE_SYSTEM_CARET: "ROLE_SYSTEM_CARET",
-    ROLE_SYSTEM_ALERT: "ROLE_SYSTEM_ALERT",
-    ROLE_SYSTEM_WINDOW: "ROLE_SYSTEM_WINDOW",
-    ROLE_SYSTEM_CLIENT: "ROLE_SYSTEM_CLIENT",
-    ROLE_SYSTEM_MENUPOPUP: "ROLE_SYSTEM_MENUPOPUP",
-    ROLE_SYSTEM_MENUITEM: "ROLE_SYSTEM_MENUITEM",
-    ROLE_SYSTEM_TOOLTIP: "ROLE_SYSTEM_TOOLTIP",
-    ROLE_SYSTEM_APPLICATION: "ROLE_SYSTEM_APPLICATION",
-    ROLE_SYSTEM_DOCUMENT: "ROLE_SYSTEM_DOCUMENT",
-    ROLE_SYSTEM_PANE: "ROLE_SYSTEM_PANE",
-    ROLE_SYSTEM_CHART: "ROLE_SYSTEM_CHART",
-    ROLE_SYSTEM_DIALOG: "ROLE_SYSTEM_DIALOG",
-    ROLE_SYSTEM_BORDER: "ROLE_SYSTEM_BORDER",
-    ROLE_SYSTEM_GROUPING: "ROLE_SYSTEM_GROUPING",
-    ROLE_SYSTEM_SEPARATOR: "ROLE_SYSTEM_SEPARATOR",
-    ROLE_SYSTEM_TOOLBAR: "ROLE_SYSTEM_TOOLBAR",
-    ROLE_SYSTEM_STATUSBAR: "ROLE_SYSTEM_STATUSBAR",
-    ROLE_SYSTEM_TABLE: "ROLE_SYSTEM_TABLE",
-    ROLE_SYSTEM_COLUMNHEADER: "ROLE_SYSTEM_COLUMNHEADER",
-    ROLE_SYSTEM_ROWHEADER: "ROLE_SYSTEM_ROWHEADER",
-    ROLE_SYSTEM_COLUMN: "ROLE_SYSTEM_COLUMN",
-    ROLE_SYSTEM_ROW: "ROLE_SYSTEM_ROW",
-    ROLE_SYSTEM_CELL: "ROLE_SYSTEM_CEL",
-    ROLE_SYSTEM_LINK: "ROLE_SYSTEM_LINK",
-    ROLE_SYSTEM_HELPBALLOON: "ROLE_SYSTEM_HELPBALLOON",
-    ROLE_SYSTEM_CHARACTER: "ROLE_SYSTEM_CHARACTER",
-    ROLE_SYSTEM_LIST: "ROLE_SYSTEM_LIST",
-    ROLE_SYSTEM_LISTITEM: "ROLE_SYSTEM_LISTITEM",
-    ROLE_SYSTEM_OUTLINE: "ROLE_SYSTEM_OUTLINE",
-    ROLE_SYSTEM_OUTLINEITEM: "ROLE_SYSTEM_OUTLINEITEM",
-    ROLE_SYSTEM_PAGETAB: "ROLE_SYSTEM_PAGETAB",
-    ROLE_SYSTEM_PROPERTYPAGE: "ROLE_SYSTEM_PROPERTYPAGE",
-    ROLE_SYSTEM_INDICATOR: "ROLE_SYSTEM_INDICATOR",
-    ROLE_SYSTEM_GRAPHIC: "ROLE_SYSTEM_GRAPHIC",
-    ROLE_SYSTEM_STATICTEXT: "ROLE_SYSTEM_STATICTEXT",
-    ROLE_SYSTEM_TEXT: "ROLE_SYSTEM_TEXT",
-    ROLE_SYSTEM_PUSHBUTTON: "ROLE_SYSTEM_PUSHBUTTON",
-    ROLE_SYSTEM_CHECKBUTTON: "ROLE_SYSTEM_CHECKBUTTON",
-    ROLE_SYSTEM_RADIOBUTTON: "ROLE_SYSTEM_RADIOBUTTON",
-    ROLE_SYSTEM_COMBOBOX: "ROLE_SYSTEM_COMBOBOX",
-    ROLE_SYSTEM_DROPLIST: "ROLE_SYSTEM_DROPLIST",
-    ROLE_SYSTEM_PROGRESSBAR: "ROLE_SYSTEM_PROGRESSBAR",
-    ROLE_SYSTEM_DIAL: "ROLE_SYSTEM_DIAL",
-    ROLE_SYSTEM_HOTKEYFIELD: "ROLE_SYSTEM_HOTKEYFIELD",
-    ROLE_SYSTEM_SLIDER: "ROLE_SYSTEM_SLIDER",
-    ROLE_SYSTEM_SPINBUTTON: "ROLE_SYSTEM_SPINBUTTON",
-    ROLE_SYSTEM_DIAGRAM: "ROLE_SYSTEM_DIAGRAM",
-    ROLE_SYSTEM_ANIMATION: "ROLE_SYSTEM_ANIMATION",
-    ROLE_SYSTEM_EQUATION: "ROLE_SYSTEM_EQUATION",
-    ROLE_SYSTEM_BUTTONDROPDOWN: "ROLE_SYSTEM_BUTTONDROPDOWN",
-    ROLE_SYSTEM_BUTTONMENU: "ROLE_SYSTEM_BUTTONMENU",
-    ROLE_SYSTEM_BUTTONDROPDOWNGRID: "ROLE_SYSTEM_BUTTONDROPDOWNGRID",
-    ROLE_SYSTEM_WHITESPACE: "ROLE_SYSTEM_WHITESPACE",
-    ROLE_SYSTEM_PAGETABLIST: "ROLE_SYSTEM_PAGETABLIST",
-    ROLE_SYSTEM_CLOCK: "ROLE_SYSTEM_CLOCK",
-    ROLE_SYSTEM_SPLITBUTTON: "ROLE_SYSTEM_SPLITBUTTON",
-    ROLE_SYSTEM_IPADDRESS: "ROLE_SYSTEM_IPADDRESS",
-    ROLE_SYSTEM_OUTLINEBUTTON: "ROLE_SYSTEM_OUTLINEBUTTON",
-    IA2_ROLE_CANVAS: "IA2_ROLE_CANVAS",  # noqa: F821
-    IA2_ROLE_CAPTION: "IA2_ROLE_CAPTION",  # noqa: F821
-    IA2_ROLE_CHECK_MENU_ITEM: "IA2_ROLE_CHECK_MENU_ITEM",  # noqa: F821
-    IA2_ROLE_COLOR_CHOOSER: "IA2_ROLE_COLOR_CHOOSER",  # noqa: F821
-    IA2_ROLE_DATE_EDITOR: "IA2_ROLE_DATE_EDITOR",  # noqa: F821
-    IA2_ROLE_DESKTOP_ICON: "IA2_ROLE_DESKTOP_ICON",  # noqa: F821
-    IA2_ROLE_DESKTOP_PANE: "IA2_ROLE_DESKTOP_PANE",  # noqa: F821
-    IA2_ROLE_DIRECTORY_PANE: "IA2_ROLE_DIRECTORY_PANE",  # noqa: F821
-    IA2_ROLE_EDITBAR: "IA2_ROLE_EDITBAR",  # noqa: F821
-    IA2_ROLE_EMBEDDED_OBJECT: "IA2_ROLE_EMBEDDED_OBJECT",  # noqa: F821
-    IA2_ROLE_ENDNOTE: "IA2_ROLE_ENDNOTE",  # noqa: F821
-    IA2_ROLE_FILE_CHOOSER: "IA2_ROLE_FILE_CHOOSER",  # noqa: F821
-    IA2_ROLE_FONT_CHOOSER: "IA2_ROLE_FONT_CHOOSER",  # noqa: F821
-    IA2_ROLE_FOOTER: "IA2_ROLE_FOOTER",  # noqa: F821
-    IA2_ROLE_FOOTNOTE: "IA2_ROLE_FOOTNOTE",  # noqa: F821
-    IA2_ROLE_FORM: "IA2_ROLE_FORM",  # noqa: F821
-    IA2_ROLE_FRAME: "IA2_ROLE_FRAME",  # noqa: F821
-    IA2_ROLE_GLASS_PANE: "IA2_ROLE_GLASS_PANE",  # noqa: F821
-    IA2_ROLE_HEADER: "IA2_ROLE_HEADER",  # noqa: F821
-    IA2_ROLE_HEADING: "IA2_ROLE_HEADING",  # noqa: F821
-    IA2_ROLE_ICON: "IA2_ROLE_ICON",  # noqa: F821
-    IA2_ROLE_IMAGE_MAP: "IA2_ROLE_IMAGE_MAP",  # noqa: F821
-    IA2_ROLE_INPUT_METHOD_WINDOW: "IA2_ROLE_INPUT_METHOD_WINDOW",  # noqa: F821
-    IA2_ROLE_INTERNAL_FRAME: "IA2_ROLE_INTERNAL_FRAME",  # noqa: F821
-    IA2_ROLE_LABEL: "IA2_ROLE_LABEL",  # noqa: F821
-    IA2_ROLE_LAYERED_PANE: "IA2_ROLE_LAYERED_PANE",  # noqa: F821
-    IA2_ROLE_NOTE: "IA2_ROLE_NOTE",  # noqa: F821
-    IA2_ROLE_OPTION_PANE: "IA2_ROLE_OPTION_PANE",  # noqa: F821
-    IA2_ROLE_PAGE: "IA2_ROLE_PAGE",  # noqa: F821
-    IA2_ROLE_PARAGRAPH: "IA2_ROLE_PARAGRAPH",  # noqa: F821
-    IA2_ROLE_RADIO_MENU_ITEM: "IA2_ROLE_RADIO_MENU_ITEM",  # noqa: F821
-    IA2_ROLE_REDUNDANT_OBJECT: "IA2_ROLE_REDUNDANT_OBJECT",  # noqa: F821
-    IA2_ROLE_ROOT_PANE: "IA2_ROLE_ROOT_PANE",  # noqa: F821
-    IA2_ROLE_RULER: "IA2_ROLE_RULER",  # noqa: F821
-    IA2_ROLE_SCROLL_PANE: "IA2_ROLE_SCROLL_PANE",  # noqa: F821
-    IA2_ROLE_SECTION: "IA2_ROLE_SECTION",  # noqa: F821
-    IA2_ROLE_SHAPE: "IA2_ROLE_SHAPE",  # noqa: F821
-    IA2_ROLE_SPLIT_PANE: "IA2_ROLE_SPLIT_PANE",  # noqa: F821
-    IA2_ROLE_TEAR_OFF_MENU: "IA2_ROLE_TEAR_OFF_MENU",  # noqa: F821
-    IA2_ROLE_TERMINAL: "IA2_ROLE_TERMINAL",  # noqa: F821
-    IA2_ROLE_TEXT_FRAME: "IA2_ROLE_TEXT_FRAME",  # noqa: F821
-    IA2_ROLE_TOGGLE_BUTTON: "IA2_ROLE_TOGGLE_BUTTON",  # noqa: F821
-    IA2_ROLE_UNKNOWN: "IA2_ROLE_UNKNOWN",  # noqa: F821
-    IA2_ROLE_VIEW_PORT: "IA2_ROLE_VIEW_PORT",  # noqa: F821
-    IA2_ROLE_COMPLEMENTARY_CONTENT: "IA2_ROLE_COMPLEMENTARY_CONTENT",  # noqa: F821
-    IA2_ROLE_LANDMARK: "IA2_ROLE_LANDMARK",  # noqa: F821
-    IA2_ROLE_LEVEL_BAR: "IA2_ROLE_LEVEL_BAR",  # noqa: F821
-    IA2_ROLE_CONTENT_DELETION: "IA2_ROLE_CONTENT_DELETION",  # noqa: F821
-    IA2_ROLE_CONTENT_INSERTION: "IA2_ROLE_CONTENT_INSERTION",  # noqa: F821
-    IA2_ROLE_BLOCK_QUOTE: "IA2_ROLE_BLOCK_QUOTE",  # noqa: F821
-    IA2_ROLE_MARK: "IA2_ROLE_MARK",  # noqa: F821
-    IA2_ROLE_SUGGESTION: "IA2_ROLE_SUGGESTION",  # noqa: F821
-    IA2_ROLE_COMMENT: "IA2_ROLE_COMMENT",  # noqa: F821
-}
 
-STATE_SYSTEM_UNAVAILABLE = 0x00000001
-STATE_SYSTEM_SELECTED = 0x00000002
-STATE_SYSTEM_FOCUSED = 0x00000004
-STATE_SYSTEM_PRESSED = 0x00000008
-STATE_SYSTEM_CHECKED = 0x00000010
-STATE_SYSTEM_MIXED = 0x00000020
-STATE_SYSTEM_INDETERMINATE = STATE_SYSTEM_MIXED
-STATE_SYSTEM_READONLY = 0x00000040
-STATE_SYSTEM_HOTTRACKED = 0x00000080
-STATE_SYSTEM_DEFAULT = 0x00000100
-STATE_SYSTEM_EXPANDED = 0x00000200
-STATE_SYSTEM_COLLAPSED = 0x00000400
-STATE_SYSTEM_BUSY = 0x00000800
-STATE_SYSTEM_FLOATING = 0x00001000
-STATE_SYSTEM_MARQUEED = 0x00002000
-STATE_SYSTEM_ANIMATED = 0x00004000
-STATE_SYSTEM_INVISIBLE = 0x00008000
-STATE_SYSTEM_OFFSCREEN = 0x00010000
-STATE_SYSTEM_SIZEABLE = 0x00020000
-STATE_SYSTEM_MOVEABLE = 0x00040000
-STATE_SYSTEM_SELFVOICING = 0x00080000
-STATE_SYSTEM_FOCUSABLE = 0x00100000
-STATE_SYSTEM_SELECTABLE = 0x00200000
-STATE_SYSTEM_LINKED = 0x00400000
-STATE_SYSTEM_TRAVERSED = 0x00800000
-STATE_SYSTEM_MULTISELECTABLE = 0x01000000
-STATE_SYSTEM_EXTSELECTABLE = 0x02000000
-STATE_SYSTEM_ALERT_LOW = 0x04000000
-STATE_SYSTEM_ALERT_MEDIUM = 0x08000000
-STATE_SYSTEM_ALERT_HIGH = 0x10000000
-STATE_SYSTEM_PROTECTED = 0x20000000
-STATE_SYSTEM_HASPOPUP = 0x40000000
-STATE_SYSTEM_VALID = 0x3FFFFFFF
+class MsaaState(enum.IntFlag):
+    STATE_SYSTEM_UNAVAILABLE = 0x00000001
+    STATE_SYSTEM_SELECTED = 0x00000002
+    STATE_SYSTEM_FOCUSED = 0x00000004
+    STATE_SYSTEM_PRESSED = 0x00000008
+    STATE_SYSTEM_CHECKED = 0x00000010
+    STATE_SYSTEM_MIXED = 0x00000020
+    STATE_SYSTEM_READONLY = 0x00000040
+    STATE_SYSTEM_HOTTRACKED = 0x00000080
+    STATE_SYSTEM_DEFAULT = 0x00000100
+    STATE_SYSTEM_EXPANDED = 0x00000200
+    STATE_SYSTEM_COLLAPSED = 0x00000400
+    STATE_SYSTEM_BUSY = 0x00000800
+    STATE_SYSTEM_FLOATING = 0x00001000
+    STATE_SYSTEM_MARQUEED = 0x00002000
+    STATE_SYSTEM_ANIMATED = 0x00004000
+    STATE_SYSTEM_INVISIBLE = 0x00008000
+    STATE_SYSTEM_OFFSCREEN = 0x00010000
+    STATE_SYSTEM_SIZEABLE = 0x00020000
+    STATE_SYSTEM_MOVEABLE = 0x00040000
+    STATE_SYSTEM_SELFVOICING = 0x00080000
+    STATE_SYSTEM_FOCUSABLE = 0x00100000
+    STATE_SYSTEM_SELECTABLE = 0x00200000
+    STATE_SYSTEM_LINKED = 0x00400000
+    STATE_SYSTEM_TRAVERSED = 0x00800000
+    STATE_SYSTEM_MULTISELECTABLE = 0x01000000
+    STATE_SYSTEM_EXTSELECTABLE = 0x02000000
+    STATE_SYSTEM_ALERT_LOW = 0x04000000
+    STATE_SYSTEM_ALERT_MEDIUM = 0x08000000
+    STATE_SYSTEM_ALERT_HIGH = 0x10000000
+    STATE_SYSTEM_PROTECTED = 0x20000000
+    STATE_SYSTEM_HASPOPUP = 0x40000000
+
+
+class Ia2State(enum.IntFlag):
+    IA2_STATE_ACTIVE = ia2_mod.IA2_STATE_ACTIVE
+    IA2_STATE_ARMED = ia2_mod.IA2_STATE_ARMED
+    IA2_STATE_CHECKABLE = ia2_mod.IA2_STATE_CHECKABLE
+    IA2_STATE_DEFUNCT = ia2_mod.IA2_STATE_DEFUNCT
+    IA2_STATE_EDITABLE = ia2_mod.IA2_STATE_EDITABLE
+    IA2_STATE_HORIZONTAL = ia2_mod.IA2_STATE_HORIZONTAL
+    IA2_STATE_ICONIFIED = ia2_mod.IA2_STATE_ICONIFIED
+    IA2_STATE_INVALID_ENTRY = ia2_mod.IA2_STATE_INVALID_ENTRY
+    IA2_STATE_MANAGES_DESCENDANTS = ia2_mod.IA2_STATE_MANAGES_DESCENDANTS
+    IA2_STATE_MODAL = ia2_mod.IA2_STATE_MODAL
+    IA2_STATE_MULTI_LINE = ia2_mod.IA2_STATE_MULTI_LINE
+    IA2_STATE_OPAQUE = ia2_mod.IA2_STATE_OPAQUE
+    IA2_STATE_PINNED = ia2_mod.IA2_STATE_PINNED
+    IA2_STATE_REQUIRED = ia2_mod.IA2_STATE_REQUIRED
+    IA2_STATE_SELECTABLE_TEXT = ia2_mod.IA2_STATE_SELECTABLE_TEXT
+    IA2_STATE_SINGLE_LINE = ia2_mod.IA2_STATE_SINGLE_LINE
+    IA2_STATE_STALE = ia2_mod.IA2_STATE_STALE
+    IA2_STATE_SUPPORTS_AUTOCOMPLETION = ia2_mod.IA2_STATE_SUPPORTS_AUTOCOMPLETION
+    IA2_STATE_TRANSIENT = ia2_mod.IA2_STATE_TRANSIENT
+    IA2_STATE_VERTICAL = ia2_mod.IA2_STATE_VERTICAL
+
 
 def get_msaa_state_list(states):
     state_strings = []
-    if states & STATE_SYSTEM_ALERT_HIGH:
-        state_strings.append("ALERT_HIGH")
-    if states & STATE_SYSTEM_ALERT_MEDIUM:
-        state_strings.append("ALERT_MEDIUM")
-    if states & STATE_SYSTEM_ALERT_LOW:
-        state_strings.append("ALERT_LOW")
-    if states & STATE_SYSTEM_ANIMATED:
-        state_strings.append("ANIMATED")
-    if states & STATE_SYSTEM_BUSY:
-        state_strings.append("BUSY")
-    if states & STATE_SYSTEM_CHECKED:
-        state_strings.append("CHECKED")
-    if states & STATE_SYSTEM_COLLAPSED:
-        state_strings.append("COLLAPSED")
-    if states & STATE_SYSTEM_DEFAULT:
-        state_strings.append("DEFAULT")
-    if states & STATE_SYSTEM_EXPANDED:
-        state_strings.append("EXPANDED")
-    if states & STATE_SYSTEM_EXTSELECTABLE:
-        state_strings.append("EXTSELECTABLE")
-    if states & STATE_SYSTEM_FLOATING:
-        state_strings.append("FLOATING")
-    if states & STATE_SYSTEM_FOCUSABLE:
-        state_strings.append("FOCUSABLE")
-    if states & STATE_SYSTEM_FOCUSED:
-        state_strings.append("FOCUSED")
-    if states & STATE_SYSTEM_HASPOPUP:
-        state_strings.append("HASPOPUP")
-    if states & STATE_SYSTEM_HOTTRACKED:
-        state_strings.append("HOTTRACKED")
-    if states & STATE_SYSTEM_INVISIBLE:
-        state_strings.append("INVISIBLE")
-    if states & STATE_SYSTEM_LINKED:
-        state_strings.append("LINKED")
-    if states & STATE_SYSTEM_MARQUEED:
-        state_strings.append("MARQUEED")
-    if states & STATE_SYSTEM_MIXED:
-        state_strings.append("MIXED")
-    if states & STATE_SYSTEM_MOVEABLE:
-        state_strings.append("MOVEABLE")
-    if states & STATE_SYSTEM_MULTISELECTABLE:
-        state_strings.append("MULTISELECTABLE")
-    if states & STATE_SYSTEM_OFFSCREEN:
-        state_strings.append("OFFSCREEN")
-    if states & STATE_SYSTEM_PRESSED:
-        state_strings.append("PRESSED")
-    if states & STATE_SYSTEM_PROTECTED:
-        state_strings.append("PROTECTED")
-    if states & STATE_SYSTEM_READONLY:
-        state_strings.append("READONLY")
-    if states & STATE_SYSTEM_SELECTABLE:
-        state_strings.append("SELECTABLE")
-    if states & STATE_SYSTEM_SELECTED:
-        state_strings.append("SELECTED")
-    if states & STATE_SYSTEM_SELFVOICING:
-        state_strings.append("SELFVOICING")
-    if states & STATE_SYSTEM_SIZEABLE:
-        state_strings.append("SIZEABLE")
-    if states & STATE_SYSTEM_TRAVERSED:
-        state_strings.append("TRAVERSED")
-    if states & STATE_SYSTEM_UNAVAILABLE:
-        state_strings.append("UNAVAILABLE")
-
+    for state in MsaaState:
+        if states & state:
+            state_strings.append(state.name.replace("STATE_SYSTEM_", ""))
     return state_strings
 
 def get_state_list(states):
     state_strings = []
-    if states & IA2_STATE_ACTIVE:  # noqa: F821
-        state_strings.append("ACTIVE")
-    if states & IA2_STATE_ARMED:  # noqa: F821
-        state_strings.append("ARMED")
-    if states & IA2_STATE_CHECKABLE:  # noqa: F821
-        state_strings.append("CHECKABLE")
-    if states & IA2_STATE_DEFUNCT:  # noqa: F821
-        state_strings.append("DEFUNCT")
-    if states & IA2_STATE_EDITABLE:  # noqa: F821
-        state_strings.append("EDITABLE")
-    if states & IA2_STATE_HORIZONTAL:  # noqa: F821
-        state_strings.append("HORIZONTAL")
-    if states & IA2_STATE_ICONIFIED:  # noqa: F821
-        state_strings.append("ICONIFIED")
-    if states & IA2_STATE_INVALID_ENTRY:  # noqa: F821
-        state_strings.append("INVALID_ENTRY")
-    if states & IA2_STATE_MANAGES_DESCENDANTS:  # noqa: F821
-        state_strings.append("MANAGES_DESCENDANTS")
-    if states & IA2_STATE_MODAL:  # noqa: F821
-        state_strings.append("MODAL")
-    if states & IA2_STATE_MULTI_LINE:  # noqa: F821
-        state_strings.append("MULTI_LINE")
-    if states & IA2_STATE_OPAQUE:  # noqa: F821
-        state_strings.append("OPAQUE")
-    if states & IA2_STATE_PINNED:  # noqa: F821
-        state_strings.append("PINNED")
-    if states & IA2_STATE_REQUIRED:  # noqa: F821
-        state_strings.append("REQUIRED")
-    if states & IA2_STATE_SELECTABLE_TEXT:  # noqa: F821
-        state_strings.append("SELECTABLE_TEXT")
-    if states & IA2_STATE_SINGLE_LINE:  # noqa: F821
-        state_strings.append("SINGLE_LINE")
-    if states & IA2_STATE_STALE:  # noqa: F821
-        state_strings.append("STALE")
-    if states & IA2_STATE_SUPPORTS_AUTOCOMPLETION:  # noqa: F821
-        state_strings.append("SUPPORTS_AUTOCOMPLETION")
-    if states & IA2_STATE_TRANSIENT:  # noqa: F821
-        state_strings.append("TRANSIENT")
-    if states & IA2_STATE_VERTICAL:  # noqa: F821
-        state_strings.append("VERTICAL")
-
+    for state in Ia2State:
+        if states & state:
+            state_strings.append(state.name.replace("IA2_STATE_", ""))
     return state_strings

From 1956d25f49842259aa2282ee961ffe3d0424f420 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Tue, 9 Dec 2025 12:46:26 -0500
Subject: [PATCH 31/38] Fix Flake8 errors

---
 tools/wptrunner/wptrunner/executors/executorwebdriver.py        | 2 +-
 .../platformaccessibility/executorwindowsaccessibility.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/wptrunner/wptrunner/executors/executorwebdriver.py b/tools/wptrunner/wptrunner/executors/executorwebdriver.py
index aa429a16201e91..92c696c13fda0f 100644
--- a/tools/wptrunner/wptrunner/executors/executorwebdriver.py
+++ b/tools/wptrunner/wptrunner/executors/executorwebdriver.py
@@ -54,7 +54,7 @@
 
 from .executorplatformaccessibility import PlatformAccessibilityProtocolPart
 
-from typing import Any, List, Dict, Optional, Tuple
+from typing import Any, List, Dict, Optional
 from webdriver.client import Session
 from webdriver import error as webdriver_error
 from webdriver.bidi import error as webdriver_bidi_error
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
index 85ad0756eda6b3..92d09634fb4b3c 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
@@ -1,6 +1,6 @@
 # mypy: allow-untyped-defs
 
-from ..platformaccessibility.ia2.constants import ( # type: ignore[attr-defined]
+from ..platformaccessibility.ia2.constants import (  # type: ignore[attr-defined]
     IAccessible2,
     Role,
     get_msaa_state_list,

From 0b42a6831767f9dc49f9edc754c470ce27999b23 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Fri, 5 Dec 2025 15:41:06 -0800
Subject: [PATCH 32/38] Throw custom error when
 --enable-platform-accessibility=false

---
 tools/wptrunner/wptrunner/executors/base.py               | 6 ++++++
 .../wptrunner/executors/executorplatformaccessibility.py  | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tools/wptrunner/wptrunner/executors/base.py b/tools/wptrunner/wptrunner/executors/base.py
index dd10aca589c72f..83e3f8b058f43a 100644
--- a/tools/wptrunner/wptrunner/executors/base.py
+++ b/tools/wptrunner/wptrunner/executors/base.py
@@ -771,6 +771,9 @@ def _run(self):
             self.result_flag.set()
 
 
+class PlatformAccessibilityNotEnabled(Exception):
+    pass
+
 class CallbackHandler:
     """Handle callbacks from testdriver-using tests.
 
@@ -830,6 +833,9 @@ def process_action(self, url, payload):
         except self.unimplemented_exc:
             self.logger.warning("Action %s not implemented" % action)
             self._send_message(cmd_id, "complete", "error", f"Action {action} not implemented")
+        except PlatformAccessibilityNotEnabled as e:
+            self.logger.warning(f"Action {action} failed because platform accessibility testing was not enabled or implemented. Try --enable-platform-accessibility", exc_info=True)
+            self._send_message(cmd_id, "complete", "error", f"Action {action} failed, platform accessibliity testing not enabled.")
         except self.expected_exc as e:
             self.logger.debug(f"Action {action} failed with an expected exception", exc_info=True)
             self._send_message(cmd_id, "complete", "error", f"Action {action} failed: {e!s}")
diff --git a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
index fc9cfc6a68fe5a..8b9b2240ef4047 100644
--- a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
@@ -1,5 +1,7 @@
 # mypy: allow-untyped-defs
 
+from .base import PlatformAccessibilityNotEnabled
+
 from .protocol import ProtocolPart
 
 from sys import platform
@@ -22,7 +24,6 @@ def setup(self):
         self.impl = None
         self.__init_platform_executor()
 
-
     def __init_platform_executor(self):
         if platform == "linux":
             try:
@@ -61,11 +62,10 @@ def test_accessibility_api(self, dom_id, test, api, url):
         if not valid_api_for_platform(api):
             return ""
 
-        # self.impl will not exist if --enable-accessibility-api was not included
+        # self.impl will not exist ifo --enable-accessibility-api was not included
         # or the necessary python requirements for accessibility API tests have not
         # been installed.
         if not self.impl:
-            subtests = len(test) if test else 1
-            return ["Accessibility API testing not enabled."] * subtests
+            raise PlatformAccessibilityNotEnabled()
 
         return self.impl.test_accessibility_api(dom_id, test, api, url)

From 0ce50596ed14d82214048dba030cff6b3e6fc065 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Tue, 9 Dec 2025 17:52:57 -0500
Subject: [PATCH 33/38] Flake8

---
 tools/wptrunner/wptrunner/executors/base.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/wptrunner/wptrunner/executors/base.py b/tools/wptrunner/wptrunner/executors/base.py
index 83e3f8b058f43a..870985295c2628 100644
--- a/tools/wptrunner/wptrunner/executors/base.py
+++ b/tools/wptrunner/wptrunner/executors/base.py
@@ -833,8 +833,11 @@ def process_action(self, url, payload):
         except self.unimplemented_exc:
             self.logger.warning("Action %s not implemented" % action)
             self._send_message(cmd_id, "complete", "error", f"Action {action} not implemented")
-        except PlatformAccessibilityNotEnabled as e:
-            self.logger.warning(f"Action {action} failed because platform accessibility testing was not enabled or implemented. Try --enable-platform-accessibility", exc_info=True)
+        except PlatformAccessibilityNotEnabled:
+            self.logger.warning(
+                f"Action {action} failed: platform accessibility testing is not enabled. Try --enable-platform-accessibility",
+                exc_info=True
+            )
             self._send_message(cmd_id, "complete", "error", f"Action {action} failed, platform accessibliity testing not enabled.")
         except self.expected_exc as e:
             self.logger.debug(f"Action {action} failed with an expected exception", exc_info=True)

From 7764da5c17dc3ba0d8b999eac87c75b91ceeead9 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Tue, 9 Dec 2025 18:12:25 -0500
Subject: [PATCH 34/38] Add type hints to new files

---
 .../platformaccessibility/executoratspi.py    | 75 ++++++++++---------
 .../platformaccessibility/executoraxapi.py    | 18 +++--
 2 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
index 0c1fc068fe587c..8f898e2be4e38b 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
@@ -1,12 +1,15 @@
-# mypy: allow-untyped-defs
+from __future__ import annotations
 
-import gi
+import time
+from typing import Optional, List, Dict, Any
 
+import gi
 gi.require_version("Atspi", "2.0")
 from gi.repository import Atspi
-import time
 
-def poll_for_tab(root, product, url):
+from mozlog.structuredlog import StructuredLogger
+
+def poll_for_tab(root: Atspi.Accessible, product: str, url: str) -> Atspi.Accessible:
     """Poll until the tab with the test url is loaded and available in the
        accessibility API. Assumes wptrunner has already started a browser
        process and navigated to the test page.
@@ -25,7 +28,7 @@ def poll_for_tab(root, product, url):
     return tab
 
 
-def find_tab(root, product, url):
+def find_tab(root: Atspi.Accessible, product: str, url: str) -> Optional[Atspi.Accessible]:
     """Find the tab with the test url.
 
     :param root: The node in the accessibility API representing the browser process.
@@ -55,7 +58,7 @@ def find_tab(root, product, url):
     return None
 
 
-def is_ready(tab, product, url):
+def is_ready(tab: Atspi.Accessible, product: str, url: str) -> bool:
     """Test whether tab is fully loaded.
 
     :param tab: Atspi.Accessible representing test document.
@@ -77,7 +80,7 @@ def is_ready(tab, product, url):
     return "URI" in document_attributes and document_attributes["URI"] == url
 
 
-def find_browser(name):
+def find_browser(name: str) -> Optional[Atspi.Accessible]:
     """Find the Atspi.Accessible representing the browser.
 
     :param name: The name of the browser.
@@ -94,7 +97,7 @@ def find_browser(name):
     return None
 
 
-def find_node(root, dom_id):
+def find_node(root: Atspi.Accessible, dom_id: str) -> Optional[TestNode]:
     """Find the Atspi.Accessible with a specified dom_id.
 
     :dom_id: The dom ID.
@@ -115,9 +118,8 @@ def find_node(root, dom_id):
 
     return None
 
-
 class AtspiExecutorImpl:
-    def setup(self, product_name, logger):
+    def setup(self, product_name: str, logger: StructuredLogger) -> None:
         """Setup for accessibility API testing.
 
         :product_name: The name of the browser, used to find the browser in the accessibility API.
@@ -125,9 +127,9 @@ def setup(self, product_name, logger):
         """
         self.logger = logger
         self.product_name = product_name
-        self.root = None
-        self.document = None
-        self.test_url = None
+        self.root: Optional[Atspi.Accessible] = None
+        self.document: Optional[Atspi.Accessible] = None
+        self.test_url: Optional[str] = None
 
         self.root = find_browser(self.product_name)
         if not self.root:
@@ -135,7 +137,7 @@ def setup(self, product_name, logger):
                 f"Couldn't find browser {self.product_name} in accessibility API ATSPI. Accessibility API queries will not succeeded."
             )
 
-    def __poll_for_tab_if_necessary(self, url):
+    def __poll_for_tab_if_necessary(self, url: str) -> None:
         """If accessible node representing the test document for this URL has
            not been found, find it and set self.document.
 
@@ -150,7 +152,7 @@ def __poll_for_tab_if_necessary(self, url):
             self.test_url = url
             self.document = poll_for_tab(self.root, self.product_name, url)
 
-    def test_accessibility_api(self, dom_id, test, api, url):
+    def test_accessibility_api(self, dom_id: str, test: List[List[str]], api: str, url: str) -> List[str]:
         """Execute a test of the accessibility API.
 
         :param dom_id: The dom id of the node to test.
@@ -180,18 +182,18 @@ def test_accessibility_api(self, dom_id, test, api, url):
 class TestNode:
     """Wrapper around an Atspi Node for testing purposes"""
 
-    def __init__(self, document, dom_id, node):
+    def __init__(self, document: Atspi.Accessible, dom_id: str, node: Atspi.Accessible) -> None:
         self.document = document
         self.dom_id = dom_id
         self.node = node
 
-    def serialize(self):
+    def serialize(self) -> Dict[str, Any]:
         """Convert the node to a dictionary for printing/debugging.
 
         :returns: A dictionary representing the node.
         """
 
-        node_dictionary = {}
+        node_dictionary: Dict[str, Any] = {}
         node_dictionary["API"] = "atspi"
         node_dictionary["role"] = Atspi.Accessible.get_role_name(self.node)
         node_dictionary["name"] = Atspi.Accessible.get_name(self.node)
@@ -204,7 +206,7 @@ def serialize(self):
 
         return node_dictionary
 
-    def run_test_statement(self, statement):
+    def run_test_statement(self, statement: TestStatement) -> str:
         """Run a single test statement.
 
         :statement: a TestStatement object
@@ -222,7 +224,7 @@ def run_test_statement(self, statement):
 
         return "Error: not implemented ({statement.type})"
 
-    def run_property_test(self, statement):
+    def run_property_test(self, statement: TestStatement) -> str:
         """Run a single test statement with type "property".
 
         :statement: a TestStatement object
@@ -243,7 +245,7 @@ def run_property_test(self, statement):
 
         return f"Fail: not implemented ({statement.key})"
 
-    def run_relation_test(self, statement):
+    def run_relation_test(self, statement: TestStatement) -> str:
         """Run a single test statement with type "relation".
 
         :statement: a TestStatement object
@@ -255,13 +257,14 @@ def run_relation_test(self, statement):
         relations_dict = self.get_relations_dictionary()
         if expected_relation not in relations_dict:
             return f"Fail: relation not in list: {list(relations_dict.keys())}"
-        id_str = ",".join(relations_dict[expected_relation].sort())
-        expected_id_str = ",".join(expected_ids.sort())
+
+        id_str = ",".join(relations_dict[expected_relation])
+        expected_id_str = ",".join(expected_ids)
         if id_str != expected_id_str:
             return f"Fail: {expected_relation}={relations_dict[expected_relation]}"
         return "Pass"
 
-    def run_reverse_relation_test(self, statement):
+    def run_reverse_relation_test(self, statement: TestStatement) -> str:
         """Run a single test statement with type "reverseRelation".
 
         :statement: a TestStatement object
@@ -275,6 +278,9 @@ def run_reverse_relation_test(self, statement):
 
         for element in expected_elements:
             test_node = find_node(self.document, element)
+            if not test_node:
+                return "Fail: element '{element}' could not be found"
+
             relations_dict = test_node.get_relations_dictionary()
 
             if expected_relation not in relations_dict:
@@ -285,11 +291,11 @@ def run_reverse_relation_test(self, statement):
 
         return "Pass"
 
-    def get_relations_dictionary(self):
+    def get_relations_dictionary(self) -> Dict[str, List[str]]:
         """
         :returns: A dictionary with relations as keys and the values, DOM ids.
         """
-        relations_dict = {}
+        relations_dict: Dict[str, List[str]] = {}
         relations = Atspi.Accessible.get_relation_set(self.node)
         for relation in relations:
             name = relation.get_relation_type().value_name.removeprefix("ATSPI_")
@@ -303,9 +309,10 @@ def get_relations_dictionary(self):
                     relations_dict[name].append(attributes["id"])
                 else:
                     relations_dict[name].append("[unknown id]")
+
         return relations_dict
 
-    def get_state_list(self):
+    def get_state_list(self) -> List[str]:
         """
         :returns: A list of states for this Atspi.Accessible.
         """
@@ -319,15 +326,15 @@ def get_state_list(self):
 class TestStatement:
     """Wrapper around an accessibility API test statement"""
 
-    def __init__(self, test_statement_arr):
+    def __init__(self, test_statement_arr: List[str]) -> None:
         self.test_statement_arr = test_statement_arr
 
-        self.type = test_statement_arr[0]
-        self.key = test_statement_arr[1]
-        self.assertion = test_statement_arr[2]
-        self.value = test_statement_arr[3]
+        self.type: str = test_statement_arr[0]
+        self.key: str = test_statement_arr[1]
+        self.assertion: str = test_statement_arr[2]
+        self.value: Any = test_statement_arr[3]
 
-    def value_compare_with(self, value):
+    def value_compare_with(self, value: str) -> str:
         if self.assertion == "is":
             if self.value != value:
                 return f"Fail: {self.key} is {value}"
@@ -339,7 +346,7 @@ def value_compare_with(self, value):
 
         return "Pass"
 
-    def value_contained_or_not_contained_in(self, array):
+    def value_contained_or_not_contained_in(self, array: List[str]) -> str:
         if self.assertion == "contains":
             if self.value not in array:
                 return f"Fail: {array} does not contain {self.value}"
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
index ff9f7226d10fba..ef0f34f4b97d45 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
@@ -1,4 +1,4 @@
-# mypy: allow-untyped-defs
+from typing import Optional, List, Dict, Any
 
 from ApplicationServices import (
     AXUIElementCopyAttributeNames,
@@ -12,7 +12,9 @@
     NSWorkspace,
 )
 
-def find_browser(name):
+from mozlog.structuredlog import StructuredLogger
+
+def find_browser(name: str) -> Optional[Any]:
     """Find the AXUIElement representing the browser.
 
     :param name: The name of the browser.
@@ -39,7 +41,7 @@ def find_browser(name):
     return AXUIElementCreateApplication(pid)
 
 
-def find_active_tab(browser):
+def find_active_tab(browser: Any) -> Optional[Any]:
     """Find the active tab of the browser.
 
     :param browser: The name of the browser.
@@ -64,7 +66,7 @@ def find_active_tab(browser):
     return None
 
 
-def find_node(root, attribute, expected_value):
+def find_node(root: Any, attribute: str, expected_value: str) -> Optional[Any]:
     """Find the AXUIElement with a specified dom_id.
 
     :dom_id: The dom ID.
@@ -92,7 +94,7 @@ def find_node(root, attribute, expected_value):
     return None
 
 
-def serialize_node(node):
+def serialize_node(node: Any) -> Dict[str, Any]:
     """Convert the node to a dictionary for printing/debugging.
 
     :returns: A dictionary representing the node.
@@ -110,7 +112,7 @@ def serialize_node(node):
 
 
 class AXAPIExecutorImpl:
-    def setup(self, product_name, logger):
+    def setup(self, product_name: str, logger: StructuredLogger) -> None:
         """Setup for accessibility API testing.
 
         :product_name: The name of the browser, used to find the browser in the accessibility API.
@@ -118,14 +120,14 @@ def setup(self, product_name, logger):
         """
         self.product_name = product_name
         self.logger = logger
-        self.root = find_browser(self.product_name)
+        self.root: Optional[Any] = find_browser(self.product_name)
 
         if not self.root:
             self.logger.warning(
                 f"Couldn't find browser {self.product_name} in accessibility API AX API. Accessibility API queries will not succeeded."
             )
 
-    def test_accessibility_api(self, dom_id, test, api, url):
+    def test_accessibility_api(self, dom_id: str, test: List[List[str]], api: str, url: str) -> List[str]:
         """Execute a test of the accessibility API.
 
         :param dom_id: The dom id of the node to test.

From 048e6fb7c112b30c9e862b1c14668325adbe8e16 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Wed, 21 Jan 2026 15:36:56 -0800
Subject: [PATCH 35/38] Add type hints to executorplatformaccessibility and
 executorwindowsaccessibility

---
 .../executorplatformaccessibility.py          | 27 ++++++---
 .../executorwindowsaccessibility.py           | 60 +++++++++++--------
 2 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
index 8b9b2240ef4047..ba96cabd1cb15a 100644
--- a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
@@ -1,12 +1,21 @@
-# mypy: allow-untyped-defs
+from __future__ import annotations
 
-from .base import PlatformAccessibilityNotEnabled
+from sys import platform
+from typing import List, Optional, Protocol, Union
 
+from mozlog.structuredlog import StructuredLogger
+
+from .base import PlatformAccessibilityNotEnabled
 from .protocol import ProtocolPart
 
-from sys import platform
 
-def valid_api_for_platform(api):
+class PlatformAccessibilityExecutorImpl(Protocol):
+    """Protocol defining the interface for platform accessibility executors."""
+    def setup(self, product_name: str, logger: StructuredLogger) -> None: ...
+    def test_accessibility_api(self, dom_id: str, test: List[List[str]], api: str, url: str) -> List[str]: ...
+
+
+def valid_api_for_platform(api: str) -> bool:
     if platform == "linux" and api == "Atspi":
         return True
     if platform == "darwin" and api == "AXAPI":
@@ -19,12 +28,12 @@ class PlatformAccessibilityProtocolPart(ProtocolPart):
     """Protocol part for platform accessibility introspection"""
     name = "platform_accessibility"
 
-    def setup(self):
-        self.product_name = self.parent.product_name
-        self.impl = None
+    def setup(self) -> None:
+        self.product_name: str = self.parent.product_name
+        self.impl: Optional[PlatformAccessibilityExecutorImpl] = None
         self.__init_platform_executor()
 
-    def __init_platform_executor(self):
+    def __init_platform_executor(self) -> None:
         if platform == "linux":
             try:
                 from .platformaccessibility.executoratspi import AtspiExecutorImpl
@@ -55,7 +64,7 @@ def __init_platform_executor(self):
             self.impl = WindowsAccessibilityExecutorImpl()
             self.impl.setup(self.product_name, self.logger)
 
-    def test_accessibility_api(self, dom_id, test, api, url):
+    def test_accessibility_api(self, dom_id: str, test: List[List[str]], api: str, url: str) -> Union[str, List[str]]:
         # Tests will pass if they are not applicable for a platform,
         # for example, Windows API tests passed to Linux. Ideally, this will
         # be fixed with a "not applicable".
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
index 92d09634fb4b3c..d84f4b87107271 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
@@ -1,21 +1,29 @@
-# mypy: allow-untyped-defs
-
-from ..platformaccessibility.ia2.constants import (  # type: ignore[attr-defined]
-    IAccessible2,
-    Role,
-    get_msaa_state_list,
-    get_state_list,
-)
+from __future__ import annotations
 
 import time
+from typing import Any, Dict, List, Optional
 
 import ctypes
 from ctypes import POINTER, byref
 from ctypes.wintypes import BOOL, HWND, LPARAM
 
+# Type aliases for COM interface pointers.
+# These are dynamically generated by comtypes at runtime.
+IAccessiblePtr = Any
+IAccessible2Ptr = Any
+
 import comtypes.client
 from comtypes import IServiceProvider
 
+from mozlog.structuredlog import StructuredLogger
+
+from ..platformaccessibility.ia2.constants import (  # type: ignore[attr-defined]
+    IAccessible2,
+    Role,
+    get_msaa_state_list,
+    get_state_list,
+)
+
 CHILDID_SELF = 0
 OBJID_CLIENT = -4
 
@@ -32,7 +40,7 @@
 )
 
 
-def accessible_object_from_window(hwnd):
+def accessible_object_from_window(hwnd: HWND) -> IAccessiblePtr:
     p = POINTER(IAccessible)()
     oleacc.AccessibleObjectFromWindow(
         hwnd, OBJID_CLIENT, byref(IAccessible._iid_), byref(p)
@@ -40,18 +48,18 @@ def accessible_object_from_window(hwnd):
     return p
 
 
-def name_from_hwnd(hwnd):
+def name_from_hwnd(hwnd: HWND) -> str:
     MAX_CHARS = 257
     buffer = ctypes.create_unicode_buffer(MAX_CHARS)
     user32.GetWindowTextW(hwnd, buffer, MAX_CHARS)
     return buffer.value
 
 
-def get_browser_hwnd(product_name):
-    found = []
+def get_browser_hwnd(product_name: str) -> HWND:
+    found: List[HWND] = []
 
-    @ctypes.WINFUNCTYPE(BOOL, HWND, LPARAM)
-    def check_window_name(hwnd, lParam):  # noqa: N803
+    @ctypes.WINFUNCTYPE(BOOL, HWND, LPARAM)  # type: ignore[attr-defined, misc]
+    def check_window_name(hwnd: HWND, lParam: LPARAM) -> bool:  # noqa: N803
         window_name = name_from_hwnd(hwnd)
         if product_name not in window_name.lower():
             # EnumWindows should continue enumerating
@@ -66,18 +74,18 @@ def check_window_name(hwnd, lParam):  # noqa: N803
     return found[0]
 
 
-def to_ia2(node):
+def to_ia2(node: IAccessiblePtr) -> IAccessible2Ptr:
     service = node.QueryInterface(IServiceProvider)
     return service.QueryService(IAccessible2._iid_, IAccessible2)
 
 
-def find_browser(product_name):
+def find_browser(product_name: str) -> IAccessible2Ptr:
     hwnd = get_browser_hwnd(product_name)
     root = accessible_object_from_window(hwnd)
     return to_ia2(root)
 
 
-def poll_for_tab(url, root):
+def poll_for_tab(url: str, root: IAccessible2Ptr) -> IAccessible2Ptr:
     tab = find_tab(url, root)
     while not tab:
         time.sleep(0.01)
@@ -85,20 +93,21 @@ def poll_for_tab(url, root):
     return tab
 
 
-def find_tab(url, root):
+def find_tab(url: str, root: IAccessible2Ptr) -> Optional[IAccessible2Ptr]:
     for i in range(1, root.accChildCount + 1):
         child = to_ia2(root.accChild(i))
         if child.accRole(CHILDID_SELF) == Role.ROLE_SYSTEM_DOCUMENT:
             if child.accValue(CHILDID_SELF) == url:
                 return child
             # No need to search within documents.
-            return
+            return None
         descendant = find_tab(url, child)
         if descendant:
             return descendant
+    return None
 
 
-def find_ia2_node(root, id):
+def find_ia2_node(root: IAccessible2Ptr, id: str) -> Optional[IAccessible2Ptr]:
     id_attribute = f"id:{id};"
     for i in range(1, root.accChildCount + 1):
         child = to_ia2(root.accChild(i))
@@ -107,10 +116,11 @@ def find_ia2_node(root, id):
         descendant = find_ia2_node(child, id)
         if descendant:
             return descendant
+    return None
 
 
-def serialize_node(node):
-    node_dictionary = {}
+def serialize_node(node: IAccessible2Ptr) -> Dict[str, Any]:
+    node_dictionary: Dict[str, Any] = {}
     node_dictionary["API"] = "windows"
 
     # MSAA properties
@@ -126,11 +136,11 @@ def serialize_node(node):
 
 
 class WindowsAccessibilityExecutorImpl:
-    def setup(self, product_name, logger):
+    def setup(self, product_name: str, logger: StructuredLogger) -> None:
         self.product_name = product_name
         self.logger = logger
 
-    def test_accessibility_api(self, dom_id, test, api, url):
+    def test_accessibility_api(self, dom_id: str, test: List[List[str]], api: str, url: str) -> List[str]:
         """Execute a test of the accessibility API.
 
         :param dom_id: The dom id of the node to test.
@@ -150,7 +160,7 @@ def test_accessibility_api(self, dom_id, test, api, url):
             f"Found node with id {dom_id} in accessibility API IA2: {serialize_node(node)}"
         )
 
-        results = []
+        results: List[str] = []
         for test_statement in test:
             results.append("Fail: Test not implemented.")
 

From db32153472f5959e941b7b0a2745cbd2dad43d00 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Wed, 21 Jan 2026 15:38:22 -0800
Subject: [PATCH 36/38] black formatting

---
 .../executorplatformaccessibility.py          | 27 ++++++++++++++-----
 .../platformaccessibility/executoratspi.py    | 15 ++++++++---
 .../platformaccessibility/executoraxapi.py    |  5 +++-
 .../executorwindowsaccessibility.py           |  4 ++-
 4 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
index ba96cabd1cb15a..5834e5b926c22e 100644
--- a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
@@ -11,8 +11,11 @@
 
 class PlatformAccessibilityExecutorImpl(Protocol):
     """Protocol defining the interface for platform accessibility executors."""
+
     def setup(self, product_name: str, logger: StructuredLogger) -> None: ...
-    def test_accessibility_api(self, dom_id: str, test: List[List[str]], api: str, url: str) -> List[str]: ...
+    def test_accessibility_api(
+        self, dom_id: str, test: List[List[str]], api: str, url: str
+    ) -> List[str]: ...
 
 
 def valid_api_for_platform(api: str) -> bool:
@@ -24,8 +27,10 @@ def valid_api_for_platform(api: str) -> bool:
         return True
     return False
 
+
 class PlatformAccessibilityProtocolPart(ProtocolPart):
     """Protocol part for platform accessibility introspection"""
+
     name = "platform_accessibility"
 
     def setup(self) -> None:
@@ -38,7 +43,9 @@ def __init_platform_executor(self) -> None:
             try:
                 from .platformaccessibility.executoratspi import AtspiExecutorImpl
             except ModuleNotFoundError:
-                self.logger.warning("Accessibility API testing was not enabled, accessibility API tests will fail.")
+                self.logger.warning(
+                    "Accessibility API testing was not enabled, accessibility API tests will fail."
+                )
                 return
 
             self.impl = AtspiExecutorImpl()
@@ -48,7 +55,9 @@ def __init_platform_executor(self) -> None:
             try:
                 from .platformaccessibility.executoraxapi import AXAPIExecutorImpl
             except ModuleNotFoundError:
-                self.logger.warning("Accessibility API testing was not enabled, accessibility API tests will fail.")
+                self.logger.warning(
+                    "Accessibility API testing was not enabled, accessibility API tests will fail."
+                )
                 return
 
             self.impl = AXAPIExecutorImpl()
@@ -56,15 +65,21 @@ def __init_platform_executor(self) -> None:
 
         if platform == "win32":
             try:
-                from .platformaccessibility.executorwindowsaccessibility import WindowsAccessibilityExecutorImpl
+                from .platformaccessibility.executorwindowsaccessibility import (
+                    WindowsAccessibilityExecutorImpl,
+                )
             except ModuleNotFoundError:
-                self.logger.warning("Accessibility API testing was not enabled, accessibility API tests will fail.")
+                self.logger.warning(
+                    "Accessibility API testing was not enabled, accessibility API tests will fail."
+                )
                 return
 
             self.impl = WindowsAccessibilityExecutorImpl()
             self.impl.setup(self.product_name, self.logger)
 
-    def test_accessibility_api(self, dom_id: str, test: List[List[str]], api: str, url: str) -> Union[str, List[str]]:
+    def test_accessibility_api(
+        self, dom_id: str, test: List[List[str]], api: str, url: str
+    ) -> Union[str, List[str]]:
         # Tests will pass if they are not applicable for a platform,
         # for example, Windows API tests passed to Linux. Ideally, this will
         # be fixed with a "not applicable".
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
index 8f898e2be4e38b..080d6204f893e6 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoratspi.py
@@ -4,11 +4,13 @@
 from typing import Optional, List, Dict, Any
 
 import gi
+
 gi.require_version("Atspi", "2.0")
 from gi.repository import Atspi
 
 from mozlog.structuredlog import StructuredLogger
 
+
 def poll_for_tab(root: Atspi.Accessible, product: str, url: str) -> Atspi.Accessible:
     """Poll until the tab with the test url is loaded and available in the
        accessibility API. Assumes wptrunner has already started a browser
@@ -28,7 +30,9 @@ def poll_for_tab(root: Atspi.Accessible, product: str, url: str) -> Atspi.Access
     return tab
 
 
-def find_tab(root: Atspi.Accessible, product: str, url: str) -> Optional[Atspi.Accessible]:
+def find_tab(
+    root: Atspi.Accessible, product: str, url: str
+) -> Optional[Atspi.Accessible]:
     """Find the tab with the test url.
 
     :param root: The node in the accessibility API representing the browser process.
@@ -118,6 +122,7 @@ def find_node(root: Atspi.Accessible, dom_id: str) -> Optional[TestNode]:
 
     return None
 
+
 class AtspiExecutorImpl:
     def setup(self, product_name: str, logger: StructuredLogger) -> None:
         """Setup for accessibility API testing.
@@ -152,7 +157,9 @@ def __poll_for_tab_if_necessary(self, url: str) -> None:
             self.test_url = url
             self.document = poll_for_tab(self.root, self.product_name, url)
 
-    def test_accessibility_api(self, dom_id: str, test: List[List[str]], api: str, url: str) -> List[str]:
+    def test_accessibility_api(
+        self, dom_id: str, test: List[List[str]], api: str, url: str
+    ) -> List[str]:
         """Execute a test of the accessibility API.
 
         :param dom_id: The dom id of the node to test.
@@ -182,7 +189,9 @@ def test_accessibility_api(self, dom_id: str, test: List[List[str]], api: str, u
 class TestNode:
     """Wrapper around an Atspi Node for testing purposes"""
 
-    def __init__(self, document: Atspi.Accessible, dom_id: str, node: Atspi.Accessible) -> None:
+    def __init__(
+        self, document: Atspi.Accessible, dom_id: str, node: Atspi.Accessible
+    ) -> None:
         self.document = document
         self.dom_id = dom_id
         self.node = node
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
index ef0f34f4b97d45..710fe6ad962914 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executoraxapi.py
@@ -14,6 +14,7 @@
 
 from mozlog.structuredlog import StructuredLogger
 
+
 def find_browser(name: str) -> Optional[Any]:
     """Find the AXUIElement representing the browser.
 
@@ -127,7 +128,9 @@ def setup(self, product_name: str, logger: StructuredLogger) -> None:
                 f"Couldn't find browser {self.product_name} in accessibility API AX API. Accessibility API queries will not succeeded."
             )
 
-    def test_accessibility_api(self, dom_id: str, test: List[List[str]], api: str, url: str) -> List[str]:
+    def test_accessibility_api(
+        self, dom_id: str, test: List[List[str]], api: str, url: str
+    ) -> List[str]:
         """Execute a test of the accessibility API.
 
         :param dom_id: The dom id of the node to test.
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
index d84f4b87107271..6761043e7e2268 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
@@ -140,7 +140,9 @@ def setup(self, product_name: str, logger: StructuredLogger) -> None:
         self.product_name = product_name
         self.logger = logger
 
-    def test_accessibility_api(self, dom_id: str, test: List[List[str]], api: str, url: str) -> List[str]:
+    def test_accessibility_api(
+        self, dom_id: str, test: List[List[str]], api: str, url: str
+    ) -> List[str]:
         """Execute a test of the accessibility API.
 
         :param dom_id: The dom id of the node to test.

From 6cdc1f404deffcb7be3161ba24b70addd8578a6f Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@theliomoon.localdomain>
Date: Wed, 21 Jan 2026 18:30:50 -0800
Subject: [PATCH 37/38] Use IA2_RELATION_EMBEDS

---
 .../executorwindowsaccessibility.py              | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
index 6761043e7e2268..0c64131e9ffe6b 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
@@ -18,6 +18,7 @@
 from mozlog.structuredlog import StructuredLogger
 
 from ..platformaccessibility.ia2.constants import (  # type: ignore[attr-defined]
+    IAccessible2_2,
     IAccessible2,
     Role,
     get_msaa_state_list,
@@ -76,7 +77,7 @@ def check_window_name(hwnd: HWND, lParam: LPARAM) -> bool:  # noqa: N803
 
 def to_ia2(node: IAccessiblePtr) -> IAccessible2Ptr:
     service = node.QueryInterface(IServiceProvider)
-    return service.QueryService(IAccessible2._iid_, IAccessible2)
+    return service.QueryService(IAccessible._iid_, IAccessible2_2)
 
 
 def find_browser(product_name: str) -> IAccessible2Ptr:
@@ -94,6 +95,17 @@ def poll_for_tab(url: str, root: IAccessible2Ptr) -> IAccessible2Ptr:
 
 
 def find_tab(url: str, root: IAccessible2Ptr) -> Optional[IAccessible2Ptr]:
+    # TODO: Add and use relation constants (IA2_RELATION_EMBEDS).
+    targets, count = root.relationTargetsOfType("embeds", 1)
+    if count >= 1:
+        ia2 = to_ia2(targets[0])
+        if ia2.accValue(CHILDID_SELF) == url:
+            return ia2
+
+    return find_tab_by_searching_tree(url, root)
+
+
+def find_tab_by_searching_tree(url: str, root: IAccessible2Ptr) -> Optional[IAccessible2Ptr]:
     for i in range(1, root.accChildCount + 1):
         child = to_ia2(root.accChild(i))
         if child.accRole(CHILDID_SELF) == Role.ROLE_SYSTEM_DOCUMENT:
@@ -101,7 +113,7 @@ def find_tab(url: str, root: IAccessible2Ptr) -> Optional[IAccessible2Ptr]:
                 return child
             # No need to search within documents.
             return None
-        descendant = find_tab(url, child)
+        descendant = find_tab_by_searching_tree(url, child)
         if descendant:
             return descendant
     return None

From 09f811515658763b9f144b3fb7e1c8c1d063f3a2 Mon Sep 17 00:00:00 2001
From: Valerie Young <spectranaut@igalia.com>
Date: Thu, 22 Jan 2026 11:53:57 -0800
Subject: [PATCH 38/38] Fix flake8 errors

---
 .../wptrunner/executors/executorplatformaccessibility.py   | 7 +++++--
 .../platformaccessibility/executorwindowsaccessibility.py  | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
index 5834e5b926c22e..7dcf5e921ee1af 100644
--- a/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/executorplatformaccessibility.py
@@ -12,10 +12,13 @@
 class PlatformAccessibilityExecutorImpl(Protocol):
     """Protocol defining the interface for platform accessibility executors."""
 
-    def setup(self, product_name: str, logger: StructuredLogger) -> None: ...
+    def setup(self, product_name: str, logger: StructuredLogger) -> None:
+        ...
+
     def test_accessibility_api(
         self, dom_id: str, test: List[List[str]], api: str, url: str
-    ) -> List[str]: ...
+    ) -> List[str]:
+        ...
 
 
 def valid_api_for_platform(api: str) -> bool:
diff --git a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
index 0c64131e9ffe6b..303c5781d5f99b 100644
--- a/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
+++ b/tools/wptrunner/wptrunner/executors/platformaccessibility/executorwindowsaccessibility.py
@@ -19,7 +19,6 @@
 
 from ..platformaccessibility.ia2.constants import (  # type: ignore[attr-defined]
     IAccessible2_2,
-    IAccessible2,
     Role,
     get_msaa_state_list,
     get_state_list,
