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

third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2012 Intel 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.
@@ skipping 201 matching lines @@
         return true;
     case recordTypes.MarkDOMContent:
     case recordTypes.MarkLoad:
         return event.args["data"]["isMainFrame"];
     default:
         return false;
     }
 }
 
 /**
- * @param {!ConsoleAgent.CallFrame} frame
+ * @param {!RuntimeAgent.CallFrame} frame
  * @return {boolean}
  */
 WebInspector.TimelineUIUtils.isUserFrame = function(frame)
 {
     return frame.scriptId !== "0" && !frame.url.startsWith("native ");
 }
 
 /**
  * @param {!WebInspector.TracingModel.Event} event
- * @return {?ConsoleAgent.CallFrame}
+ * @return {?RuntimeAgent.CallFrame}
  */
 WebInspector.TimelineUIUtils.topStackFrame = function(event)
 {
-    var stackTrace = event.stackTrace || event.initiator && event.initiator.stackTrace;
-    return stackTrace && stackTrace.length ? stackTrace[0] : null;
+    var callFrames = event.stackTrace;
+    if (!callFrames)
+        callFrames = event.initiator && event.initiator.stack ? event.initiator.stack.callFrames : null;

[dgozman, 2016/02/04 01:43:06]

Double-check.

[pfeldman, 2016/02/04 03:16:00]

Done.

+    return callFrames && callFrames.length ? callFrames[0] : null;
 }
 
 /**
  * @enum {symbol}
  */
 WebInspector.TimelineUIUtils.NetworkCategory = {
     HTML: Symbol("HTML"),
     Script: Symbol("Script"),
     Style: Symbol("Style"),
     Media: Symbol("Media"),
@@ skipping 492 matching lines @@
 
     var relatedNode = relatedNodesMap && relatedNodesMap.get(event.backendNodeId);
     if (relatedNode)
         contentHelper.appendElementRow(relatedNodeLabel || WebInspector.UIString("Related Node"), WebInspector.DOMPresentationUtils.linkifyNodeReference(relatedNode));
 
     if (event.previewElement) {
         contentHelper.addSection(WebInspector.UIString("Preview"));
         contentHelper.appendElementRow("", event.previewElement);
     }
 
-    if (event.stackTrace || (event.initiator && event.initiator.stackTrace) || event.invalidationTrackingEvents)
+    if (event.stackTrace || (event.initiator && event.initiator.stack) || event.invalidationTrackingEvents)
         WebInspector.TimelineUIUtils._generateCauses(event, model.target(), relatedNodesMap, contentHelper);
 
     var showPieChart = detailed && WebInspector.TimelineUIUtils._aggregatedStatsForTraceEvent(stats, model, event);
     if (showPieChart) {
         contentHelper.addSection(WebInspector.UIString("Aggregated Time"));
         var pieChart = WebInspector.TimelineUIUtils.generatePieChart(stats, WebInspector.TimelineUIUtils.eventStyle(event).category, event.selfTime);
         contentHelper.appendElementRow("", pieChart);
     }
 
     return contentHelper.fragment;
@@ skipping 152 matching lines @@
     function appendPreview(element)
     {
         if (element)
             contentHelper.appendElementRow(WebInspector.UIString("Preview"), request.previewElement);
         return contentHelper.fragment;
     }
     return previewPromise.then(appendPreview);
 }
 
 /**
+ * @param {!Array<!RuntimeAgent.CallFrame>} callFrames
+ * @return {!RuntimeAgent.StackTrace}
+ */
+WebInspector.TimelineUIUtils._stackTraceFromCallFrames = function(callFrames)
+{
+    return /** @type {!RuntimeAgent.StackTrace} */ ({ callFrames: callFrames });
+}
+
+/**
  * @param {!WebInspector.TracingModel.Event} event
  * @param {?WebInspector.Target} target
  * @param {?Map<number, ?WebInspector.DOMNode>} relatedNodesMap
  * @param {!WebInspector.TimelineDetailsContentHelper} contentHelper
  */
 WebInspector.TimelineUIUtils._generateCauses = function(event, target, relatedNodesMap, contentHelper)
 {
     var recordTypes = WebInspector.TimelineModel.RecordType;
 
     var callSiteStackLabel;
@@ skipping 16 matching lines @@
         break;
     case recordTypes.Layout:
         callSiteStackLabel = WebInspector.UIString("First Layout Invalidation");
         stackLabel = WebInspector.UIString("Layout Forced");
         break;
     }
 
     // Direct cause.
     if (event.stackTrace && event.stackTrace.length) {
         contentHelper.addSection(WebInspector.UIString("Call Stacks"));
-        contentHelper.appendStackTrace(stackLabel || WebInspector.UIString("Stack Trace"), event.stackTrace);
+        contentHelper.appendStackTrace(stackLabel || WebInspector.UIString("Stack Trace"), WebInspector.TimelineUIUtils._stackTraceFromCallFrames(event.stackTrace));
     }
 
     // Indirect causes.
     if (event.invalidationTrackingEvents && target) { // Full invalidation tracking (experimental).
         contentHelper.addSection(WebInspector.UIString("Invalidations"));
         WebInspector.TimelineUIUtils._generateInvalidations(event, target, relatedNodesMap, contentHelper);
-    } else if (initiator && initiator.stackTrace) { // Partial invalidation tracking.
-        contentHelper.appendStackTrace(callSiteStackLabel || WebInspector.UIString("First Invalidated"), initiator.stackTrace);
+    } else if (initiator && initiator.stack) { // Partial invalidation tracking.
+        contentHelper.appendStackTrace(callSiteStackLabel || WebInspector.UIString("First Invalidated"), initiator.stack);
     }
 }
 
 /**
  * @param {!WebInspector.TracingModel.Event} event
  * @param {!WebInspector.Target} target
  * @param {?Map<number, ?WebInspector.DOMNode>} relatedNodesMap
  * @param {!WebInspector.TimelineDetailsContentHelper} contentHelper
  */
 WebInspector.TimelineUIUtils._generateInvalidations = function(event, target, relatedNodesMap, contentHelper)
