DevTools: Introduce Debugger.StackTrace structure in protocol.json

Source/devtools/front_end/DebuggerModel.js

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 374 matching lines @@
         this._scripts[scriptId].editSource(newSource, this._didEditScriptSource.bind(this, scriptId, newSource, callback));
     },
 
     /**
      * @param {DebuggerAgent.ScriptId} scriptId
      * @param {string} newSource
      * @param {function(?Protocol.Error, DebuggerAgent.SetScriptSourceError=)} callback
      * @param {?Protocol.Error} error
      * @param {DebuggerAgent.SetScriptSourceError=} errorData
      * @param {!Array.<DebuggerAgent.CallFrame>=} callFrames
+     * @param {DebuggerAgent.StackTrace=} asyncStackTrace
      * @param {boolean=} needsStepIn
      */
-    _didEditScriptSource: function(scriptId, newSource, callback, error, errorData, callFrames, needsStepIn)
+    _didEditScriptSource: function(scriptId, newSource, callback, error, errorData, callFrames, asyncStackTrace, needsStepIn)
     {
         callback(error, errorData);
         if (needsStepIn)
             this.stepInto();
         else if (!error && callFrames && callFrames.length)
-            this._pausedScript(callFrames, this._debuggerPausedDetails.reason, this._debuggerPausedDetails.auxData, this._debuggerPausedDetails.breakpointIds);
+            this._pausedScript(callFrames, this._debuggerPausedDetails.reason, this._debuggerPausedDetails.auxData, this._debuggerPausedDetails.breakpointIds, asyncStackTrace);
     },
 
     /**
      * @return {?Array.<WebInspector.DebuggerModel.CallFrame>}
      */
     get callFrames()
     {
         return this._debuggerPausedDetails ? this._debuggerPausedDetails.callFrames : null;
     },
 
@@ skipping 22 matching lines @@
             this.setSelectedCallFrame(null);
             DebuggerAgent.setOverlayMessage();
         }
     },
 
     /**
      * @param {!Array.<DebuggerAgent.CallFrame>} callFrames
      * @param {string} reason
      * @param {Object|undefined} auxData
      * @param {!Array.<string>} breakpointIds
+     * @param {DebuggerAgent.StackTrace=} asyncStackTrace
      */
-    _pausedScript: function(callFrames, reason, auxData, breakpointIds)
+    _pausedScript: function(callFrames, reason, auxData, breakpointIds, asyncStackTrace)
     {
         if (this._pendingStepIntoLocation) {
             var requestedLocation = this._pendingStepIntoLocation;
             delete this._pendingStepIntoLocation;
 
             if (callFrames.length > 0) {
                 var topLocation = callFrames[0].location;
                 if (topLocation.lineNumber == requestedLocation.lineNumber && topLocation.columnNumber == requestedLocation.columnNumber && topLocation.scriptId == requestedLocation.scriptId) {
                     this.stepInto();
                     return;
                 }
             }
         }
 
-        this._setDebuggerPausedDetails(new WebInspector.DebuggerPausedDetails(this, callFrames, reason, auxData, breakpointIds));
+        this._setDebuggerPausedDetails(new WebInspector.DebuggerPausedDetails(this, callFrames, reason, auxData, breakpointIds, asyncStackTrace));
     },
 
     _resumedScript: function()
     {
         this._setDebuggerPausedDetails(null);
         this.dispatchEventToListeners(WebInspector.DebuggerModel.Events.DebuggerResumed);
     },
 
     /**
      * @param {DebuggerAgent.ScriptId} scriptId
@@ skipping 203 matching lines @@
         if (!script)
             return null;
         return script.rawLocationToUILocation(rawLocation.lineNumber, rawLocation.columnNumber);
     },
 
     /**
      * Handles notification from JavaScript VM about updated stack (liveedit or frame restart action).
      * @this {WebInspector.DebuggerModel}
      * @param {!Array.<DebuggerAgent.CallFrame>=} newCallFrames
      * @param {Object=} details
+     * @param {DebuggerAgent.StackTrace=} asyncStackTrace
      */
