Bug 818382 - Support chrome debugging in Firefox for Android; r=mfinkle

Bug 818382 - Support chrome debugging in Firefox for Android; r=mfinkle

     1.1 --- a/mobile/android/chrome/content/dbg-browser-actors.js      1.2 +++ b/mobile/android/chrome/content/dbg-browser-actors.js      1.3 @@ -40,16 +40,25 @@ DeviceRootActor.prototype = new BrowserR      1.4  DeviceRootActor.prototype.onListTabs = function DRA_onListTabs() {      1.5    // Get actors for all the currently-running tabs (reusing      1.6    // existing actors where applicable), and store them in      1.7    // an ActorPool.      1.8        1.9    let actorPool = new ActorPool(this.conn);     1.10    let tabActorList = [];     1.11       1.12 +  // Get the chrome debugger actor.     1.13 +  let actor = this._chromeDebugger;     1.14 +  if (!actor) {     1.15 +    actor = new ChromeDebuggerActor(this);     1.16 +    actor.parentID = this.actorID;     1.17 +    this._chromeDebugger = actor;     1.18 +    actorPool.addActor(actor);     1.19 +  }     1.20 +     1.21    let win = windowMediator.getMostRecentWindow("navigator:browser");     1.22    this.browser = win.BrowserApp.selectedBrowser;     1.23       1.24    // Watch the window for tab closes so we can invalidate     1.25    // actors as needed.     1.26    this.watchWindow(win);     1.27       1.28    let tabs = win.BrowserApp.tabs;     1.29 @@ -83,17 +92,18 @@ DeviceRootActor.prototype.onListTabs = f     1.30    }     1.31       1.32    this._tabActorPool = actorPool;     1.33    this.conn.addActorPool(this._tabActorPool);     1.34       1.35    let response = {     1.36      "from": "root",     1.37      "selected": selected,     1.38 -    "tabs": [actor.grip() for (actor of tabActorList)]     1.39 +    "tabs": [actor.grip() for (actor of tabActorList)],     1.40 +    "chromeDebugger": this._chromeDebugger.actorID     1.41    };     1.42    this._appendExtraActors(response);     1.43    return response;     1.44  };     1.45       1.46  /**     1.47   * Return the tab container for the specified window.     1.48   */ 

Source: http://hg.mozilla.org/integration/mozilla-inbound/rev/bcbe8d700ea5

justin bieber boyfriend marianas trench camille grammer camille grammer us supreme court breaking dawn part 2 trailer mississippi state