Backed out 2 changesets (bug 1717486, bug 1718713) for causng eslint failures. CLOSED TREE
authorSandor Molnar <smolnar@mozilla.com>
Thu, 15 Jul 2021 22:07:54 +0300
changeset 585617 156a909b6a8de01ee2bb1a0723d4d2aa7d3f342e
parent 585616 57c50b132961212eef7f97e03aa7cfa69350ac43
child 585618 25cd61cdcc942e2ee951ea0ec3d08302b8c4e2b9
push id146353
push usersmolnar@mozilla.com
push dateThu, 15 Jul 2021 19:09:17 +0000
treeherderautoland@156a909b6a8d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1717486, 1718713
milestone92.0a1
backs out57c50b132961212eef7f97e03aa7cfa69350ac43
00b064dbf950e85d348f3c160393b4e4e0a41649
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 2 changesets (bug 1717486, bug 1718713) for causng eslint failures. CLOSED TREE Backed out changeset 57c50b132961 (bug 1718713) Backed out changeset 00b064dbf950 (bug 1717486)
browser/base/content/browser.xhtml
browser/base/content/nsContextMenu.js
browser/components/BrowserGlue.jsm
browser/components/customizableui/CustomizableWidgets.jsm
browser/components/moz.build
browser/components/screenshots/ScreenshotsUtils.jsm
browser/components/screenshots/content/screenshots.js
browser/components/screenshots/jar.mn
browser/components/screenshots/moz.build
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -101,17 +101,16 @@
   Services.scriptloader.loadSubScript("chrome://browser/content/browser-sidebar.js", this);
   Services.scriptloader.loadSubScript("chrome://browser/content/browser-tabsintitlebar.js", this);
   Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser.js", this);
   Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser-tab.js", this);
   Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser-tabs.js", this);
   Services.scriptloader.loadSubScript("chrome://browser/content/places/places-menupopup.js", this);
   Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this);
   Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);
-  Services.scriptloader.loadSubScript("chrome://browser/content/screenshots/screenshots.js", this);
 
   window.onload = gBrowserInit.onLoad.bind(gBrowserInit);
   window.onunload = gBrowserInit.onUnload.bind(gBrowserInit);
   window.onclose = WindowIsClosing;
 
   window.addEventListener("MozBeforeInitialXULLayout",
     gBrowserInit.onBeforeInitialXULLayout.bind(gBrowserInit), { once: true });
 
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -1286,19 +1286,17 @@ class nsContextMenu {
     );
     openWebLinkIn(this.contentData.docLocation, "current", {
       referrerInfo: this.contentData.frameReferrerInfo,
       triggeringPrincipal: this.browser.contentPrincipal,
     });
   }
 
   takeScreenshot() {
-    if (SCREENSHOT_BROWSER_COMPONENT) {
-      Services.obs.notifyObservers(window, "menuitem-screenshot", true);
-    } else {
+    if (!SCREENSHOT_BROWSER_COMPONENT) {
       Services.obs.notifyObservers(null, "menuitem-screenshot-extension", true);
     }
   }
 
   // View Partial Source
   viewPartialSource() {
     let { browser } = this;
     let openSelectionFn = function() {
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -72,17 +72,16 @@ XPCOMUtils.defineLazyModuleGetters(this,
   PublicSuffixList: "resource://gre/modules/netwerk-dns/PublicSuffixList.jsm",
   RemoteSettings: "resource://services-settings/remote-settings.js",
   RemoteSecuritySettings:
     "resource://gre/modules/psm/RemoteSecuritySettings.jsm",
   RFPHelper: "resource://gre/modules/RFPHelper.jsm",
   SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",
   Sanitizer: "resource:///modules/Sanitizer.jsm",
   SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm",
-  ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.jsm",
   SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.jsm",
   SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
   SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
   TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
   TabUnloader: "resource:///modules/TabUnloader.jsm",
   TelemetryUtils: "resource://gre/modules/TelemetryUtils.jsm",
   TRRRacer: "resource:///modules/TRRPerformance.jsm",
   UIState: "resource://services-sync/UIState.jsm",
@@ -2393,24 +2392,16 @@ BrowserGlue.prototype = {
       {
         task: () => {
           this._maybeShowDefaultBrowserPrompt();
         },
       },
 
       {
         task: () => {
-          if(Services.prefs.getBoolPref("screenshots.browser.component.enabled")) {
-            ScreenshotsUtils.initialize();
-          }
-        },
-      },
-
-      {
-        task: () => {
           UrlbarQuickSuggest.maybeShowOnboardingDialog();
         },
       },
 
       {
         task: () => {
           let { setTimeout } = ChromeUtils.import(
             "resource://gre/modules/Timer.jsm"
--- a/browser/components/customizableui/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/CustomizableWidgets.jsm
@@ -478,19 +478,17 @@ if (Services.prefs.getBoolPref("identity
   });
 }
 
 if (!screenshotsDisabled) {
   CustomizableWidgets.push({
     id: "screenshot-button",
     l10nId: "screenshot-toolbarbutton",
     onCommand(aEvent) {
-      if (SCREENSHOT_BROWSER_COMPONENT) {
-        Services.obs.notifyObservers(window, "menuitem-screenshot");
-      } else {
+      if (!SCREENSHOT_BROWSER_COMPONENT) {
         Services.obs.notifyObservers(null, "menuitem-screenshot-extension");
       }
     },
     onCreated(aNode) {
       aNode.ownerGlobal.MozXULElement.insertFTLIfNeeded(
         "browser/screenshots.ftl"
       );
       Services.obs.addObserver(this, "toggle-screenshot-disable");
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -43,17 +43,16 @@ DIRS += [
     "places",
     "pocket",
     "preferences",
     "privatebrowsing",
     "prompts",
     "protections",
     "protocolhandler",
     "resistfingerprinting",
-    "screenshots",
     "search",
     "sessionstore",
     "shell",
     "syncedtabs",
     "uitour",
     "urlbar",
     "translation",
 ]
deleted file mode 100644
--- a/browser/components/screenshots/ScreenshotsUtils.jsm
+++ /dev/null
@@ -1,19 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-var EXPORTED_SYMBOLS = ["ScreenshotsUtils"];
-
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-var ScreenshotsUtils = {
-  initialize() {
-    Services.obs.addObserver(this, "menuitem-screenshot");
-  },
-  observe(subj, topic, data) {
-    let document = subj.document;
-    document.createXULElement("screenshots-div");
-  },
-};
deleted file mode 100644
--- a/browser/components/screenshots/content/screenshots.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-class ScreenshotsUI extends MozXULElement {
-  constructor() {
-    super();
-  }
-  get markup() {
-    return `
-    `;
-  }
-}
-
-customElements.define("screenshots-div", ScreenshotsUI);
deleted file mode 100644
--- a/browser/components/screenshots/jar.mn
+++ /dev/null
@@ -1,6 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-browser.jar:
-        content/browser/screenshots/screenshots.js                  (content/screenshots.js)
deleted file mode 100644
--- a/browser/components/screenshots/moz.build
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXTRA_JS_MODULES += [
-    "ScreenshotsUtils.jsm",
-]
-
-JAR_MANIFESTS += ["jar.mn"]
-
-with Files("**"):
-    BUG_COMPONENT = ("Firefox", "Screenshots")