From dc0340015b743d4510bf6ffedd59a1e929d43d4a Mon Sep 17 00:00:00 2001
From: agoloman <agoloman@mozilla.com>
Date: Fri, 5 Jun 2026 07:28:34 +0000
Subject: [PATCH] Revert "Bug 2035573 - Start focus navigation from selection
 if it is a descendant of focused element. " for causing wpt failures
 @sequential-focus-navigation-starting-point.tentative.html.

This reverts commit 15f3930b2c232064170a7a5e61b7a9bd1e1b8b51.

gecko-commit: 0dfd3bd46c854f4ac99e1e5dbd272a2e68fb4e8a
gecko-commit-git: 861a985a35e4266ac504cee2b76363cbaa4e804d
gecko-reviewers: vhilla, edgar
---
 ...tial-focus-navigation-starting-point.html} | 34 ++-----------------
 1 file changed, 3 insertions(+), 31 deletions(-)
 rename html/interaction/focus/{sequential-focus-navigation-starting-point.tentative.html => sequential-focus-navigation-starting-point.html} (84%)

diff --git a/html/interaction/focus/sequential-focus-navigation-starting-point.tentative.html b/html/interaction/focus/sequential-focus-navigation-starting-point.html
similarity index 84%
rename from html/interaction/focus/sequential-focus-navigation-starting-point.tentative.html
rename to html/interaction/focus/sequential-focus-navigation-starting-point.html
index e0f55a9c260ba3..07479053b6e414 100644
--- a/html/interaction/focus/sequential-focus-navigation-starting-point.tentative.html
+++ b/html/interaction/focus/sequential-focus-navigation-starting-point.html
@@ -118,28 +118,6 @@
     <button data-next slot="d">button 4</button>
   </div>
 </template>
-<template data-description="Focus navigation starting point should be used when it's a descendant of the focused element.">
-  <div tabindex="0" data-focus>
-    <button data-prev id="button1">button 1</button>
-    <span data-click>in between</span>
-    <button data-next id="button2">button 2</button>
-  </div>
-</template>
-<template data-description="Backwards focus navigation should not be stuck when starting point is inside focused element but before any other focusable areas.">
-  <button data-prev id="button1">button 1</button>
-  <div tabindex="0" id="focusable" data-focus>
-    <span data-click>in between</span>
-    <button data-next id="button2">button 2</button>
-  </div>
-</template>
-<template data-description="Should start from focused element if it was focused after the selection was set.">
-  <button id="button1">button 1</button>
-  <span data-click>in between</span>
-  <button id="button2">button 2</button>
-  <button id="button3" data-prev>button 3</button>
-  <div tabindex="0" id="focusable" data-focus2>focusable</div>
-  <button id="button4" data-next>button 4</button>
-</template>
 
 <script>
 "use strict";
@@ -148,15 +126,13 @@
 const kTab = "\uE004";
 
 // Runs callback on each element matching selector, descending into open shadow roots.
-async function forEachMatching(selector, callback, root) {
+function forEachMatching(selector, callback, root) {
   if (!root) { root = container; }
   for (let element of root.querySelectorAll(selector)) {
-    await callback(element);
+    callback(element);
   }
   for (let element of root.querySelectorAll("[data-shadow]")) {
-    if (element.shadowRoot) {
-      await forEachMatching(selector, callback, element.shadowRoot);
-    }
+    forEachMatching(selector, callback, element.shadowRoot);
   }
 }
 
@@ -173,7 +149,6 @@
       forEachMatching("[data-focus]", element => {
         element.focus();
       });
-      await forEachMatching("[data-click]", test_driver.click);
       forEachMatching("[data-blur]", element => {
         element.blur();
       });
@@ -201,9 +176,6 @@
       forEachMatching("[data-reenable]", element => {
         element.disabled = false;
       });
-      forEachMatching("[data-focus2]", element => {
-        element.focus();
-      });
 
       let actions = new test_driver.Actions();
       if (backwards) {