DevTools: extract TimelineModel.Record from TimelinePresentationModel.Record.

Source/devtools/front_end/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 91 matching lines @@
     recordStyles[recordTypes.WebSocketSendHandshakeRequest] = { title: WebInspector.UIString("Send WebSocket Handshake"), category: categories["scripting"] };
     recordStyles[recordTypes.WebSocketReceiveHandshakeResponse] = { title: WebInspector.UIString("Receive WebSocket Handshake"), category: categories["scripting"] };
     recordStyles[recordTypes.WebSocketDestroy] = { title: WebInspector.UIString("Destroy WebSocket"), category: categories["scripting"] };
     recordStyles[recordTypes.EmbedderCallback] = { title: WebInspector.UIString("Embedder Callback"), category: categories["scripting"] };
 
     WebInspector.TimelineUIUtils._recordStylesMap = recordStyles;
     return recordStyles;
 }
 
 /**
- * @param {!TimelineAgent.TimelineEvent} record
+ * @param {!WebInspector.TimelineModel.Record} record
  * @return {!{title: string, category: !WebInspector.TimelineCategory}}
  */
 WebInspector.TimelineUIUtils.recordStyle = function(record)
 {
     var recordStyles = WebInspector.TimelineUIUtils._initRecordStyles();
     var result = recordStyles[record.type];
     if (!result) {
         result = {
             title: WebInspector.UIString("Unknown: %s", record.type),
             category: WebInspector.TimelineUIUtils.categories()["other"]
         };
         recordStyles[record.type] = result;
     }
     return result;
 }
 
 /**
- * @param {!TimelineAgent.TimelineEvent} record
+ * @param {!WebInspector.TimelineModel.Record} record
  * @return {!WebInspector.TimelineCategory}
  */
 WebInspector.TimelineUIUtils.categoryForRecord = function(record)
 {
     return WebInspector.TimelineUIUtils.recordStyle(record).category;
 }
 
 /**
- * @param {!TimelineAgent.TimelineEvent} record
+ * @param {!WebInspector.TimelineModel.Record} record
  */
 WebInspector.TimelineUIUtils.isEventDivider = function(record)
 {
     var recordTypes = WebInspector.TimelineModel.RecordType;
     if (record.type === recordTypes.TimeStamp)
         return true;
     if (record.type === recordTypes.MarkFirstPaint)
         return true;
     if (record.type === recordTypes.MarkDOMContent || record.type === recordTypes.MarkLoad) {
         if (record.data && ((typeof record.data.isMainFrame) === "boolean"))
@@ skipping 75 matching lines @@
     var contentHelper = new WebInspector.TimelinePopupContentHelper(info.name);
     var durationText = WebInspector.UIString("%s (at %s)", Number.millisToString(duration, true),
         Number.millisToString(startTime - model.minimumRecordTime(), true));
     contentHelper.appendTextRow(WebInspector.UIString("Duration"), durationText);
     contentHelper.appendTextRow(WebInspector.UIString("CPU time"), Number.millisToString(cpuTime, true));
     contentHelper.appendTextRow(WebInspector.UIString("Message Count"), messageCount);
     return contentHelper.contentTable();
 }
 
 /**
- * @param {!TimelineAgent.TimelineEvent} record
+ * @param {!WebInspector.TimelineModel.Record} record
  * @return {string}
  */
 WebInspector.TimelineUIUtils.recordTitle = function(record)
 {
     if (record.type === WebInspector.TimelineModel.RecordType.TimeStamp)
         return record.data["message"];
     if (WebInspector.TimelineUIUtils.isEventDivider(record)) {
         var startTime = Number.millisToString(record.startTimeOffset);
         return WebInspector.UIString("%s at %s", WebInspector.TimelineUIUtils.recordStyle(record).title, startTime, true);
     }
     return WebInspector.TimelineUIUtils.recordStyle(record).title;
 }
 
 /**
  * @param {!Object} total
  * @param {!Object} addend
  */
 WebInspector.TimelineUIUtils.aggregateTimeByCategory = function(total, addend)
 {
     for (var category in addend)
         total[category] = (total[category] || 0) + addend[category];
 }
 
 /**
  * @param {!Object} total
- * @param {!TimelineAgent.TimelineEvent} rawRecord
+ * @param {!WebInspector.TimelineModel.Record} record
  */
-WebInspector.TimelineUIUtils.aggregateTimeForRecord = function(total, rawRecord)
+WebInspector.TimelineUIUtils.aggregateTimeForRecord = function(total, record)
 {
     var childrenTime = 0;
-    var children = rawRecord["children"] || [];
+    var children = record.children;
     for (var i = 0; i < children.length; ++i) {
         WebInspector.TimelineUIUtils.aggregateTimeForRecord(total, children[i]);
         childrenTime += children[i].endTime - children[i].startTime;
     }
-    var categoryName = WebInspector.TimelineUIUtils.recordStyle(rawRecord).category.name;
-    var ownTime = rawRecord.endTime - rawRecord.startTime - childrenTime;
+    var categoryName = WebInspector.TimelineUIUtils.recordStyle(record).category.name;
+    var ownTime = record.endTime - record.startTime - childrenTime;
     total[categoryName] = (total[categoryName] || 0) + ownTime;
 }
 
 /**
  * @param {!Object} aggregatedStats
  */
 WebInspector.TimelineUIUtils._generateAggregatedInfo = function(aggregatedStats)
 {
     var cell = document.createElement("span");
     cell.className = "timeline-aggregated-info";
@@ skipping 142 matching lines @@
         ".timeline-details-view .timeline-" + category.name + ", " +
         ".timeline-category-" + category.name + " .timeline-tree-icon"
 
     return selector + " { background-image: linear-gradient(" +
        category.fillColorStop0 + ", " + category.fillColorStop1 + " 25%, " + category.fillColorStop1 + " 25%, " + category.fillColorStop1 + ");" +
        " border-color: " + category.borderColor +
        "}";
 }
 
 /**
- * @param {!WebInspector.TimelinePresentationModel.Record} record
+ * @param {!WebInspector.TimelineModel.Record} record
  * @param {!WebInspector.Linkifier} linkifier
  * @param {function(!DocumentFragment)} callback
  */
 WebInspector.TimelineUIUtils.generatePopupContent = function(record, linkifier, callback)
 {
-    var imageElement = /** @type {?Element} */ (record.getUserObject("TimelinePresentationModel::preview-element") || null);
-    var relatedNode = /** @type {?WebInspector.DOMNode} */ (record.getUserObject("TimelinePresentationModel::related-node") || null);
+    var imageElement = /** @type {?Element} */ (record.getUserObject("TimelineUIUtils::preview-element") || null);
+    var relatedNode = /** @type {?WebInspector.DOMNode} */ (record.getUserObject("TimelineUIUtils::related-node") || null);
 
     var barrier = new CallbackBarrier();
     if (!imageElement && WebInspector.TimelineUIUtils.needsPreviewElement(record.type))
         WebInspector.DOMPresentationUtils.buildImagePreviewContents(record.url, false, barrier.createCallback(saveImage));
     if (!relatedNode && record.relatedBackendNodeId())
         WebInspector.domAgent.pushNodeByBackendIdToFrontend(record.relatedBackendNodeId(), barrier.createCallback(saveNode));
     barrier.callWhenDone(callbackWrapper);
 
     /**
      * @param {!Element=} element
      */
     function saveImage(element)
     {
         imageElement = element || null;
-        record.setUserObject("TimelinePresentationModel::preview-element", element);
+        record.setUserObject("TimelineUIUtils::preview-element", element);
     }
 
     /**
      * @param {?DOMAgent.NodeId} nodeId
      */
     function saveNode(nodeId)
     {
         if (nodeId !== null) {
             relatedNode = WebInspector.domAgent.nodeForId(nodeId);
-            record.setUserObject("TimelinePresentationModel::related-node", relatedNode);
+            record.setUserObject("TimelineUIUtils::related-node", relatedNode);
         }
     }
 
-    /**
-     * @this {WebInspector.TimelinePresentationModel.Record}
-     */
     function callbackWrapper()
     {
         callback(WebInspector.TimelineUIUtils._generatePopupContentSynchronously(record, linkifier, imageElement, relatedNode));
     }
 }
 
 /**
- * @param {!WebInspector.TimelinePresentationModel.Record} record
+ * @param {!WebInspector.TimelineModel.Record} record
  * @param {!WebInspector.Linkifier} linkifier
  * @param {?Element} imagePreviewElement
  * @param {?WebInspector.DOMNode} relatedNode
  * @return {!DocumentFragment}
  */
 WebInspector.TimelineUIUtils._generatePopupContentSynchronously = function(record, linkifier, imagePreviewElement, relatedNode)
 {
     var fragment = document.createDocumentFragment();
-    if (!record.coalesced && record.children.length)
+    if (record.children.length)
         fragment.appendChild(WebInspector.TimelineUIUtils.generatePieChart(record.aggregatedStats, record.category, record.selfTime));
-    else
-        fragment.appendChild(WebInspector.TimelineUIUtils.generatePieChart(record.aggregatedStats));
-
-    if (record.coalesced)
-        return fragment;
 
     const recordTypes = WebInspector.TimelineModel.RecordType;
 
     // The messages may vary per record type;
     var callSiteStackTraceLabel;
     var callStackLabel;
     var relatedNodeLabel;
 
     var contentHelper = new WebInspector.TimelineDetailsContentHelper(linkifier, true);
     contentHelper.appendTextRow(WebInspector.UIString("Self Time"), Number.millisToString(record.selfTime, true));
@@ skipping 41 matching lines @@
                 contentHelper.appendTextRow(WebInspector.UIString("Encoded Data Length"), WebInspector.UIString("%d Bytes", record.data["encodedDataLength"]));
             break;
         case recordTypes.EvaluateScript:
             if (record.data && record.url)
                 contentHelper.appendLocationRow(WebInspector.UIString("Script"), record.url, record.data["lineNumber"]);
             break;
         case recordTypes.Paint:
             var clip = record.data["clip"];
             if (clip) {
                 contentHelper.appendTextRow(WebInspector.UIString("Location"), WebInspector.UIString("(%d, %d)", clip[0], clip[1]));
-                var clipWidth = WebInspector.TimelinePresentationModel.quadWidth(clip);
-                var clipHeight = WebInspector.TimelinePresentationModel.quadHeight(clip);
+                var clipWidth = WebInspector.TimelineUIUtils._quadWidth(clip);
+                var clipHeight = WebInspector.TimelineUIUtils._quadHeight(clip);
                 contentHelper.appendTextRow(WebInspector.UIString("Dimensions"), WebInspector.UIString("%d × %d", clipWidth, clipHeight));
             } else {
                 // Backward compatibility: older version used x, y, width, height fields directly in data.
                 if (typeof record.data["x"] !== "undefined" && typeof record.data["y"] !== "undefined")
                     contentHelper.appendTextRow(WebInspector.UIString("Location"), WebInspector.UIString("(%d, %d)", record.data["x"], record.data["y"]));
                 if (typeof record.data["width"] !== "undefined" && typeof record.data["height"] !== "undefined")
                     contentHelper.appendTextRow(WebInspector.UIString("Dimensions"), WebInspector.UIString("%d\u2009\u00d7\u2009%d", record.data["width"], record.data["height"]));
             }
             // Fall-through intended.
 
@@ skipping 90 matching lines @@
         var ul = document.createElement("ul");
         for (var i = 0; i < record.warnings.length; ++i)
             ul.createChild("li").textContent = record.warnings[i];
         contentHelper.appendElementRow(WebInspector.UIString("Warning"), ul);
     }
     fragment.appendChild(contentHelper.element);
     return fragment;
 }
 
 /**
- * @param {!WebInspector.TimelinePresentationModel.Record} record
+ * @param {!Array.<number>} quad
+ * @return {number}
+ */
+WebInspector.TimelineUIUtils._quadWidth = function(quad)
+{
+    return Math.round(Math.sqrt(Math.pow(quad[0] - quad[2], 2) + Math.pow(quad[1] - quad[3], 2)));
+}
+
+/**
+ * @param {!Array.<number>} quad
+ * @return {number}
+ */
+WebInspector.TimelineUIUtils._quadHeight = function(quad)
+{
+    return Math.round(Math.sqrt(Math.pow(quad[0] - quad[6], 2) + Math.pow(quad[1] - quad[7], 2)));
+}
+
+/**
+ * @param {!WebInspector.TimelineModel.Record} record
  * @param {!WebInspector.Linkifier} linkifier
  * @return {?Node}
  */
 WebInspector.TimelineUIUtils.buildDetailsNode = function(record, linkifier)
 {
     var details;
     var detailsText;
-    if (record.coalesced) {
-        var node = document.createElement("span");
-        node.textContent = WebInspector.UIString("× %d", record.children.length);
-        return node;
-    }
 
     switch (record.type) {
     case WebInspector.TimelineModel.RecordType.GCEvent:
         detailsText = WebInspector.UIString("%s collected", Number.bytesToString(record.data["usedHeapSizeDelta"]));
         break;
     case WebInspector.TimelineModel.RecordType.TimerFire:
         details = linkifyScriptLocation();
         detailsText = record.data["timerId"];
         break;
     case WebInspector.TimelineModel.RecordType.FunctionCall:
         if (record.scriptName)
             details = linkifyLocation(record.scriptName, record.scriptLine, 0);
         break;
     case WebInspector.TimelineModel.RecordType.FireAnimationFrame:
         details = linkifyScriptLocation();
         detailsText = record.data["id"];
         break;
     case WebInspector.TimelineModel.RecordType.EventDispatch:
         detailsText = record.data ? record.data["type"] : null;
         break;
     case WebInspector.TimelineModel.RecordType.Paint:
-        var width = record.data.clip ? WebInspector.TimelinePresentationModel.quadWidth(record.data.clip) : record.data.width;
-        var height = record.data.clip ? WebInspector.TimelinePresentationModel.quadHeight(record.data.clip) : record.data.height;
+        var width = record.data.clip ? WebInspector.TimelineUIUtils._quadWidth(record.data.clip) : record.data.width;
+        var height = record.data.clip ? WebInspector.TimelineUIUtils._quadHeight(record.data.clip) : record.data.height;
         if (width && height)
             detailsText = WebInspector.UIString("%d\u2009\u00d7\u2009%d", width, height);
         break;
     case WebInspector.TimelineModel.RecordType.TimerInstall:
     case WebInspector.TimelineModel.RecordType.TimerRemove:
         details = linkifyTopCallFrame();
         detailsText = record.data["timerId"];
         break;
     case WebInspector.TimelineModel.RecordType.RequestAnimationFrame:
     case WebInspector.TimelineModel.RecordType.CancelAnimationFrame:
@@ skipping 251 matching lines @@
         for (var i = 0; i < stackTrace.length; ++i) {
             var stackFrame = stackTrace[i];
             var row = stackTraceElement.createChild("div");
             row.createTextChild(stackFrame.functionName || WebInspector.UIString("(anonymous function)"));
             row.createTextChild(" @ ");
             var urlElement = this._linkifier.linkifyLocation(stackFrame.url, stackFrame.lineNumber - 1);
             row.appendChild(urlElement);
         }
     }
 }