chore: Refactor JS actors into their own modules, b=no-bug, c=common, glance, mods

src/browser/base/content/zen-assets.jar.inc.mn

@@ -7,7 +7,6 @@
         content/browser/ZenPreloadedScripts.js                                  (../../zen/common/ZenPreloadedScripts.js)
         content/browser/zen-sets.js                                             (../../zen/common/zen-sets.js)
         content/browser/ZenUIManager.mjs                                        (../../zen/common/ZenUIManager.mjs)
-        content/browser/zen-components/ZenActorsManager.mjs                     (../../zen/common/ZenActorsManager.mjs)
         content/browser/zen-components/ZenCommonUtils.mjs                       (../../zen/common/ZenCommonUtils.mjs)
         content/browser/zen-components/ZenSessionStore.mjs                      (../../zen/common/ZenSessionStore.mjs)
         content/browser/zen-components/ZenEmojisData.min.mjs                    (../../zen/common/emojis/ZenEmojisData.min.mjs)

src/browser/base/content/zen-preloaded.inc.xhtml

@@ -13,5 +13,4 @@
 <script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspace.mjs"></script>
 <script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspaces.mjs"></script>
 <script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspacesSync.mjs"></script>
-<script type="text/javascript" src="chrome://browser/content/zen-components/ZenActorsManager.mjs"></script>
 <script type="text/javascript" src="chrome://browser/content/zen-components/ZenSessionStore.mjs"></script>

src/zen/ZenComponents.manifest

@@ -0,0 +1,15 @@
+# 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/.
+
+# nsBrowserGlue.js
+
+# This component must restrict its registration for the app-startup category
+# to the specific list of apps that use it so it doesn't get loaded in xpcshell.
+# Thus we restrict it to these apps:
+#
+#   browser:        {ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+
+category app-startup nsBrowserGlue @mozilla.org/browser/browserglue;1 application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+
+#include common/Components.manifest

src/zen/common/Components.manifest

@@ -0,0 +1,5 @@
+# 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/.
+
+category browser-before-ui-startup resource:///modules/ZenActorsManager.sys.mjs gZenActorsManager.init

src/zen/common/ZenActorsManager.mjs

@@ -1,34 +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/.
-// Utility to register JSWindowActors
-
-window.gZenActorsManager = {
-  _actors: new Set(),
-  _lazy: {},
-
-  init() {
-    ChromeUtils.defineESModuleGetters(this._lazy, {
-      ActorManagerParent: 'resource://gre/modules/ActorManagerParent.sys.mjs',
-    });
-  },
-
-  addJSWindowActor(name, data) {
-    if (!this._lazy.ActorManagerParent) {
-      this.init();
-    }
-    if (this._actors.has(name)) {
-      // Actor already registered, nothing to do
-      return;
-    }
-
-    const decl = {};
-    decl[name] = data;
-    try {
-      this._lazy.ActorManagerParent.addJSWindowActors(decl);
-      this._actors.add(name);
-    } catch (e) {
-      console.warn(`Failed to register JSWindowActor: ${e}`);
-    }
-  },
-};

src/zen/common/ZenActorsManager.sys.mjs

@@ -0,0 +1,61 @@
+// 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/.
+// Utility to register JSWindowActors
+
+import { ActorManagerParent } from 'resource://gre/modules/ActorManagerParent.sys.mjs';
+
+/**
+ * Fission-compatible JSProcess implementations.
+ * Each actor options object takes the form of a ProcessActorOptions dictionary.
+ * Detailed documentation of these options is in dom/docs/ipc/jsactors.rst,
+ * available at https://firefox-source-docs.mozilla.org/dom/ipc/jsactors.html
+ */
+let JSPROCESSACTORS = {};
+
+/**
+ * Fission-compatible JSWindowActor implementations.
+ * Detailed documentation of these options is in dom/docs/ipc/jsactors.rst,
+ * available at https://firefox-source-docs.mozilla.org/dom/ipc/jsactors.html
+ */
+let JSWINDOWACTORS = {
+  ZenModsMarketplace: {
+    parent: {
+      esModuleURI: 'resource:///actors/ZenModsMarketplaceParent.sys.mjs',
+    },
+    child: {
+      esModuleURI: 'resource:///actors/ZenModsMarketplaceChild.sys.mjs',
+      events: {
+        DOMContentLoaded: {},
+      },
+    },
+    matches: [
+      ...Services.prefs.getStringPref('zen.injections.match-urls').split(','),
+      'about:preferences',
+    ],
+  },
+  ZenGlance: {
+    parent: {
+      esModuleURI: 'resource:///actors/ZenGlanceParent.sys.mjs',
+    },
+    child: {
+      esModuleURI: 'resource:///actors/ZenGlanceChild.sys.mjs',
+      events: {
+        DOMContentLoaded: {},
+        keydown: {
+          capture: true,
+        },
+      },
+    },
+    allFrames: true,
+    matches: ['*://*/*'],
+    enablePreference: 'zen.glance.enabled',
+  },
+};
+
+export let gZenActorsManager = {
+  init() {
+    ActorManagerParent.addJSProcessActors(JSPROCESSACTORS);
+    ActorManagerParent.addJSWindowActors(JSWINDOWACTORS);
+  },
+};

src/zen/common/moz.build

@@ -3,6 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXTRA_JS_MODULES += [
+  "ZenActorsManager.sys.mjs",
   "ZenCustomizableUI.sys.mjs",
   "ZenUIMigration.sys.mjs",
 ]

src/zen/glance/ZenGlanceManager.mjs

@@ -1716,29 +1716,4 @@
   }
 
   window.gZenGlanceManager = new nsZenGlanceManager();
-
-  /**
-   * Register window actors for glance functionality
-   */
-  function registerWindowActors() {
-    gZenActorsManager.addJSWindowActor('ZenGlance', {
-      parent: {
-        esModuleURI: 'resource:///actors/ZenGlanceParent.sys.mjs',
-      },
-      child: {
-        esModuleURI: 'resource:///actors/ZenGlanceChild.sys.mjs',
-        events: {
-          DOMContentLoaded: {},
-          keydown: {
-            capture: true,
-          },
-        },
-      },
-      allFrames: true,
-      matches: ['*://*/*'],
-      enablePreference: 'zen.glance.enabled',
-    });
-  }
-
-  registerWindowActors();
 }

src/zen/mods/ZenMods.mjs

@@ -667,20 +667,4 @@
   }
 
   window.gZenMods = new nsZenMods();
-
-  gZenActorsManager.addJSWindowActor('ZenModsMarketplace', {
-    parent: {
-      esModuleURI: 'resource:///actors/ZenModsMarketplaceParent.sys.mjs',
-    },
-    child: {
-      esModuleURI: 'resource:///actors/ZenModsMarketplaceChild.sys.mjs',
-      events: {
-        DOMContentLoaded: {},
-      },
-    },
-    matches: [
-      ...Services.prefs.getStringPref('zen.injections.match-urls').split(','),
-      'about:preferences',
-    ],
-  });
 }

src/zen/moz.build

@@ -2,6 +2,10 @@
 # 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_PP_COMPONENTS += [
+  "ZenComponents.manifest",
+]
+
 DIRS += [
     "common",
     "glance",

src/zen/zen.globals.js

@@ -45,7 +45,6 @@ export default [
   'Cu',
   'Cc',
 
-  'gZenActorsManager',
   'JSWindowActorParent',
   'JSWindowActorChild',