Backed out changeset 4a87ede182ca (bug 792925)
authorMihai Sucan <mihai.sucan@gmail.com>
Fri, 28 Sep 2012 13:19:40 +0100
changeset 108514 d3e7a30df2a60fbb4d5d8cb9a4d0124d69613fb7
parent 108513 b07d095ad2f47545ecd821d84bbc89209c75a549
child 108515 b5f873f18b9d190a97f126d7a26f5711ea091efa
push id82
push usershu@rfrn.org
push dateFri, 05 Oct 2012 13:20:22 +0000
bugs792925
milestone18.0a1
backs out4a87ede182ca81e35d0a39f59595a960a0975683
Backed out changeset 4a87ede182ca (bug 792925)
toolkit/devtools/debugger/server/dbg-browser-actors.js
toolkit/devtools/debugger/server/dbg-server.js
--- a/toolkit/devtools/debugger/server/dbg-browser-actors.js
+++ b/toolkit/devtools/debugger/server/dbg-browser-actors.js
@@ -136,17 +136,17 @@ BrowserRootActor.prototype = {
   /**
    * Adds dynamically-added actors from add-ons to the provided pool.
    */
   _createExtraActors: function BRA_createExtraActors(aFactories, aPool) {
     // Walk over global actors added by extensions.
     for (let name in aFactories) {
       let actor = this._extraActors[name];
       if (!actor) {
-        actor = aFactories[name].bind(null, this.conn, this);
+        actor = aFactories[name].bind(null, this.conn);
         actor.prototype = aFactories[name].prototype;
         actor.parentID = this.actorID;
         this._extraActors[name] = actor;
       }
       aPool.addActor(actor);
     }
   },
 
--- a/toolkit/devtools/debugger/server/dbg-server.js
+++ b/toolkit/devtools/debugger/server/dbg-server.js
@@ -528,17 +528,16 @@ DebuggerServerConnection.prototype = {
       } catch (e) {
         Cu.reportError(e);
         this.transport.send({
           error: "unknownError",
           message: ("error occurred while creating actor '" + actor.name +
                     "': " + safeErrorString(e))
         });
       }
-      instance.parentID = actor.parentID;
       // We want the newly-constructed actor to completely replace the factory
       // actor. Reusing the existing actor ID will make sure ActorPool.addActor
       // does the right thing.
       instance.actorID = actor.actorID;
       actor.registeredPool.addActor(instance);
       actor = instance;
     }