-    callStackModified: function(newCallFrames, details)
+    callStackModified: function(newCallFrames, details, asyncStackTrace)
     {
         // FIXME: declare this property in protocol and in JavaScript.
         if (details && details["stack_update_needs_step_in"])
             this.stepInto();
-        else {
-            if (newCallFrames && newCallFrames.length)
-                this._pausedScript(newCallFrames, this._debuggerPausedDetails.reason, this._debuggerPausedDetails.auxData, this._debuggerPausedDetails.breakpointIds);
-
-        }
+        else if (newCallFrames && newCallFrames.length)
+            this._pausedScript(newCallFrames, this._debuggerPausedDetails.reason, this._debuggerPausedDetails.auxData, this._debuggerPausedDetails.breakpointIds, asyncStackTrace);
     },
 
     __proto__: WebInspector.Object.prototype
 }
 
 WebInspector.DebuggerModel.applySkipStackFrameSettings = function()
 {
     if (!WebInspector.experimentsSettings.frameworksDebuggingSupport.isEnabled())
         return;
     var settings = WebInspector.settings;
@@ skipping 16 matching lines @@
 {
     this._debuggerModel = debuggerModel;
 }
 
 WebInspector.DebuggerDispatcher.prototype = {
     /**
      * @param {!Array.<DebuggerAgent.CallFrame>} callFrames
      * @param {string} reason
      * @param {Object=} auxData
      * @param {!Array.<string>=} breakpointIds
+     * @param {DebuggerAgent.StackTrace=} asyncStackTrace
      */
-    paused: function(callFrames, reason, auxData, breakpointIds)
+    paused: function(callFrames, reason, auxData, breakpointIds, asyncStackTrace)
     {
-        this._debuggerModel._pausedScript(callFrames, reason, auxData, breakpointIds || []);
+        this._debuggerModel._pausedScript(callFrames, reason, auxData, breakpointIds || [], asyncStackTrace);
     },
 
     resumed: function()
     {
         this._debuggerModel._resumedScript();
     },
 
     globalObjectCleared: function()
     {
         this._debuggerModel._globalObjectCleared();
@@ skipping 146 matching lines @@
     /**
      * @param {function(?Protocol.Error=)=} callback
      */
     restart: function(callback)
     {
         /**
          * @this {WebInspector.DebuggerModel.CallFrame}
          * @param {?Protocol.Error} error
          * @param {!Array.<DebuggerAgent.CallFrame>=} callFrames
          * @param {Object=} details
+         * @param {DebuggerAgent.StackTrace=} asyncStackTrace
          */
-        function protocolCallback(error, callFrames, details)
+        function protocolCallback(error, callFrames, details, asyncStackTrace)
         {
             if (!error)
-                WebInspector.debuggerModel.callStackModified(callFrames, details);
+                WebInspector.debuggerModel.callStackModified(callFrames, details, asyncStackTrace);
             if (callback)
                 callback(error);
         }
         DebuggerAgent.restartFrame(this._payload.callFrameId, protocolCallback);
     },
 
     /**
      * @param {function(!Array.<DebuggerAgent.Location>)} callback
      */
     getStepIntoLocations: function(callback)
@@ skipping 34 matching lines @@
     }
 }
 
 /**
  * @constructor
  * @param {WebInspector.DebuggerModel} model
  * @param {!Array.<DebuggerAgent.CallFrame>} callFrames
  * @param {string} reason
  * @param {Object|undefined} auxData
  * @param {!Array.<string>} breakpointIds
+ * @param {DebuggerAgent.StackTrace=} asyncStackTrace
  */
-WebInspector.DebuggerPausedDetails = function(model, callFrames, reason, auxData, breakpointIds)
+WebInspector.DebuggerPausedDetails = function(model, callFrames, reason, auxData, breakpointIds, asyncStackTrace)
 {
     this.callFrames = [];
     for (var i = 0; i < callFrames.length; ++i) {
         var callFrame = callFrames[i];
         var script = model.scriptForId(callFrame.location.scriptId);
         if (script)
             this.callFrames.push(new WebInspector.DebuggerModel.CallFrame(script, callFrame));
     }
     this.reason = reason;
     this.auxData = auxData;
     this.breakpointIds = breakpointIds;
+    this.asyncStackTrace = asyncStackTrace;
 }
 
 WebInspector.DebuggerPausedDetails.prototype = {
     dispose: function()
     {
         for (var i = 0; i < this.callFrames.length; ++i) {
             var callFrame = this.callFrames[i];
             callFrame.dispose();
         }
     }
 }
 
 /**
  * @type {?WebInspector.DebuggerModel}
  */
 WebInspector.debuggerModel = null;