Bug 1334293 - Use the typeName for source and thread actors. r=ochameau draft
authorJ. Ryan Stinnett <jryans@gmail.com>
Wed, 25 Jan 2017 17:44:41 -0600
changeset 466933 bd99d6ed5c7c20969b6c3f1c071e61d7203ebbc5
parent 466286 24d9eb148461bb4789848b9880867c63c783a2ca
child 466934 43b2eeaaff129cf50af2ec6f25702edcf0f856ac
push id43061
push userbmo:jryans@gmail.com
push dateThu, 26 Jan 2017 23:01:16 +0000
reviewersochameau
bugs1334293
milestone54.0a1
Bug 1334293 - Use the typeName for source and thread actors. r=ochameau MozReview-Commit-ID: IpreKTT0hrt
devtools/server/actors/common.js
--- a/devtools/server/actors/common.js
+++ b/devtools/server/actors/common.js
@@ -230,19 +230,19 @@ ActorPool.prototype = {
    * from the connection.
    *
    * @param Object actor
    *        The actor to be added to the pool.
    */
   addActor: function APAddActor(actor) {
     actor.conn = this.conn;
     if (!actor.actorID) {
-      let prefix = actor.actorPrefix;
+      // Older style actors use actorPrefix, while protocol.js-based actors use typeName
+      let prefix = actor.actorPrefix || actor.typeName;
       if (!prefix && typeof actor == "function") {
-        // typeName is a convention used with protocol.js-based actors
         prefix = actor.prototype.actorPrefix || actor.prototype.typeName;
       }
       actor.actorID = this.conn.allocID(prefix || undefined);
     }
 
     // If the actor is already in a pool, remove it without destroying it.
     if (actor.registeredPool) {
       delete actor.registeredPool._actors[actor.actorID];