From 9c4f5fd7bcaa652447eafacef3e779228ae2009e Mon Sep 17 00:00:00 2001
From: Noemi Erli <nerli@mozilla.com>
Date: Thu, 20 Oct 2022 18:53:41 +0300
Subject: [PATCH] Backed out changeset 0a1431ca8979 (bug 1793088) for causing
 failures browser_firefoxview_tab.js CLOSED TREE

---
 browser/base/content/browser.js               |  7 -------
 .../tests/browser/browser_firefoxview_tab.js  | 21 -------------------
 2 files changed, 28 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 5fc63e9fa5098..e452b67fd2619 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -9983,13 +9983,6 @@ var FirefoxViewHandler = {
         this.button?.setAttribute("aria-selected", e.target == this.tab);
         this._recordViewIfTabSelected();
         this._onTabForegrounded();
-        if (e.target == this.tab) {
-          // If Fx View is opened, add temporary style to make first available tab focusable
-          gBrowser.visibleTabs[0].style["-moz-user-focus"] = "normal";
-        } else {
-          // When Fx View is closed, remove temporary -moz-user-focus style from first available tab
-          gBrowser.visibleTabs[0].style.removeProperty("-moz-user-focus");
-        }
         break;
       case "TabClose":
         this.tab = null;
diff --git a/browser/components/firefoxview/tests/browser/browser_firefoxview_tab.js b/browser/components/firefoxview/tests/browser/browser_firefoxview_tab.js
index 7a904ca552ae4..d04da6ebed640 100644
--- a/browser/components/firefoxview/tests/browser/browser_firefoxview_tab.js
+++ b/browser/components/firefoxview/tests/browser/browser_firefoxview_tab.js
@@ -1,12 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-function forceFocus(aElem) {
-  aElem.setAttribute("tabindex", "-1");
-  aElem.focus();
-  aElem.removeAttribute("tabindex");
-}
-
 add_task(async function aria_attributes() {
   let win = await BrowserTestUtils.openNewBrowserWindow();
   is(
@@ -62,21 +56,6 @@ add_task(async function load_opens_new_tab() {
   });
 });
 
-add_task(async function first_tab_focusable_with_keyboard() {
-  await withFirefoxView({}, async browser => {
-    let win = browser.ownerGlobal;
-    ok(win.FirefoxViewHandler.tab.selected, "Firefox View tab is selected");
-    let firefoxViewBtn = win.FirefoxViewHandler.button;
-    await forceFocus(firefoxViewBtn);
-    EventUtils.synthesizeKey("KEY_Tab", {}, win);
-    is(
-      browser.ownerDocument.activeElement,
-      win.gBrowser.visibleTabs[0],
-      "First available tab should be focused."
-    );
-  });
-});
-
 add_task(async function homepage_new_tab() {
   await withFirefoxView({}, async browser => {
     let win = browser.ownerGlobal;
-- 
GitLab