Bug 795691 - b2g fixes for the web console actors. r=past,vingtetun,ttaubert, a=bajaj
authorMihai Sucan <mihai.sucan@gmail.com>
Tue, 30 Oct 2012 18:59:09 +0200
changeset 113854 02bf38dae079ffabfa8d1d32c30ef508f3142ce1
parent 113853 59f2d425581b5135a147a7ae0ea5fb0080937344
child 113855 1d407736951c3e040d06cbe2263d20a88e34ae26
push id2531
push userryanvm@gmail.com
push dateThu, 01 Nov 2012 10:53:59 +0000
treeherdermozilla-aurora@02bf38dae079 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspast, vingtetun, ttaubert, bajaj
bugs795691
milestone18.0a2
Bug 795691 - b2g fixes for the web console actors. r=past,vingtetun,ttaubert, a=bajaj
b2g/chrome/content/dbg-browser-actors.js
toolkit/devtools/webconsole/dbg-webconsole-actors.js
--- a/b2g/chrome/content/dbg-browser-actors.js
+++ b/b2g/chrome/content/dbg-browser-actors.js
@@ -112,17 +112,17 @@ DeviceTabActor.prototype.grip = function
   let response = {
     'actor': this.actorID,
     'title': this.browser.title,
     'url': this.browser.document.documentURI
   };
 
   // Walk over tab actors added by extensions and add them to a new ActorPool.
   let actorPool = new ActorPool(this.conn);
-  this._createExtraActors(DebuggerServer.globalActorFactories, actorPool);
+  this._createExtraActors(DebuggerServer.tabActorFactories, actorPool);
   if (!actorPool.isEmpty()) {
     this._tabActorPool = actorPool;
     this.conn.addActorPool(this._tabActorPool);
   }
 
   this._appendExtraActors(response);
   return response;
 };
--- a/toolkit/devtools/webconsole/dbg-webconsole-actors.js
+++ b/toolkit/devtools/webconsole/dbg-webconsole-actors.js
@@ -350,16 +350,18 @@ WebConsoleActor.prototype =
             break;
           }
           if (!this.consoleProgressListener) {
             this.consoleProgressListener =
               new ConsoleProgressListener(this._browser, this);
           }
           this.consoleProgressListener.startMonitor(this.consoleProgressListener.
                                                     MONITOR_LOCATION_CHANGE);
+          startedListeners.push(listener);
+          break;
       }
     }
     return {
       startedListeners: startedListeners,
       nativeConsoleAPI: this.hasNativeConsoleAPI(),
     };
   },