Bug 1957857 - [devtools] Remove backward compatibility code for cycle 139 r=devtools-reviewers,ochameau

Differential Revision: https://phabricator.services.mozilla.com/D244129

devtools/client/fronts/targets/target-mixin.js

@@ -113,7 +113,7 @@ function TargetMixin(parentClass) {
     }
 
     get targetType() {
-      return this._targetType;
+      return this.targetForm.targetType;
     }
 
     get isTopLevel() {
@@ -127,10 +127,6 @@ function TargetMixin(parentClass) {
       return this.targetForm.isTopLevelTarget;
     }
 
-    setTargetType(type) {
-      this._targetType = type;
-    }
-
     setIsTopLevel(isTopLevel) {
       if (!this.getTrait("supportsTopLevelTargetFlag")) {
         this._isTopLevel = isTopLevel;

devtools/server/actors/root.js

@@ -135,11 +135,14 @@ class RootActor extends Actor {
             "dom.worker.console.dispatch_events_to_main_thread"
           )
         : true,
-      // @backward-compat { version 137 } Process Descriptor's `getWatcher()`
+      // @backward-compat { version 143 } Process Descriptor's `getWatcher()`
       // supports a new 'enableWindowGlobalThreadActors' flag to enable
       // the WindowGlobal's thread actors when debugging the whole browser.
-      // Once 137 is released, we may keep this flag to help VS.Code know
+      // This was actually changed in 137, but we support it for VSCode until
-      // which backend supports this feature or not.
+      // ESR 140 is the only ESR available.
+      // This should happen when Firefox 143 gets released.
+      // Contact Holger Benl (hbenl) to make sure the VS Code extension is
+      // updated.
       supportsEnableWindowGlobalThreadActors: true,
     };
   }

devtools/shared/commands/target/target-command.js

@@ -249,10 +249,6 @@ class TargetCommand extends EventEmitter {
       }
     }
 
-    // Map the descriptor typeName to a target type.
-    const targetType = this.getTargetType(targetFront);
-    targetFront.setTargetType(targetType);
-
     this._targets.add(targetFront);
     try {
       await targetFront.attachAndInitThread(this);
@@ -273,7 +269,7 @@ class TargetCommand extends EventEmitter {
     this.store.dispatch(registerTarget(targetFront));
 
     // Then, once the target is attached, notify the target front creation listeners
-    await this._createListeners.emitAsync(targetType, {
+    await this._createListeners.emitAsync(targetFront.targetType, {
       targetFront,
       isTargetSwitching,
     });
@@ -446,8 +442,7 @@ class TargetCommand extends EventEmitter {
     }
 
     this.#selectedTargetFront = targetFront;
-    const targetType = this.getTargetType(targetFront);
+    await this._selectListeners.emitAsync(targetFront.targetType, {
-    await this._selectListeners.emitAsync(targetType, {
       targetFront,
     });
   }
@@ -576,7 +571,6 @@ class TargetCommand extends EventEmitter {
     // Note that this is a public attribute, used outside of this class
     // and helps knowing what is the current top level target we debug.
     this.targetFront = await this.descriptorFront.getTarget();
-    this.targetFront.setTargetType(this.getTargetType(this.targetFront));
     this.targetFront.setIsTopLevel(true);
     this._gotFirstTopLevelTarget = true;
 
@@ -724,46 +718,6 @@ class TargetCommand extends EventEmitter {
     }
   }
 
-  getTargetType(target) {
-    const { targetType } = target.targetForm;
-    if (targetType) {
-      return targetType;
-    }
-
-    // @backward-compat { version 137 } This can be removed as target.targetForm.targetType
-    // will always be defined. We can then remove TargetCommand.getTargetType and TargetMixin.setTargetType
-    // and instead have a getter like this `TargetMixin.targetType() this.targetForm.targetType`.
-    const { typeName } = target;
-    if (typeName == "windowGlobalTarget") {
-      return TargetCommand.TYPES.FRAME;
-    }
-
-    if (
-      typeName == "contentProcessTarget" ||
-      typeName == "parentProcessTarget"
-    ) {
-      return TargetCommand.TYPES.PROCESS;
-    }
-
-    if (typeName == "contentScriptTarget") {
-      return TargetCommand.TYPES.CONTENT_SCRIPT;
-    }
-
-    if (typeName == "workerDescriptor" || typeName == "workerTarget") {
-      if (target.isSharedWorker) {
-        return TargetCommand.TYPES.SHARED_WORKER;
-      }
-
-      if (target.isServiceWorker) {
-        return TargetCommand.TYPES.SERVICE_WORKER;
-      }
-
-      return TargetCommand.TYPES.WORKER;
-    }
-
-    throw new Error("Unsupported target typeName: " + typeName);
-  }
-
   _matchTargetType(type, target) {
     return type === target.targetType;
   }