Backed out changeset fe2ffeac3ec2 (bug 1783521) for marionette failure on test_restore_manually.py . CLOSED TREE

Author: nbeleuzu

browser/app/profile/firefox.js

@@ -907,10 +907,6 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", true);
 pref("browser.tabs.tooltipsShowPidAndActiveness", false);
 #endif
 
-pref("browser.tabs.cardPreview.enabled", false);
-pref("browser.tabs.cardPreview.delayMs", 1000);
-pref("browser.tabs.cardPreview.showThumbnails", true);
-
 pref("browser.tabs.firefox-view", true);
 pref("browser.tabs.firefox-view-next", true);
 pref("browser.tabs.firefox-view-newIcon", true);

browser/base/content/browser.xhtml

@@ -142,7 +142,6 @@
   window.addEventListener("DOMContentLoaded",
     gBrowserInit.onDOMContentLoaded.bind(gBrowserInit), { once: true });
 </script>
-<script type="module" src="chrome://browser/content/tabpreview/tabpreview.mjs"></script>
 </head>
 <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 # All sets except for popupsets (commands, keys, and stringbundles)

browser/base/content/main-popupset.inc.xhtml

@@ -412,8 +412,6 @@
     <hbox id="ctrlTab-showAll-container" pack="center"/>
   </panel>
 
-  <html:tab-preview id="tabbrowser-tab-preview" hidden="true" />
-
   <html:template id="pageActionPanelTemplate">
     <panel id="pageActionPanel"
            class="cui-widget-panel panel-no-padding"

browser/base/content/tabbrowser-tab.js

@@ -550,8 +550,6 @@
         tabToWarm = gBrowser._findTabToBlurTo(this);
       }
       gBrowser.warmupTab(tabToWarm);
-
-      this.dispatchEvent(new CustomEvent("TabHoverStart", { bubbles: true }));
     }
 
     _mouseleave() {
@@ -563,7 +561,6 @@
         this.linkedBrowser.unselectedTabHover(false);
         this.cancelUnselectedTabHoverTimer();
       }
-      this.dispatchEvent(new CustomEvent("TabHoverEnd", { bubbles: true }));
     }
 
     setSecondaryTabTooltipLabel(l10nID, l10nArgs) {

browser/base/content/tabbrowser-tabs.js

@@ -9,8 +9,6 @@
 // This is loaded into all browser windows. Wrap in a block to prevent
 // leaking to window scope.
 {
-  const TAB_PREVIEW_PREF = "browser.tabs.cardPreview.enabled";
-
   class MozTabbrowserTabs extends MozElements.TabsBase {
     constructor() {
       super();
@@ -22,8 +20,6 @@
       this.addEventListener("TabShow", this);
       this.addEventListener("TabPinned", this);
       this.addEventListener("TabUnpinned", this);
-      this.addEventListener("TabHoverStart", this);
-      this.addEventListener("TabHoverEnd", this);
       this.addEventListener("transitionend", this);
       this.addEventListener("dblclick", this);
       this.addEventListener("click", this);
@@ -122,24 +118,6 @@
       if (gMultiProcessBrowser) {
         this.tabbox.tabpanels.setAttribute("async", "true");
       }
-
-      this.configureTooltip = () => {
-        // fall back to original tooltip behavior if pref is not set
-        this.tooltip = this._showCardPreviews ? null : "tabbrowser-tab-tooltip";
-
-        // activate new tooltip behavior if pref is set
-        document
-          .getElementById("tabbrowser-tab-preview")
-          .toggleAttribute("hidden", !this._showCardPreviews);
-      };
-      XPCOMUtils.defineLazyPreferenceGetter(
-        this,
-        "_showCardPreviews",
-        TAB_PREVIEW_PREF,
-        false,
-        () => this.configureTooltip()
-      );
-      this.configureTooltip();
     }
 
     on_TabSelect(event) {
@@ -1813,22 +1791,6 @@
 
     handleEvent(aEvent) {
       switch (aEvent.type) {
-        case "TabHoverStart":
-          if (this._showCardPreviews) {
-            const previewContainer = document.getElementById(
-              "tabbrowser-tab-preview"
-            );
-            previewContainer.tab = aEvent.target;
-          }
-          break;
-        case "TabHoverEnd":
-          if (this._showCardPreviews) {
-            const previewContainer = document.getElementById(
-              "tabbrowser-tab-preview"
-            );
-            previewContainer.tab = null;
-          }
-          break;
         case "mouseout":
           // If the "related target" (the node to which the pointer went) is not
           // a child of the current document, the mouse just left the window.

browser/base/content/test/tabs/browser.toml

@@ -315,8 +315,6 @@ skip-if = ["true"] # Bug 1616418 Bug 1549985
 
 ["browser_tab_play.js"]
 
-["browser_tab_preview.js"]
-
 ["browser_tab_tooltips.js"]
 
 ["browser_tabswitch_contextmenu.js"]

browser/base/content/test/tabs/browser_tab_preview.js

@@ -61,7 +61,6 @@ DIRS += [
     "shell",
     "shopping",
     "syncedtabs",
-    "tabpreview",
     "tabunloader",
     "textrecognition",
     "translations",

browser/components/moz.build

@@ -110,9 +110,6 @@
               preference="browser.taskbar.previews.enable"/>
 #endif
 
-    <checkbox id="tabPreviewShowThumbnails" data-l10n-id="settings-tabs-show-image-in-preview"
-              preference="browser.tabs.cardPreview.showThumbnails" hidden="true"/>
-
     <vbox id="browserContainersbox" hidden="true">
       <hbox id="browserContainersExtensionContent"
             align="center" class="extension-controlled info-box-container">

browser/components/preferences/main.inc.xhtml

@@ -86,8 +86,6 @@ Preferences.addAll([
   { id: "browser.warnOnQuitShortcut", type: "bool" },
   { id: "browser.tabs.warnOnOpen", type: "bool" },
   { id: "browser.ctrlTab.sortByRecentlyUsed", type: "bool" },
-  { id: "browser.tabs.cardPreview.enabled", type: "bool" },
-  { id: "browser.tabs.cardPreview.showThumbnails", type: "bool" },
 
   // CFR
   {
@@ -356,15 +354,6 @@ var gMainPane = {
       } catch (ex) {}
     }
 
-    let thumbsCheckbox = document.getElementById("tabPreviewShowThumbnails");
-    let cardPreviewEnabledPref = Preferences.get(
-      "browser.tabs.cardPreview.enabled"
-    );
-    let maybeShowThumbsCheckbox = () =>
-      (thumbsCheckbox.hidden = !cardPreviewEnabledPref.value);
-    cardPreviewEnabledPref.on("change", maybeShowThumbsCheckbox);
-    maybeShowThumbsCheckbox();
-
     // The "opening multiple tabs might slow down Firefox" warning provides
     // an option for not showing this warning again. When the user disables it,
     // we provide checkboxes to re-enable the warning.