Backed out changeset 10ac3f66133d (bug 1896232) for causing bug 1915806 CLOSED TREE

browser/actors/ScreenshotsComponentChild.sys.mjs

@@ -18,7 +18,6 @@ export class ScreenshotsComponentChild extends JSWindowActorChild {
   #scrollTask;
   #overlay;
   #preventableEventsAdded = false;
-  #listening = false;
 
   static OVERLAY_EVENTS = [
     "click",
@@ -173,6 +172,7 @@ export class ScreenshotsComponentChild extends JSWindowActorChild {
       closeOverlay: false,
       reason,
     });
+    this.endScreenshotsOverlay();
   }
 
   /**
@@ -182,6 +182,7 @@ export class ScreenshotsComponentChild extends JSWindowActorChild {
   requestCopyScreenshot(region) {
     region.devicePixelRatio = this.contentWindow.devicePixelRatio;
     this.sendAsyncMessage("Screenshots:CopyScreenshot", { region });
+    this.endScreenshotsOverlay({ doNotResetMethods: true });
   }
 
   /**
@@ -194,6 +195,7 @@ export class ScreenshotsComponentChild extends JSWindowActorChild {
       title: this.getDocumentTitle(),
       region,
     });
+    this.endScreenshotsOverlay({ doNotResetMethods: true });
   }
 
   getDocumentTitle() {
@@ -256,7 +258,6 @@ export class ScreenshotsComponentChild extends JSWindowActorChild {
     this.contentWindow.addEventListener("resize", this);
     this.contentWindow.addEventListener("scroll", this);
     this.addOverlayEventListeners();
-    this.#listening = true;
   }
 
   addOverlayEventListeners() {
@@ -290,26 +291,20 @@ export class ScreenshotsComponentChild extends JSWindowActorChild {
       return false;
     }
     await this.documentIsReady();
-    if (!this.overlay) {
-      this.#overlay = new lazy.ScreenshotsOverlay(this.document);
-    }
+    let overlay =
+      this.overlay ||
+      (this.#overlay = new lazy.ScreenshotsOverlay(this.document));
     this.addEventListeners();
 
-    this.overlay.initialize();
+    overlay.initialize();
     return true;
   }
 
   removeEventListeners() {
-    if (!this.#listening) {
-      return;
-    }
-
     this.contentWindow.removeEventListener("beforeunload", this);
     this.contentWindow.removeEventListener("resize", this);
     this.contentWindow.removeEventListener("scroll", this);
     this.removeOverlayEventListeners();
-
-    this.#listening = false;
   }
 
   removeOverlayEventListeners() {
@@ -341,7 +336,8 @@ export class ScreenshotsComponentChild extends JSWindowActorChild {
   }
 
   didDestroy() {
-    this.endScreenshotsOverlay();
+    this.#resizeTask?.disarm();
+    this.#scrollTask?.disarm();
   }
 
   /**