DevTools: cleanup timeline concise record details generation

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 273 matching lines @@
     var recordType = WebInspector.TimelineModel.RecordType;
     var detailsText;
     var eventData = event.args["data"];
     switch (event.name) {
     case recordType.GCEvent:
     case recordType.MajorGC:
     case recordType.MinorGC:
         var delta = event.args["usedHeapSizeBefore"] - event.args["usedHeapSizeAfter"];
         detailsText = WebInspector.UIString("%s collected", Number.bytesToString(delta));
         break;
-    case recordType.TimerFire:
-        detailsText = eventData["timerId"];
-        break;
     case recordType.FunctionCall:
-        detailsText = linkifyLocationAsText(eventData["scriptId"], eventData["scriptLine"], 0);
+        // Omit internally generated script names.

[yurys, 2015/09/23 20:44:19]

eval'd scripts will also miss scriptName but I believe we still want to be able
to navigate to them.

+        if (eventData["scriptName"])
+            detailsText = linkifyLocationAsText(eventData["scriptId"], eventData["scriptLine"], 0);
         break;
     case recordType.JSFrame:
         detailsText = WebInspector.beautifyFunctionName(eventData["functionName"]);
         break;
-    case recordType.FireAnimationFrame:
-        detailsText = eventData["id"];
-        break;
     case recordType.EventDispatch:
         detailsText = eventData ? eventData["type"] : null;
         break;
     case recordType.Paint:
         var width = WebInspector.TimelineUIUtils.quadWidth(eventData.clip);
         var height = WebInspector.TimelineUIUtils.quadHeight(eventData.clip);
         if (width && height)
             detailsText = WebInspector.UIString("%d\u2009\u00d7\u2009%d", width, height);
         break;
-    case recordType.TimerInstall:
-    case recordType.TimerRemove:
-        detailsText = linkifyTopCallFrameAsText() || eventData["timerId"];
-        break;
-    case recordType.RequestAnimationFrame:
-    case recordType.CancelAnimationFrame:
-        detailsText = linkifyTopCallFrameAsText() || eventData["id"];
-        break;
     case recordType.ParseHTML:
         var endLine = event.args["endData"] && event.args["endData"]["endLine"];
-        var url = event.args["beginData"]["url"];
+        var url = WebInspector.displayNameForURL(event.args["beginData"]["url"]);
         detailsText = endLine ? WebInspector.UIString("%s [%d\u2009\u2013\u2009%d]", url, event.args["beginData"]["startLine"] + 1, endLine + 1) : url;
         break;
-    case recordType.UpdateLayoutTree:
-    case recordType.RecalculateStyles:
-        detailsText = linkifyTopCallFrameAsText();
-        break;
+
     case recordType.EvaluateScript:
         var url = eventData["url"];
         if (url)
-            detailsText = url + ":" + eventData["lineNumber"];
+            detailsText = detailsText = WebInspector.displayNameForURL(url) + ":" + eventData["lineNumber"];
         break;
     case recordType.XHRReadyStateChange:
     case recordType.XHRLoad:
-    case recordType.ResourceSendRequest:
         var url = eventData["url"];
         if (url)
-            detailsText = WebInspector.displayNameForURL(url);
+            detailsText = detailsText = WebInspector.displayNameForURL(url);
         break;
+
+    case recordType.WebSocketCreate:
+    case recordType.WebSocketSendHandshakeRequest:
+    case recordType.WebSocketReceiveHandshakeResponse:
+    case recordType.WebSocketDestroy:
+    case recordType.ResourceSendRequest:
     case recordType.ResourceReceivedData:
     case recordType.ResourceReceiveResponse:
     case recordType.ResourceFinish:
-        var initiator = event.initiator;
-        if (initiator) {
-            var url = initiator.args["data"]["url"];
-            if (url)
-                detailsText = WebInspector.displayNameForURL(url);
-        }
+    case recordType.PaintImage:
+    case recordType.DecodeImage:
+    case recordType.ResizeImage:
+    case recordType.DecodeLazyPixelRef:
+        if (event.url)
+            detailsText = WebInspector.displayNameForURL(event.url);
         break;
+
     case recordType.EmbedderCallback:
         detailsText = eventData["callbackName"];
         break;
 
-    case recordType.PaintImage:
-    case recordType.DecodeImage:
-    case recordType.ResizeImage:
-    case recordType.DecodeLazyPixelRef:
-            var url = event.url;
-            if (url)
-                detailsText = WebInspector.displayNameForURL(url);
-        break;
-
     case recordType.Animation:
         detailsText = eventData && eventData["name"];
         break;
 
     default:
         if (event.hasCategory(WebInspector.TracingModel.ConsoleEventCategory))
             detailsText = null;
         else
             detailsText = linkifyTopCallFrameAsText();
         break;
     }
 
     return detailsText;
 
     /**
      * @param {string} scriptId
      * @param {number} lineNumber
      * @param {number=} columnNumber
      * @return {?string}
      */
     function linkifyLocationAsText(scriptId, lineNumber, columnNumber)
     {
         // FIXME(62725): stack trace line/column numbers are one-based.
         var debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
         var rawLocation = target && !target.isDetached() && scriptId && debuggerModel ? debuggerModel.createRawLocationByScriptId(scriptId, lineNumber - 1, (columnNumber || 1) - 1) : null;
         if (!rawLocation)
             return null;
         var uiLocation = WebInspector.debuggerWorkspaceBinding.rawLocationToUILocation(rawLocation);
-        return uiLocation.toUIString();
+        return uiLocation.linkText();
     }
 
     /**
      * @return {?string}
      */
     function linkifyTopCallFrameAsText()
     {
         var stackTrace = event.stackTrace;
         if (!stackTrace) {
             var initiator = event.initiator;
@@ skipping 16 matching lines @@
 WebInspector.TimelineUIUtils.buildDetailsNodeForTraceEvent = function(event, target, linkifier)
 {
     var recordType = WebInspector.TimelineModel.RecordType;
     var details;
     var detailsText;
     var eventData = event.args["data"];
     switch (event.name) {
     case recordType.GCEvent:
     case recordType.MajorGC:
     case recordType.MinorGC:
-    case recordType.TimerFire:
-    case recordType.FireAnimationFrame:
     case recordType.EventDispatch:
     case recordType.Paint:
+    case recordType.Animation:
+    case recordType.EmbedderCallback:
+    case recordType.ParseHTML:
+    case recordType.WebSocketCreate:
+    case recordType.WebSocketSendHandshakeRequest:
+    case recordType.WebSocketReceiveHandshakeResponse:
+    case recordType.WebSocketDestroy:
+        detailsText = WebInspector.TimelineUIUtils.buildDetailsTextForTraceEvent(event, target);
+        break;
     case recordType.PaintImage:
     case recordType.DecodeImage:
     case recordType.ResizeImage:
     case recordType.DecodeLazyPixelRef:
-    case recordType.Animation:
     case recordType.XHRReadyStateChange:
     case recordType.XHRLoad:
     case recordType.ResourceSendRequest:
     case recordType.ResourceReceivedData:
     case recordType.ResourceReceiveResponse:
     case recordType.ResourceFinish:
-    case recordType.EmbedderCallback:
-    case recordType.ParseHTML:
-        detailsText = WebInspector.TimelineUIUtils.buildDetailsTextForTraceEvent(event, target);
+        if (event.url)
+            details = WebInspector.linkifyResourceAsNode(event.url);
         break;
     case recordType.FunctionCall:
         details = linkifyLocation(eventData["scriptId"], eventData["scriptName"], eventData["scriptLine"], 0);
         break;
     case recordType.JSFrame:
         details = createElement("span");
         details.createTextChild(WebInspector.beautifyFunctionName(eventData["functionName"]));
         var location = linkifyLocation(eventData["scriptId"], eventData["url"], eventData["lineNumber"], eventData["columnNumber"]);
         if (location) {
            details.createTextChild(" @ ");
            details.appendChild(location);
         }
         break;
-    case recordType.TimerInstall:
-    case recordType.TimerRemove:
-        details = linkifyTopCallFrame();
-        detailsText = eventData["timerId"];
-        break;
-    case recordType.RequestAnimationFrame:
-    case recordType.CancelAnimationFrame:
-        details = linkifyTopCallFrame();
-        detailsText = eventData["id"];
-        break;
-    case recordType.UpdateLayoutTree:
-    case recordType.RecalculateStyles:
-        details = linkifyTopCallFrame();
-        break;
     case recordType.EvaluateScript:
         var url = eventData["url"];
         if (url)
             details = linkifyLocation("", url, eventData["lineNumber"], 0);
         break;
     default:
         if (event.hasCategory(WebInspector.TracingModel.ConsoleEventCategory))
             detailsText = null;
         else
             details = linkifyTopCallFrame();
@@ skipping 1441 matching lines @@
         if (!this._linkifier || !this._target)
             return;
 
         var stackTraceElement = parentElement.createChild("div", "timeline-details-view-row-value timeline-details-view-row-stack-trace monospace");
 
         var callFrameElem = WebInspector.DOMPresentationUtils.buildStackTracePreviewContents(this._target, this._linkifier, stackTrace);
 
         stackTraceElement.appendChild(callFrameElem);
     }
 }