Bug 1601618 - [remote] Use lazy loading of modules and delayed settin…

…g of global properties. r=remote-protocol-reviewers,jdescottes Differential Revision: https://phabricator.services.mozilla.com/D106602
dothq · Feb 26, 2021 · b7893c0 · b7893c0
1 parent c9df4a4
commit b7893c0
Show file tree

Hide file tree

Showing 40 changed files with 342 additions and 265 deletions.
diff --git a/remote/cdp/Connection.jsm b/remote/cdp/Connection.jsm
@@ -10,15 +10,14 @@ const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
-const { truncate } = ChromeUtils.import(
-  "chrome://remote/content/shared/Format.jsm"
-);
-const { Log } = ChromeUtils.import("chrome://remote/content/shared/Log.jsm");
-const { UnknownMethodError } = ChromeUtils.import(
-  "chrome://remote/content/cdp/Error.jsm"
-);
+XPCOMUtils.defineLazyModuleGetters(this, {
+  Log: "chrome://remote/content/shared/Log.jsm",
+  truncate: "chrome://remote/content/shared/Format.jsm",
+  UnknownMethodError: "chrome://remote/content/cdp/Error.jsm",
+});
+
+XPCOMUtils.defineLazyGetter(this, "log", () => Log.get());
 
-XPCOMUtils.defineLazyGetter(this, "log", Log.get);
 XPCOMUtils.defineLazyServiceGetter(
   this,
   "UUIDGen",

diff --git a/remote/cdp/Error.jsm b/remote/cdp/Error.jsm
@@ -11,13 +11,17 @@ var EXPORTED_SYMBOLS = [
   "UnsupportedError",
 ];
 
-const { Log } = ChromeUtils.import("chrome://remote/content/shared/Log.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
-XPCOMUtils.defineLazyGetter(this, "log", Log.get);
+XPCOMUtils.defineLazyModuleGetters(this, {
+  Services: "resource://gre/modules/Services.jsm",
+
+  Log: "chrome://remote/content/shared/Log.jsm",
+});
+
+XPCOMUtils.defineLazyGetter(this, "log", () => Log.get());
 
 class RemoteAgentError extends Error {
   constructor(message = "", cause = undefined) {

diff --git a/remote/cdp/JSONHandler.jsm b/remote/cdp/JSONHandler.jsm
@@ -6,19 +6,20 @@
 
 var EXPORTED_SYMBOLS = ["JSONHandler"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-const { HTTP_404, HTTP_505 } = ChromeUtils.import(
-  "chrome://remote/content/server/HTTPD.jsm"
-);
-const { Log } = ChromeUtils.import("chrome://remote/content/shared/Log.jsm");
-const { Protocol } = ChromeUtils.import(
-  "chrome://remote/content/cdp/Protocol.jsm"
-);
-const { RemoteAgentError } = ChromeUtils.import(
-  "chrome://remote/content/cdp/Error.jsm"
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
 );
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  Services: "resource://gre/modules/Services.jsm",
+
+  HTTP_404: "chrome://remote/content/server/HTTPD.jsm",
+  HTTP_505: "chrome://remote/content/server/HTTPD.jsm",
+  Log: "chrome://remote/content/shared/Log.jsm",
+  Protocol: "chrome://remote/content/cdp/Protocol.jsm",
+  RemoteAgentError: "chrome://remote/content/cdp/Error.jsm",
+});
+
 class JSONHandler {
   constructor(agent) {
     this.agent = agent;

diff --git a/remote/cdp/StreamRegistry.jsm b/remote/cdp/StreamRegistry.jsm
@@ -13,16 +13,14 @@ const { XPCOMUtils } = ChromeUtils.import(
 XPCOMUtils.defineLazyModuleGetters(this, {
   AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
   OS: "resource://gre/modules/osfile.jsm",
+
+  UnsupportedError: "chrome://remote/content/cdp/Error.jsm",
 });
 
 XPCOMUtils.defineLazyServiceGetters(this, {
   uuidGen: ["@mozilla.org/uuid-generator;1", "nsIUUIDGenerator"],
 });
 
-const { UnsupportedError } = ChromeUtils.import(
-  "chrome://remote/content/cdp/Error.jsm"
-);
-
 class StreamRegistry {
   constructor() {
     // handle => stream

diff --git a/remote/cdp/domains/DomainCache.jsm b/remote/cdp/domains/DomainCache.jsm
@@ -6,13 +6,15 @@
 
 var EXPORTED_SYMBOLS = ["DomainCache"];
 
-const { Domain } = ChromeUtils.import(
-  "chrome://remote/content/cdp/domains/Domain.jsm"
-);
-const { UnknownMethodError } = ChromeUtils.import(
-  "chrome://remote/content/cdp/Error.jsm"
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
 );
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  Domain: "chrome://remote/content/cdp/domains/Domain.jsm",
+  UnknownMethodError: "chrome://remote/content/cdp/Error.jsm",
+});
+
 /**
  * Lazy domain instance cache.
  *

diff --git a/remote/cdp/domains/content/DOM.jsm b/remote/cdp/domains/content/DOM.jsm
@@ -6,10 +6,15 @@
 
 var EXPORTED_SYMBOLS = ["DOM"];
 
-const { ContentProcessDomain } = ChromeUtils.import(
-  "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
+var { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
 );
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  ContentProcessDomain:
+    "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm",
+});
+
 class DOM extends ContentProcessDomain {
   constructor(session) {
     super(session);

diff --git a/remote/cdp/domains/content/Emulation.jsm b/remote/cdp/domains/content/Emulation.jsm
@@ -6,10 +6,15 @@
 
 var EXPORTED_SYMBOLS = ["Emulation"];
 
-const { ContentProcessDomain } = ChromeUtils.import(
-  "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
+var { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
 );
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  ContentProcessDomain:
+    "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm",
+});
+
 class Emulation extends ContentProcessDomain {
   // commands
 

diff --git a/remote/cdp/domains/content/Input.jsm b/remote/cdp/domains/content/Input.jsm
@@ -6,10 +6,15 @@
 
 var EXPORTED_SYMBOLS = ["Input"];
 
-const { ContentProcessDomain } = ChromeUtils.import(
-  "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
+var { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
 );
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  ContentProcessDomain:
+    "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm",
+});
+
 class Input extends ContentProcessDomain {
   constructor(session) {
     super(session);

diff --git a/remote/cdp/domains/content/Log.jsm b/remote/cdp/domains/content/Log.jsm
@@ -6,10 +6,16 @@
 
 var EXPORTED_SYMBOLS = ["Log"];
 
-const { ContentProcessDomain } = ChromeUtils.import(
-  "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
+var { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
 );
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  Services: "resource://gre/modules/Services.jsm",
+
+  ContentProcessDomain:
+    "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm",
+});
 
 const CONSOLE_MESSAGE_LEVEL_MAP = {
   [Ci.nsIConsoleMessage.debug]: "verbose",

diff --git a/remote/cdp/domains/content/Network.jsm b/remote/cdp/domains/content/Network.jsm
@@ -6,10 +6,15 @@
 
 var EXPORTED_SYMBOLS = ["Network"];
 
-const { ContentProcessDomain } = ChromeUtils.import(
-  "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
+var { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
 );
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  ContentProcessDomain:
+    "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm",
+});
+
 class Network extends ContentProcessDomain {
   // commands
 

diff --git a/remote/cdp/domains/content/Performance.jsm b/remote/cdp/domains/content/Performance.jsm
@@ -6,10 +6,15 @@
 
 var EXPORTED_SYMBOLS = ["Performance"];
 
-const { ContentProcessDomain } = ChromeUtils.import(
-  "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
+var { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
 );
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  ContentProcessDomain:
+    "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm",
+});
+
 class Performance extends ContentProcessDomain {
   constructor(session) {
     super(session);

diff --git a/remote/cdp/domains/content/Runtime.jsm b/remote/cdp/domains/content/Runtime.jsm
@@ -6,21 +6,24 @@
 
 var EXPORTED_SYMBOLS = ["Runtime"];
 
+var { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  Services: "resource://gre/modules/Services.jsm",
+
+  ContentProcessDomain:
+    "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm",
+  executeSoon: "chrome://remote/content/shared/Sync.jsm",
+  ExecutionContext:
+    "chrome://remote/content/cdp/domains/content/runtime/ExecutionContext.jsm",
+});
+
 const { addDebuggerToGlobal } = ChromeUtils.import(
   "resource://gre/modules/jsdebugger.jsm",
   {}
 );
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-const { ContentProcessDomain } = ChromeUtils.import(
-  "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
-);
-const { ExecutionContext } = ChromeUtils.import(
-  "chrome://remote/content/cdp/domains/content/runtime/ExecutionContext.jsm"
-);
-const { executeSoon } = ChromeUtils.import(
-  "chrome://remote/content/shared/Sync.jsm"
-);
 
 // Import the `Debugger` constructor in the current scope
 addDebuggerToGlobal(Cu.getGlobalForObject(this));

diff --git a/remote/cdp/domains/content/Security.jsm b/remote/cdp/domains/content/Security.jsm
@@ -6,10 +6,15 @@
 
 var EXPORTED_SYMBOLS = ["Security"];
 
-const { ContentProcessDomain } = ChromeUtils.import(
-  "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
+var { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
 );
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  ContentProcessDomain:
+    "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm",
+});
+
 class Security extends ContentProcessDomain {
   constructor(session) {
     super(session);

diff --git a/remote/cdp/domains/content/runtime/ExecutionContext.jsm b/remote/cdp/domains/content/runtime/ExecutionContext.jsm
@@ -6,8 +6,15 @@
 
 var EXPORTED_SYMBOLS = ["ExecutionContext"];
 
-const uuidGen = Cc["@mozilla.org/uuid-generator;1"].getService(
-  Ci.nsIUUIDGenerator
+var { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
+
+XPCOMUtils.defineLazyServiceGetter(
+  this,
+  "UUIDGen",
+  "@mozilla.org/uuid-generator;1",
+  "nsIUUIDGenerator"
 );
 
 const TYPED_ARRAY_CLASSES = [
@@ -23,8 +30,7 @@ const TYPED_ARRAY_CLASSES = [
 ];
 
 function uuid() {
-  return uuidGen
-    .generateUUID()
+  return UUIDGen.generateUUID()
     .toString()
     .slice(1, -1);
 }

diff --git a/remote/cdp/domains/parent/Browser.jsm b/remote/cdp/domains/parent/Browser.jsm
@@ -6,11 +6,16 @@
 
 var EXPORTED_SYMBOLS = ["Browser"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const { Domain } = ChromeUtils.import(
-  "chrome://remote/content/cdp/domains/Domain.jsm"
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
 );
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  Services: "resource://gre/modules/Services.jsm",
+
+  Domain: "chrome://remote/content/cdp/domains/Domain.jsm",
+});
+
 class Browser extends Domain {
   getVersion() {
     const { isHeadless } = Cc["@mozilla.org/gfx/info;1"].getService(

diff --git a/remote/cdp/domains/parent/Emulation.jsm b/remote/cdp/domains/parent/Emulation.jsm
@@ -6,12 +6,16 @@
 
 var EXPORTED_SYMBOLS = ["Emulation"];
 
-const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-
-const { Domain } = ChromeUtils.import(
-  "chrome://remote/content/cdp/domains/Domain.jsm"
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
 );
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  NetUtil: "resource://gre/modules/NetUtil.jsm",
+
+  Domain: "chrome://remote/content/cdp/domains/Domain.jsm",
+});
+
 const MAX_WINDOW_SIZE = 10000000;
 
 class Emulation extends Domain {

diff --git a/remote/cdp/domains/parent/IO.jsm b/remote/cdp/domains/parent/IO.jsm
@@ -12,14 +12,10 @@ const { XPCOMUtils } = ChromeUtils.import(
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   OS: "resource://gre/modules/osfile.jsm",
-});
 
-const { Domain } = ChromeUtils.import(
-  "chrome://remote/content/cdp/domains/Domain.jsm"
-);
-const { StreamRegistry } = ChromeUtils.import(
-  "chrome://remote/content/cdp/StreamRegistry.jsm"
-);
+  Domain: "chrome://remote/content/cdp/domains/Domain.jsm",
+  StreamRegistry: "chrome://remote/content/cdp/StreamRegistry.jsm",
+});
 
 const DEFAULT_CHUNK_SIZE = 10 * 1024 * 1024;
 

diff --git a/remote/cdp/domains/parent/Input.jsm b/remote/cdp/domains/parent/Input.jsm
@@ -6,12 +6,16 @@
 
 var EXPORTED_SYMBOLS = ["Input"];
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-const { Domain } = ChromeUtils.import(
-  "chrome://remote/content/cdp/domains/Domain.jsm"
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
 );
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  Services: "resource://gre/modules/Services.jsm",
+
+  Domain: "chrome://remote/content/cdp/domains/Domain.jsm",
+});
+
 class Input extends Domain {
   // commands