[DevTools] Add callFrame to CPUProfileNode & SamplingHeapProfileNode

third_party/WebKit/Source/devtools/front_end/profiler/HeapProfileView.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @implements {WebInspector.Searchable}
  * @extends {WebInspector.ProfileView}
  * @param {!WebInspector.SamplingHeapProfileHeader} profileHeader
  */
@@ skipping 203 matching lines @@
     __proto__: WebInspector.WritableProfileHeader.prototype
 }
 
 /**
  * @constructor
  * @extends {WebInspector.ProfileNode}
  * @param {!HeapProfilerAgent.SamplingHeapProfileNode} node
  */
 WebInspector.SamplingHeapProfileNode = function(node)
 {
-    WebInspector.ProfileNode.call(this, node.functionName, node.scriptId, node.url, node.lineNumber, node.columnNumber);
+    if (node.callFrame) {
+        WebInspector.ProfileNode.call(this, node.callFrame);
+    } else {
+        // Backward compatibility for old SamplingHeapProfileNode format.
+        var frame = /** @type {!RuntimeAgent.CallFrame} */(node);
+        WebInspector.ProfileNode.call(this, {
+            functionName: frame.functionName,
+            scriptId: frame.scriptId, url: frame.url,
+            lineNumber: frame.lineNumber - 1,
+            columnNumber: frame.columnNumber - 1
+        });
+    }
     this.self = node.selfSize;
 }
 
 WebInspector.SamplingHeapProfileNode.prototype = {
     __proto__: WebInspector.ProfileNode.prototype
 }
 
 /**
  * @constructor
  * @extends {WebInspector.ProfileTreeModel}
@@ skipping 59 matching lines @@
         return WebInspector.UIString("%.2f\u2009%%", value);
     },
 
     /**
      * @override
      * @param  {!WebInspector.ProfileDataGridNode} node
      * @return {!Element}
      */
     linkifyNode: function(node)
     {
-        return this._profileView.linkifier().linkifyConsoleCallFrameForTimeline(this._profileView.target(), node.profileNode.frame, "profile-node-file");
+        return this._profileView.linkifier().linkifyConsoleCallFrame(this._profileView.target(), node.profileNode.callFrame, "profile-node-file");
     }
 }
 
 /**
  * @constructor
  * @extends {WebInspector.ProfileFlameChartDataProvider}
  * @param {!WebInspector.ProfileTreeModel} profile
  * @param {?WebInspector.Target} target
  */
 WebInspector.HeapFlameChartDataProvider = function(profile, target)
@@ skipping 99 matching lines @@
          * @param {string} value
          */
         function pushEntryInfoRow(title, value)
         {
             entryInfo.push({ title: title, value: value });
         }
         pushEntryInfoRow(WebInspector.UIString("Name"), WebInspector.beautifyFunctionName(node.functionName));
         pushEntryInfoRow(WebInspector.UIString("Self size"), Number.bytesToString(node.self));
         pushEntryInfoRow(WebInspector.UIString("Total size"), Number.bytesToString(node.total));
         var linkifier = new WebInspector.Linkifier();
-        var text = (new WebInspector.Linkifier()).linkifyConsoleCallFrameForTimeline(this._target, node.frame).textContent;
+        var text = (new WebInspector.Linkifier()).linkifyConsoleCallFrame(this._target, node.callFrame).textContent;
         linkifier.dispose();
         pushEntryInfoRow(WebInspector.UIString("URL"), text);
         return entryInfo;
     },
 
     __proto__: WebInspector.ProfileFlameChartDataProvider.prototype
 }