DevTools: merge ScriptCallStack and ScriptAsyncCallStack, move CallStacks from console to Runtime.

third_party/WebKit/Source/devtools/front_end/promises/PromisePane.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @extends {WebInspector.VBox}
  * @implements {WebInspector.TargetManager.Observer}
  */
 WebInspector.PromisePane = function()
@@ skipping 582 matching lines @@
     /**
      * @param {!Element} anchor
      * @param {!WebInspector.Popover} popover
      */
     _showPopover: function(anchor, popover)
     {
         var node = this._dataGrid.dataGridNodeFromNode(anchor);
         var details = this._promiseDetailsByDebuggerModel.get(this._debuggerModel).get(node.promiseId());
 
         var stackTrace;
-        var asyncStackTrace;
-        if (anchor.classList.contains("created-column")) {
+        if (anchor.classList.contains("created-column"))
             stackTrace = details.creationStack;
-            asyncStackTrace = details.asyncCreationStack;
-        } else {
+        else
             stackTrace = details.settlementStack;
-            asyncStackTrace = details.asyncSettlementStack;
-        }
 
-        var content = WebInspector.DOMPresentationUtils.buildStackTracePreviewContents(this._debuggerModel.target(), this._linkifier, stackTrace, asyncStackTrace);
+        var content = WebInspector.DOMPresentationUtils.buildStackTracePreviewContents(this._debuggerModel.target(), this._linkifier, stackTrace);
         popover.setCanShrink(true);
         popover.showForAnchor(content, anchor);
     },
 
     __proto__: WebInspector.VBox.prototype
 }
 
 /**
  * @constructor
  * @extends {WebInspector.ViewportDataGridNode}
@@ skipping 60 matching lines @@
      * @override
      */
     createCells: function()
     {
         this._element.classList.toggle("promise-gc", !!this._details.isGarbageCollected);
         WebInspector.ViewportDataGridNode.prototype.createCells.call(this);
     },
 
     /**
      * @param {!Element} cell
-     * @param {?ConsoleAgent.CallFrame=} callFrame
+     * @param {?RuntimeAgent.CallFrame=} callFrame
      */
     _appendCallFrameAnchor: function(cell, callFrame)
     {
         if (!callFrame)
             return;
         var anchor = this._linkifier.linkifyConsoleCallFrame(this._debuggerModel.target(), callFrame);
         this._linkifiedAnchors.push(anchor);
         cell.appendChild(anchor);
     },
 
@@ skipping 28 matching lines @@
 
         case "function":
             cell.createTextChild(WebInspector.beautifyFunctionName(details.callFrame ? details.callFrame.functionName : ""));
             break;
 
         case "created":
             this._appendCallFrameAnchor(cell, details.callFrame);
             break;
 
         case "settled":
-            this._appendCallFrameAnchor(cell, details.settlementStack ? details.settlementStack[0] : null);
+            this._appendCallFrameAnchor(cell, details.settlementStack && details.settlementStack.callFrames.length ? details.settlementStack.callFrames[0] : null);
             break;
 
         case "tts":
             cell.createTextChild(this._ttsCellText());
             break;
         }
 
         return cell;
     },
 
     /**
      * @return {string}
      */
     _ttsCellText: function()
     {
         var details = this._details;
         if (details.creationTime && details.settlementTime && details.settlementTime >= details.creationTime)
             return Number.millisToString(details.settlementTime - details.creationTime);
         return "";
     },
 
     /**
-     * @param {?ConsoleAgent.CallFrame=} callFrame
+     * @param {?RuntimeAgent.CallFrame=} callFrame
      * @return {string}
      */
     _callFrameAnchorTextForSearch: function(callFrame)
     {
         if (!callFrame)
             return "";
         var script = callFrame.scriptId && this._debuggerModel ? this._debuggerModel.scriptForId(callFrame.scriptId) : null;
         var sourceURL = script ? script.sourceURL : callFrame.url;
         var lineNumber = callFrame.lineNumber || 0;
         return WebInspector.displayNameForURL(sourceURL) + ":" + lineNumber;
     },
 
     /**
      * @return {string}
      */
     dataTextForSearch: function()
     {
         var details = this._details;
         var texts = [
             WebInspector.beautifyFunctionName(details.callFrame ? details.callFrame.functionName : ""),
             this._callFrameAnchorTextForSearch(details.callFrame),
-            this._callFrameAnchorTextForSearch(details.settlementStack ? details.settlementStack[0] : null),
+            this._callFrameAnchorTextForSearch(details.settlementStack && details.settlementStack.callFrames.length ? details.settlementStack.callFrames[0] : null),
             this._ttsCellText().replace(/\u2009/g, " ") // \u2009 is a thin space.
         ];
         return texts.join(" ");
     },
 
     __proto__: WebInspector.ViewportDataGridNode.prototype
 }