[DevTools] Add callFrame to CPUProfileNode & SamplingHeapProfileNode

third_party/WebKit/Source/devtools/front_end/sdk/CPUProfileDataModel.js

 // Copyright 2014 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
  * @extends {WebInspector.ProfileNode}
  * @param {!ProfilerAgent.CPUProfileNode} sourceNode
  * @param {number} sampleTime
  */
 WebInspector.CPUProfileNode = function(sourceNode, sampleTime)
 {
-    WebInspector.ProfileNode.call(this, sourceNode.functionName, sourceNode.scriptId, sourceNode.url, sourceNode.lineNumber, sourceNode.columnNumber);
+    if (sourceNode.callFrame) {
+        WebInspector.ProfileNode.call(this, sourceNode.callFrame);
+    } else {
+        // Backward compatibility for old CPUProfileNode format.
+        var frame = /** @type {!RuntimeAgent.CallFrame} */(sourceNode);
+        WebInspector.ProfileNode.call(this, { functionName: frame.functionName, scriptId: frame.scriptId, url: frame.url, lineNumber: frame.lineNumber - 1, columnNumber: frame.columnNumber - 1});

[alph, 2016/07/14 21:53:29]

ditto

[kozy, 2016/07/15 00:19:02]

Done.

+    }
     this.id = sourceNode.id;
     this.self = sourceNode.hitCount * sampleTime;
     this.callUID = sourceNode.callUID;
     this.positionTicks = sourceNode.positionTicks;
     this.deoptReason = sourceNode.deoptReason;
 }
 
 WebInspector.CPUProfileNode.prototype = {
     __proto__: WebInspector.ProfileNode.prototype
 }
@@ skipping 35 matching lines @@
         function computeHitCountForSubtree(node)
         {
             return node.children.reduce((acc, node) => acc + computeHitCountForSubtree(node), node.hitCount);
         }
         /**
          * @param {!ProfilerAgent.CPUProfileNode} node
          * @return {boolean}
          */
         function isNativeNode(node)
         {
+            if (node.callFrame)
+                return !!node.callFrame.url && node.callFrame.url.startsWith("native ");
             return !!node.url && node.url.startsWith("native ");
         }
         this.totalHitCount = computeHitCountForSubtree(root);
         var sampleTime = (this.profileEndTime - this.profileStartTime) / this.totalHitCount;
         var keepNatives = !!WebInspector.moduleSetting("showNativeFunctionsInJSProfile").get();
         /** @type {!Map<number, number>} */
         var idMap = new Map([[root.id, root.id]]);
         var resultRoot = new WebInspector.CPUProfileNode(root, sampleTime);
         var parentNodeStack = root.children.map(() => resultRoot);
         var sourceNodeStack = root.children;
@@ skipping 210 matching lines @@
      * @param {number} index
      * @return {?WebInspector.CPUProfileNode}
      */
     nodeByIndex: function(index)
     {
         return this._idToNode.get(this.samples[index]) || null;
     },
 
     __proto__: WebInspector.ProfileTreeModel.prototype
 }