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

third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 197 matching lines @@
                 this._messageElement = this._format(args);
             }
         }
 
         if (consoleMessage.source !== WebInspector.ConsoleMessage.MessageSource.Network || consoleMessage.request) {
             if (consoleMessage.scriptId) {
                 this._anchorElement = this._linkifyScriptId(consoleMessage.scriptId, consoleMessage.url || "", consoleMessage.line, consoleMessage.column);
             } else {
                 var showBlackboxed = (consoleMessage.source !== WebInspector.ConsoleMessage.MessageSource.ConsoleAPI);
                 var debuggerModel = WebInspector.DebuggerModel.fromTarget(this._target());
-                var callFrame = WebInspector.DebuggerPresentationUtils.callFrameAnchorFromStackTrace(debuggerModel, consoleMessage.stackTrace, consoleMessage.asyncStackTrace, showBlackboxed);
+                var callFrame = WebInspector.DebuggerPresentationUtils.callFrameAnchorFromStackTrace(debuggerModel, consoleMessage.stackTrace, showBlackboxed);
                 if (callFrame && callFrame.scriptId)
                     this._anchorElement = this._linkifyCallFrame(callFrame);
                 else if (consoleMessage.url && consoleMessage.url !== "undefined")
                     this._anchorElement = this._linkifyLocation(consoleMessage.url, consoleMessage.line, consoleMessage.column);
             }
         }
 
         this._formattedMessage.appendChild(this._messageElement);
         if (this._anchorElement) {
             // Append a space to prevent the anchor text from being glued to the console message when the user selects and copies the console messages.
             this._anchorElement.appendChild(createTextNode(" "));
             this._formattedMessage.insertBefore(this._anchorElement, this._formattedMessage.firstChild);
         }
 
-        var dumpStackTrace = (!!consoleMessage.stackTrace || !!consoleMessage.asyncStackTrace) && (consoleMessage.source === WebInspector.ConsoleMessage.MessageSource.Network || consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.Error || consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.RevokedError || consoleMessage.type === WebInspector.ConsoleMessage.MessageType.Trace);
+        var dumpStackTrace = !!consoleMessage.stackTrace && (consoleMessage.source === WebInspector.ConsoleMessage.MessageSource.Network || consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.Error || consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.RevokedError || consoleMessage.type === WebInspector.ConsoleMessage.MessageType.Trace);
         if (dumpStackTrace) {
             var treeOutline = new TreeOutline();
             treeOutline.element.classList.add("outline-disclosure", "outline-disclosure-no-padding");
             var content = this._formattedMessage;
             var root = new TreeElement(content);
             root.toggleOnClick = true;
             root.selectable = false;
             content.treeElementForTest = root;
             treeOutline.appendChild(root);
             if (consoleMessage.type === WebInspector.ConsoleMessage.MessageType.Trace)
@@ skipping 25 matching lines @@
         var target = this._target();
         if (!target)
             return null;
         // FIXME(62725): stack trace line/column numbers are one-based.
         lineNumber = lineNumber ? lineNumber - 1 : 0;
         columnNumber = columnNumber ? columnNumber - 1 : 0;
         return this._linkifier.linkifyScriptLocation(target, null, url, lineNumber, columnNumber, "console-message-url");
     },
 
     /**
-     * @param {!ConsoleAgent.CallFrame} callFrame
+     * @param {!RuntimeAgent.CallFrame} callFrame
      * @return {?Element}
      */
     _linkifyCallFrame: function(callFrame)
     {
         var target = this._target();
         return this._linkifier.linkifyConsoleCallFrame(target, callFrame, "console-message-url");
     },
 
     /**
      * @param {string} scriptId
@@ skipping 716 matching lines @@
     },
 
     /**
      * @param {!TreeElement} parentTreeElement
      */
     _populateStackTraceTreeElement: function(parentTreeElement)
     {
         var target = this._target();
         if (!target)
             return;
-        var content = WebInspector.DOMPresentationUtils.buildStackTracePreviewContents(target,
-            this._linkifier, this._message.stackTrace, this._message.asyncStackTrace);
+        var content = WebInspector.DOMPresentationUtils.buildStackTracePreviewContents(target, this._linkifier, this._message.stackTrace);
         var treeElement = new TreeElement(content);
         treeElement.selectable = false;
         parentTreeElement.appendChild(treeElement);
     },
 
     resetIncrementRepeatCount: function()
     {
         this._repeatCount = 1;
         if (!this._repeatCountElement)
             return;
@@ skipping 305 matching lines @@
     {
         if (!this._wrapperElement) {
             WebInspector.ConsoleViewMessage.prototype.toMessageElement.call(this);
             this._wrapperElement.classList.toggle("collapsed", this._collapsed);
         }
         return this._wrapperElement;
     },
 
     __proto__: WebInspector.ConsoleViewMessage.prototype
 }