Backed out 3 changesets (bug 1693805) for causing bc failures in browser_all_files_referenced.js

CLOSED TREE

Backed out changeset 4b6ec8e2cf78 (bug 1693805)
Backed out changeset 0a1b4a96c1cf (bug 1693805)
Backed out changeset 3c883527d366 (bug 1693805)

Author: Alexandru Michis

remote/cdp/CDP.jsm

@@ -44,44 +44,38 @@ class CDP {
   /**
    * Creates a new instance of the CDP class.
    *
-   * @param {RemoteAgent} agent
-   *     Reference to the Remote Agent instance.
+   * @param {HttpServer} server
+   *     The HTTP server that handles new connection requests.
    */
-  constructor(agent) {
-    this.agent = agent;
-    this.targetList = null;
-  }
-
-  get address() {
-    const mainTarget = this.targetList.getMainProcessTarget();
-    return mainTarget.wsDebuggerURL;
-  }
-
-  /**
-   * Starts the CDP support.
-   */
-  async start() {
-    RecommendedPreferences.applyPreferences(RECOMMENDED_PREFS);
+  constructor(server) {
+    this.server = server;
 
-    this.agent.server.registerPrefixHandler("/json/", new JSONHandler(this));
+    this.server.registerPrefixHandler("/json/", new JSONHandler(this));
 
     this.targetList = new TargetList();
     this.targetList.on("target-created", (eventName, target) => {
-      this.agent.server.registerPathHandler(target.path, target);
+      this.server.registerPathHandler(target.path, target);
     });
     this.targetList.on("target-destroyed", (eventName, target) => {
-      this.agent.server.registerPathHandler(target.path, null);
+      this.server.registerPathHandler(target.path, null);
     });
 
+    RecommendedPreferences.applyPreferences(RECOMMENDED_PREFS);
+  }
+
+  /**
+   * Starts the CDP support.
+   */
+  async start() {
     await this.targetList.watchForTargets();
 
     // Immediatly instantiate the main process target in order
     // to be accessible via HTTP endpoint on startup
-
+    const mainTarget = this.targetList.getMainProcessTarget();
     Services.obs.notifyObservers(
       null,
       "remote-listening",
-      `DevTools listening on ${this.address}`
+      `DevTools listening on ${mainTarget.wsDebuggerURL}`
     );
   }
 
@@ -90,8 +84,6 @@ class CDP {
    */
   stop() {
     this.targetList.destructor();
-    this.targetList = null;
-
     RecommendedPreferences.restorePreferences(RECOMMENDED_PREFS);
   }
 }

remote/components/RemoteAgent.jsm

@@ -11,50 +11,38 @@ const { XPCOMUtils } = ChromeUtils.import(
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Preferences: "resource://gre/modules/Preferences.jsm",
   Services: "resource://gre/modules/Services.jsm",
 
   CDP: "chrome://remote/content/cdp/CDP.jsm",
   HttpServer: "chrome://remote/content/server/HTTPD.jsm",
   Log: "chrome://remote/content/shared/Log.jsm",
-  WebDriverBiDi: "chrome://remote/content/webdriver-bidi/WebDriverBiDi.jsm",
+  Preferences: "resource://gre/modules/Preferences.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());
 
-XPCOMUtils.defineLazyGetter(this, "activeProtocols", () => {
-  const protocols = Services.prefs.getIntPref("remote.active-protocols");
-  if (protocols < 1 || protocols > 3) {
-    throw Error(`Invalid remote protocol identifier: ${protocols}`);
-  }
-
-  return protocols;
-});
+const PREF_ACTIVE_PROTOCOLS = "remote.active-protocols";
+const PREF_FORCE_LOCAL = "remote.force-local";
 
-const WEBDRIVER_BIDI_ACTIVE = 0x1;
+// const BIDI_ACTIVE = 0x1;
 const CDP_ACTIVE = 0x2;
 
-// By default force local connections only
 const LOOPBACKS = ["localhost", "127.0.0.1", "[::1]"];
-const PREF_FORCE_LOCAL = "remote.force-local";
 
 class RemoteAgentClass {
   constructor() {
+    this.cdp = null;
     this.server = null;
 
-    if ((activeProtocols & WEBDRIVER_BIDI_ACTIVE) === WEBDRIVER_BIDI_ACTIVE) {
-      this.webdriverBiDi = new WebDriverBiDi(this);
-      logger.debug("WebDriver BiDi enabled");
-    } else {
-      this.webdriverBiDi = null;
+    const protocols = Services.prefs.getIntPref(PREF_ACTIVE_PROTOCOLS);
+    if (protocols < 1 || protocols > 3) {
+      throw Error(`Invalid remote protocol identifier: ${protocols}`);
     }
+    this.activeProtocols = protocols;
+  }
 
-    if ((activeProtocols & CDP_ACTIVE) === CDP_ACTIVE) {
-      this.cdp = new CDP(this);
-      logger.debug("CDP enabled");
-    } else {
-      this.cdp = null;
-    }
+  get listening() {
+    return !!this.server && !this.server.isStopped();
   }
 
   get debuggerAddress() {
@@ -65,26 +53,6 @@ class RemoteAgentClass {
     return `${this.host}:${this.port}`;
   }
 
-  get host() {
-    // Bug 1675471: When using the nsIRemoteAgent interface the HTTPd server's
-    // primary identity ("this.server.identity.primaryHost") is lazily set.
-    return this.server?._host;
-  }
-
-  get listening() {
-    return !!this.server && !this.server.isStopped();
-  }
-
-  get port() {
-    // Bug 1675471: When using the nsIRemoteAgent interface the HTTPd server's
-    // primary identity ("this.server.identity.primaryPort") is lazily set.
-    return this.server?._port;
-  }
-
-  get scheme() {
-    return this.server?.identity.primaryScheme;
-  }
-
   listen(url) {
     if (Services.appinfo.processType != Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT) {
       throw Components.Exception(
@@ -116,6 +84,10 @@ class RemoteAgentClass {
 
     this.server = new HttpServer();
 
+    if ((this.activeProtocols & CDP_ACTIVE) === CDP_ACTIVE) {
+      this.cdp = new CDP(this.server);
+    }
+
     return this.asyncListen(host, port);
   }
 
@@ -124,7 +96,6 @@ class RemoteAgentClass {
       this.server._start(port, host);
 
       await this.cdp?.start();
-      await this.webdriverBiDi?.start();
     } catch (e) {
       await this.close();
       logger.error(`Unable to start remote agent: ${e.message}`, e);
@@ -136,7 +107,6 @@ class RemoteAgentClass {
       // Stop the CDP support before stopping the server.
       // Otherwise the HTTP server will fail to stop.
       this.cdp?.stop();
-      this.webdriverBiDi?.stop();
 
       if (this.listening) {
         return this.server.stop();
@@ -145,12 +115,40 @@ class RemoteAgentClass {
       // this function must never fail
       logger.error("unable to stop listener", e);
     } finally {
+      this.cdp = null;
       this.server = null;
     }
 
     return Promise.resolve();
   }
 
+  get scheme() {
+    if (!this.server) {
+      return null;
+    }
+    return this.server.identity.primaryScheme;
+  }
+
+  get host() {
+    if (!this.server) {
+      return null;
+    }
+
+    // Bug 1675471: When using the nsIRemoteAgent interface the HTTPd server's
+    // primary identity ("this.server.identity.primaryHost") is lazily set.
+    return this.server._host;
+  }
+
+  get port() {
+    if (!this.server) {
+      return null;
+    }
+
+    // Bug 1675471: When using the nsIRemoteAgent interface the HTTPd server's
+    // primary identity ("this.server.identity.primaryPort") is lazily set.
+    return this.server._port;
+  }
+
   // XPCOM
 
   get QueryInterface() {

remote/moz.build

@@ -7,7 +7,6 @@ DIRS += [
     "components",
     "marionette",
     "shared",
-    "webdriver-bidi",
 ]
 
 JAR_MANIFESTS += ["jar.mn"]

remote/shared/Log.jsm

@@ -41,10 +41,10 @@ XPCOMUtils.defineLazyGetter(this, "prefLogLevel", () => {
 /** E10s compatible wrapper for the standard logger from Log.jsm. */
 class Log {
   static TYPES = {
+    BIDI: "BiDi",
     CDP: "CDP",
     MARIONETTE: "Marionette",
     REMOTE_AGENT: "RemoteAgent",
-    WEBDRIVER_BIDI: "WebDriver BiDi",
   };
 
   /**

remote/shared/webdriver/Capabilities.jsm

@@ -440,9 +440,7 @@ class Capabilities extends Map {
       [
         "moz:debuggerAddress",
         // With bug 1715481 fixed always use the Remote Agent instance
-        RemoteAgent.listening && RemoteAgent.cdp
-          ? remoteAgent.debuggerAddress
-          : null,
+        RemoteAgent.cdp ? remoteAgent.debuggerAddress : null,
       ],
       [
         "moz:headless",