TimelinePanel: provide scriptId in FunctionCall event.

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 422 matching lines @@
     return selector + " { background-image: linear-gradient(" +
        category.fillColorStop0 + ", " + category.fillColorStop1 + " 25%, " + category.fillColorStop1 + " 25%, " + category.fillColorStop1 + ");" +
        " border-color: " + category.borderColor +
        "}";
 }
 
 /**
  * @param {!WebInspector.TimelineModel.Record} record
  * @param {!WebInspector.Linkifier} linkifier
  * @param {function(!DocumentFragment)} callback
+ * @param {boolean} loadedFromFile
  */
-WebInspector.TimelineUIUtils.generatePopupContent = function(record, linkifier, callback)
+WebInspector.TimelineUIUtils.generatePopupContent = function(record, linkifier, callback, loadedFromFile)
 {
     var imageElement = /** @type {?Element} */ (record.getUserObject("TimelineUIUtils::preview-element") || null);
     var relatedNode = null;
 
     var barrier = new CallbackBarrier();
     if (!imageElement && WebInspector.TimelineUIUtils.needsPreviewElement(record.type))
         WebInspector.DOMPresentationUtils.buildImagePreviewContents(record.url, false, barrier.createCallback(saveImage));
     if (record.relatedBackendNodeId())
         WebInspector.domModel.pushNodesByBackendIdsToFrontend([record.relatedBackendNodeId()], barrier.createCallback(setRelatedNode));
     barrier.callWhenDone(callbackWrapper);
@@ skipping 11 matching lines @@
      * @param {?Array.<!DOMAgent.NodeId>} nodeIds
      */
     function setRelatedNode(nodeIds)
     {
         if (nodeIds)
             relatedNode = WebInspector.domModel.nodeForId(nodeIds[0]);
     }
 
     function callbackWrapper()
     {
-        callback(WebInspector.TimelineUIUtils._generatePopupContentSynchronously(record, linkifier, imageElement, relatedNode));
+        callback(WebInspector.TimelineUIUtils._generatePopupContentSynchronously(record, linkifier, imageElement, relatedNode, loadedFromFile));
     }
 }
 
 /**
  * @param {!WebInspector.TimelineModel.Record} record
  * @param {!WebInspector.Linkifier} linkifier
  * @param {?Element} imagePreviewElement
  * @param {?WebInspector.DOMNode} relatedNode
+ * @param {boolean} loadedFromFile
  * @return {!DocumentFragment}
  */
-WebInspector.TimelineUIUtils._generatePopupContentSynchronously = function(record, linkifier, imagePreviewElement, relatedNode)
+WebInspector.TimelineUIUtils._generatePopupContentSynchronously = function(record, linkifier, imagePreviewElement, relatedNode, loadedFromFile)
 {
     var fragment = document.createDocumentFragment();
     if (record.children.length)
         fragment.appendChild(WebInspector.TimelineUIUtils.generatePieChart(record.aggregatedStats, record.category, record.selfTime));
     else
         fragment.appendChild(WebInspector.TimelineUIUtils.generatePieChart(record.aggregatedStats));
 
     const recordTypes = WebInspector.TimelineModel.RecordType;
 
     // The messages may vary per record type;
@@ skipping 109 matching lines @@
                 contentHelper.appendTextRow(WebInspector.UIString("URL"), record.webSocketURL);
             if (typeof record.webSocketProtocol !== "undefined")
                 contentHelper.appendTextRow(WebInspector.UIString("WebSocket Protocol"), record.webSocketProtocol);
             if (typeof record.data["message"] !== "undefined")
                 contentHelper.appendTextRow(WebInspector.UIString("Message"), record.data["message"]);
             break;
         case recordTypes.EmbedderCallback:
             contentHelper.appendTextRow(WebInspector.UIString("Callback Function"), record.embedderCallbackName);
             break;
         default:
-            var detailsNode = WebInspector.TimelineUIUtils.buildDetailsNode(record, linkifier);
+            var detailsNode = WebInspector.TimelineUIUtils.buildDetailsNode(record, linkifier, loadedFromFile);
             if (detailsNode)
                 contentHelper.appendElementRow(WebInspector.UIString("Details"), detailsNode);
             break;
     }
 
     if (relatedNode)
         contentHelper.appendElementRow(relatedNodeLabel || WebInspector.UIString("Related node"), WebInspector.DOMPresentationUtils.linkifyNodeReference(relatedNode));
 
     if (record.scriptName && record.type !== recordTypes.FunctionCall)
         contentHelper.appendLocationRow(WebInspector.UIString("Function Call"), record.scriptName, record.scriptLine);
@@ skipping 37 matching lines @@
  * @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
+ * @param {boolean} loadedFromFile
  * @return {?Node}
  */
