Commit 3bd8c1d3 authored by Ryan VanderMeulen's avatar Ryan VanderMeulen
Browse files

Merge m-c to inbound.

parents 8e2f16f0 c68f877f

.hgtags

+1 −0
Original line number Diff line number Diff line
@@ -91,3 +91,4 @@ fd72dbbd692012224145be1bf13df1d7675fd277 FIREFOX_AURORA_17_BASE 
cf8750abee06cde395c659f8ecd8ae019d7512e3 FIREFOX_AURORA_19_BASE

5bb309998e7050c9ee80b0147de1e473f008e221 FIREFOX_AURORA_20_BASE

cc37417e2c284aed960f98ffa479de4ccdd5c7c3 FIREFOX_AURORA_21_BASE

1c070ab0f9db59f13423b9c1db60419f7a9098f9 FIREFOX_AURORA_22_BASE

b2g/confvars.sh

100755 → 100644
+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
MOZ_APP_BASENAME=B2G

MOZ_APP_VENDOR=Mozilla



MOZ_APP_VERSION=22.0a1

MOZ_APP_VERSION=23.0a1

MOZ_APP_UA_NAME=Firefox



MOZ_UA_OS_AGNOSTIC=1

browser/config/version.txt

+1 −1
Original line number Diff line number Diff line 
22.0a1
 
23.0a1

browser/devtools/commandline/Commands.jsm

+1 −0
Original line number Diff line number Diff line
@@ -14,3 +14,4 @@ Cu.import("resource:///modules/devtools/CmdInspect.jsm"); 
Cu.import("resource:///modules/devtools/CmdResize.jsm");

Cu.import("resource:///modules/devtools/CmdTilt.jsm");

Cu.import("resource:///modules/devtools/CmdScratchpad.jsm");

Cu.import("resource:///modules/devtools/cmd-profiler.jsm");

browser/devtools/debugger/DebuggerPanel.jsm

+24 −34
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ function DebuggerPanel(iframeWindow, toolbox) { 
  this.panelWin = iframeWindow;

  this._toolbox = toolbox;



  this._controller = this.panelWin.DebuggerController;

  this._view = this.panelWin.DebuggerView;

  this._controller = this.panelWin.DebuggerController;

  this._controller._target = this.target;

  this._bkp = this._controller.Breakpoints;
@@ -32,48 +32,38 @@ function DebuggerPanel(iframeWindow, toolbox) { 


DebuggerPanel.prototype = {

  /**

   * open is effectively an asynchronous constructor

   * Open is effectively an asynchronous constructor.

   *

   * @return object

   *         A Promise that is resolved when the Debugger completes opening.

   */

  open: function DebuggerPanel_open() {

    let deferred = Promise.defer();



    this._ensureOnlyOneRunningDebugger();

    let promise;



    let onDebuggerLoaded = function () {

      this.panelWin.removeEventListener("Debugger:Loaded",

                                        onDebuggerLoaded, true);

      this._isReady = true;

      this.emit("ready");

      deferred.resolve(this);

    }.bind(this);



    let onDebuggerConnected = function () {

      this.panelWin.removeEventListener("Debugger:Connected",

                                        onDebuggerConnected, true);

      this.emit("connected");

    }.bind(this);



    this.panelWin.addEventListener("Debugger:Loaded", onDebuggerLoaded, true);

    this.panelWin.addEventListener("Debugger:Connected",

                                   onDebuggerConnected, true);



    // Remote debugging gets the debuggee from a RemoteTarget object.

    if (this.target.isRemote) {

      this.panelWin._remoteFlag = true;

      return deferred.promise;

    // Local debugging needs to make the target remote.

    if (!this.target.isRemote) {

      promise = this.target.makeRemote();

    } else {

      promise = Promise.resolve(this.target);

    }



    // Local debugging needs to convert the TabTarget to a RemoteTarget.

    return this.target.makeRemote().then(function success() {

      return deferred.promise;

    return promise

      .then(() => this._controller.startupDebugger())

      .then(() => this._controller.connect())

      .then(() => {

        this.isReady = true;

        this.emit("ready");

        return this;

      })

      .then(null, function onError(aReason) {

        Cu.reportError("DebuggerPanel open failed. " +

                       reason.error + ": " + reason.message);

      });

  },



  // DevToolPanel API

  get target() this._toolbox.target,



  get isReady() this._isReady,



  destroy: function() {

    this.emit("destroyed");

    return Promise.resolve(null);