@@ skipping 147 matching lines @@
      * @override
      */
     onpopulate: function()
     {
         var content = createElementWithClass("div", "content");
 
         var first = this._invalidations[0];
         if (first.cause.stackTrace) {
             var stack = content.createChild("div");
             stack.createTextChild(WebInspector.UIString("Stack trace:"));
-            this._contentHelper.createChildStackTraceElement(stack, first.cause.stackTrace);
+            this._contentHelper.createChildStackTraceElement(stack, WebInspector.TimelineUIUtils._stackTraceFromCallFrames(first.cause.stackTrace));
         }
 
         content.createTextChild(this._invalidations.length > 1 ? WebInspector.UIString("Nodes:") : WebInspector.UIString("Node:"));
         var nodeList = content.createChild("div", "node-list");
         var firstNode = true;
         for (var i = 0; i < this._invalidations.length; i++) {
             var invalidation = this._invalidations[i];
             var invalidationNode = this._createInvalidationNode(invalidation, true);
             if (invalidationNode) {
                 if (!firstNode)
@@ skipping 799 matching lines @@
         if (!this._linkifier || !this._target)
             return;
         var locationContent = createElement("span");
         locationContent.appendChild(this._linkifier.linkifyScriptLocation(this._target, null, url, startLine - 1));
         locationContent.createTextChild(String.sprintf(" [%s\u2026%s]", startLine, endLine || ""));
         this.appendElementRow(title, locationContent);
     },
 
     /**
      * @param {string} title
-     * @param {!Array.<!ConsoleAgent.CallFrame>} stackTrace
+     * @param {!RuntimeAgent.StackTrace} stackTrace
      */
     appendStackTrace: function(title, stackTrace)
     {
         if (!this._linkifier || !this._target)
             return;
 
         var rowElement = this._tableElement.createChild("div", "timeline-details-view-row");
         rowElement.createChild("div", "timeline-details-view-row-title").textContent = title;
         this.createChildStackTraceElement(rowElement, stackTrace);
     },
 
     /**
      * @param {!Element} parentElement
-     * @param {!Array.<!ConsoleAgent.CallFrame>} stackTrace
+     * @param {!RuntimeAgent.StackTrace} stackTrace
      */
     createChildStackTraceElement: function(parentElement, stackTrace)
     {
         if (!this._linkifier || !this._target)
             return;
         parentElement.classList.add("timeline-details-stack-values");
         var stackTraceElement = parentElement.createChild("div", "timeline-details-view-row-value timeline-details-view-row-stack-trace");
         var callFrameElem = WebInspector.DOMPresentationUtils.buildStackTracePreviewContents(this._target, this._linkifier, stackTrace);
         stackTraceElement.appendChild(callFrameElem);
     },
@@ skipping 38 matching lines @@
     case warnings.V8Deopt:
         span.appendChild(WebInspector.linkifyURLAsNode("https://github.com/GoogleChrome/devtools-docs/issues/53",
             WebInspector.UIString("Not optimized"), undefined, true));
         span.createTextChild(WebInspector.UIString(": %s", eventData["deoptReason"]));
         break;
     default:
         console.assert(false, "Unhandled TimelineModel.WarningType");
     }
     return span;
 }