Backed out changeset 5af78a6c183e (bug 1589908) for dt failures on browser_dbg-toolbox-workers.js . CLOSED TREE

devtools/client/debugger/src/client/firefox/create.js

@@ -97,9 +97,7 @@ export function createThread(actor: string, target: Target): Thread {
     actor,
     url: target.url,
     type: getTargetType(target),
-    name: target.isWorkerTarget
-      ? target.workerName || target.name
-      : target.name,
+    name: target.name,
     serviceWorkerStatus: target.debuggerServiceWorkerStatus,
   };
 }

devtools/client/debugger/src/client/firefox/types.js

@@ -195,7 +195,6 @@ export type Target = {
   destroy: () => void,
   threadFront: ThreadFront,
   name: string,
-  workerName?: string,
   isBrowsingContext: boolean,
   isContentProcess: boolean,
   isWorkerTarget: boolean,

devtools/server/actors/targets/worker.js

@@ -125,15 +125,13 @@ const WorkerTargetActor = protocol.ActorClassWithSpec(workerTargetSpec, {
     }
 
     return connectToWorker(this.conn, this._dbg, this.actorID, options).then(
-      ({ workerName, threadActor, transport, consoleActor }) => {
-        this._workerName = workerName;
+      ({ threadActor, transport, consoleActor }) => {
         this._threadActor = threadActor;
         this._transport = transport;
         this._consoleActor = consoleActor;
 
         return {
           type: "connected",
-          workerName: this._workerName,
           threadActor: this._threadActor,
           consoleActor: this._consoleActor,
         };

devtools/server/connectors/worker-connector.js

@@ -156,7 +156,6 @@ function connectToWorker(connection, dbg, id, options) {
         connection.setForwarding(id, transport);
 
         resolve({
-          workerName: message.workerName,
           threadActor: message.threadActor,
           consoleActor: message.consoleActor,
           transport: transport,

devtools/server/startup/worker.js

@@ -123,7 +123,6 @@ this.addEventListener("message", function(event) {
         JSON.stringify({
           type: "connected",
           id: packet.id,
-          workerName: consoleActor.evaluateJS({ text: "self.name" }).result,
           threadActor: threadActor.actorID,
           consoleActor: consoleActor.actorID,
         })

devtools/shared/fronts/targets/worker.js

@@ -78,7 +78,6 @@ class WorkerTargetFront extends TargetMixin(
       const connectResponse = await this.connect({});
       // Set the console actor ID on the form to expose it to Target.attachConsole
       // Set the ThreadActor on the target form so it is accessible by getFront
-      this.workerName = connectResponse.workerName;
       this.targetForm.consoleActor = connectResponse.consoleActor;
       this.targetForm.threadActor = connectResponse.threadActor;
       this._threadActor = connectResponse.threadActor;