-WebInspector.TimelineUIUtils.buildDetailsNode = function(record, linkifier)
+WebInspector.TimelineUIUtils.buildDetailsNode = function(record, linkifier, loadedFromFile)
 {
     var details;
     var detailsText;
 
     switch (record.type) {
     case WebInspector.TimelineModel.RecordType.GCEvent:
         detailsText = WebInspector.UIString("%s collected", Number.bytesToString(record.data["usedHeapSizeDelta"]));
         break;
     case WebInspector.TimelineModel.RecordType.TimerFire:
         detailsText = record.data["timerId"];
         break;
     case WebInspector.TimelineModel.RecordType.FunctionCall:
-        if (record.scriptName)
-            details = linkifyLocation(record.scriptName, record.scriptLine, 0);
+        details = linkifyLocation(record.data.scriptId, record.data.scriptName, record.data.scriptLine, 0);
         break;
     case WebInspector.TimelineModel.RecordType.FireAnimationFrame:
         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.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:
         details = linkifyTopCallFrame();
         detailsText = record.data["id"];
         break;
     case WebInspector.TimelineModel.RecordType.ParseHTML:
     case WebInspector.TimelineModel.RecordType.RecalculateStyles:
         details = linkifyTopCallFrame();
         break;
     case WebInspector.TimelineModel.RecordType.EvaluateScript:
-        details = record.url ? linkifyLocation(record.url, record.data["lineNumber"], 0) : null;
+        details = linkifyLocation("", record.url, record.data["lineNumber"], 0);
         break;
     case WebInspector.TimelineModel.RecordType.XHRReadyStateChange:
     case WebInspector.TimelineModel.RecordType.XHRLoad:
     case WebInspector.TimelineModel.RecordType.ScheduleResourceRequest:
     case WebInspector.TimelineModel.RecordType.ResourceSendRequest:
     case WebInspector.TimelineModel.RecordType.ResourceReceivedData:
     case WebInspector.TimelineModel.RecordType.ResourceReceiveResponse:
     case WebInspector.TimelineModel.RecordType.ResourceFinish:
     case WebInspector.TimelineModel.RecordType.DecodeImage:
     case WebInspector.TimelineModel.RecordType.ResizeImage:
         detailsText = WebInspector.displayNameForURL(record.url);
         break;
     case WebInspector.TimelineModel.RecordType.ConsoleTime:
         detailsText = record.data["message"];
         break;
     case WebInspector.TimelineModel.RecordType.EmbedderCallback:
         detailsText = record.data["callbackName"];
         break;
     default:
-        details = record.scriptName ? linkifyLocation(record.scriptName, record.scriptLine, 0) : linkifyTopCallFrame();
+        details = linkifyTopCallFrame();
         break;
     }
 
     if (!details && detailsText)
         details = document.createTextNode(detailsText);
     return details;
 
     /**
+     * @param {string} scriptId
      * @param {string} url
      * @param {number} lineNumber
      * @param {number=} columnNumber
      */
-    function linkifyLocation(url, lineNumber, columnNumber)
+    function linkifyLocation(scriptId, url, lineNumber, columnNumber)
     {
+        if (!loadedFromFile && scriptId !== "0") {
+            var location = new WebInspector.DebuggerModel.Location(
+                /** @type {!WebInspector.Target} */ (WebInspector.targetManager.activeTarget()),
+                scriptId,
+                lineNumber - 1,
+                (columnNumber || 1) - 1);
+            return linkifier.linkifyRawLocation(location, "timeline-details");
+        }
+
+        if (!url)
+            return null;
+
         // FIXME(62725): stack trace line/column numbers are one-based.
         columnNumber = columnNumber ? columnNumber - 1 : 0;
         return linkifier.linkifyLocation(url, lineNumber - 1, columnNumber, "timeline-details");
     }
 
     /**
      * @param {!ConsoleAgent.CallFrame} callFrame
      */
     function linkifyCallFrame(callFrame)
     {
-        return linkifyLocation(callFrame.url, callFrame.lineNumber, callFrame.columnNumber);
+        return linkifyLocation(callFrame.scriptId, callFrame.url, callFrame.lineNumber, callFrame.columnNumber);
     }
 
     /**
      * @return {?Element}
      */
     function linkifyTopCallFrame()
     {
         if (record.stackTrace)
             return linkifyCallFrame(record.stackTrace[0]);
         if (record.callSiteStackTrace)
             return linkifyCallFrame(record.callSiteStackTrace[0]);
         return null;
     }
-
-    /**
-     * @return {?Element}
-     */
-    function linkifyScriptLocation()
-    {
-        return record.scriptName ? linkifyLocation(record.scriptName, record.scriptLine, 0) : null;
-    }
 }
 
 /**
  * @constructor
  * @extends {WebInspector.Object}
  * @param {string} name
  * @param {string} title
  * @param {number} overviewStripGroupIndex
  * @param {string} borderColor
  * @param {string} backgroundColor
@@ skipping 167 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);
         }
     }
 }