Bug 1472491: Part 5y - Add PopupBlockingChild actor. r=mconley

MozReview-Commit-ID: Bw7u8m3xY38

--HG--
rename : toolkit/modules/PopupBlocking.jsm => toolkit/actors/PopupBlockingChild.jsm
extra : rebase_source : 7c675d31c04be2eac0e37adcc9dbb2cd3766ce6a

toolkit/actors/PopupBlockingChild.jsm

@@ -5,11 +5,13 @@
 
 /* eslint no-unused-vars: ["error", {args: "none"}] */
 
-var EXPORTED_SYMBOLS = ["PopupBlocking"];
+var EXPORTED_SYMBOLS = ["PopupBlockingChild"];
 
-class PopupBlocking {
+ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
+
+class PopupBlockingChild extends ActorChild {
   constructor(mm) {
-    this.mm = mm;
+    super(mm);
 
     this.popupData = null;
     this.popupDataInternal = null;

toolkit/actors/moz.build

@@ -7,6 +7,7 @@
 FINAL_TARGET_FILES.actors += [
     'AudioPlaybackChild.jsm',
     'FindBarChild.jsm',
+    'PopupBlockingChild.jsm',
     'PrintingChild.jsm',
     'SelectChild.jsm',
     'SelectionSourceChild.jsm',

toolkit/content/browser-content.js

@@ -26,12 +26,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "formFill",
 
 var global = this;
 
-XPCOMUtils.defineLazyProxy(this, "PopupBlocking", () => {
-  let tmp = {};
-  ChromeUtils.import("resource://gre/modules/PopupBlocking.jsm", tmp);
-  return new tmp.PopupBlocking(global);
-});
-
 XPCOMUtils.defineLazyProxy(this, "ShieldFrameListener", () => {
   let tmp = {};
   ChromeUtils.import("resource://normandy-content/ShieldFrameListener.jsm", tmp);
@@ -75,8 +69,6 @@ Services.els.addSystemEventListener(global, "mousedown", AutoScrollListener, tru
 
 addEventListener("MozOpenDateTimePicker", DateTimePickerContent);
 
-addEventListener("DOMPopupBlocked", PopupBlocking, true);
-
 addEventListener("WebChannelMessageToChrome", WebChannelContent,
                  true, true);
 addMessageListener("WebChannelMessageToContent", WebChannelContent);

toolkit/modules/ActorManagerParent.jsm

@@ -121,6 +121,15 @@ let ACTORS = {
     },
   },
 
+  PopupBlocking: {
+    child: {
+      module: "resource://gre/actors/PopupBlockingChild.jsm",
+      events: {
+        "DOMPopupBlocked": {capture: true},
+      },
+    },
+  },
+
   Printing: {
     child: {
       module: "resource://gre/actors/PrintingChild.jsm",

toolkit/modules/moz.build

@@ -226,7 +226,6 @@ EXTRA_JS_MODULES += [
     'PageMenu.jsm',
     'PageMetadata.jsm',
     'PermissionsUtils.jsm',
-    'PopupBlocking.jsm',
     'PopupNotifications.jsm',
     'Preferences.jsm',
     'PrivateBrowsingUtils.jsm',