Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(607)

Side by Side Diff: Source/devtools/front_end/timeline/TimelineTreeView.js

Issue 1294183002: DevTools: Tweak id calculation for JSFrames (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebaseline Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/inspector/tracing/timeline-js-callstacks-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 /** 5 /**
6 * @constructor 6 * @constructor
7 * @extends {WebInspector.VBox} 7 * @extends {WebInspector.VBox}
8 * @param {!WebInspector.TimelineModel} model 8 * @param {!WebInspector.TimelineModel} model
9 */ 9 */
10 WebInspector.TimelineTreeView = function(model) 10 WebInspector.TimelineTreeView = function(model)
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 } 259 }
260 260
261 /** 261 /**
262 * @param {!WebInspector.TracingModel.Event} event 262 * @param {!WebInspector.TracingModel.Event} event
263 * @return {string} 263 * @return {string}
264 */ 264 */
265 WebInspector.TimelineTreeView.eventId = function(event) 265 WebInspector.TimelineTreeView.eventId = function(event)
266 { 266 {
267 if (event.name === WebInspector.TimelineModel.RecordType.JSFrame) { 267 if (event.name === WebInspector.TimelineModel.RecordType.JSFrame) {
268 var data = event.args["data"]; 268 var data = event.args["data"];
269 return "f:" + (data["callUID"] || WebInspector.TimelineTreeView.eventURL (event)); 269 return "f:" + data["functionName"] + "@" + (data["scriptId"] || data["ur l"] || "");
270 } 270 }
271 return event.name + ":@" + WebInspector.TimelineTreeView.eventURL(event); 271 return event.name + ":@" + WebInspector.TimelineTreeView.eventURL(event);
272 } 272 }
273 273
274 /** 274 /**
275 * @param {!WebInspector.TracingModel.Event} event 275 * @param {!WebInspector.TracingModel.Event} event
276 * @return {?string} 276 * @return {?string}
277 */ 277 */
278 WebInspector.TimelineTreeView.eventURL = function(event) 278 WebInspector.TimelineTreeView.eventURL = function(event)
279 { 279 {
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 if (!this._profileNode.children) 406 if (!this._profileNode.children)
407 return; 407 return;
408 for (var node of this._profileNode.children.values()) { 408 for (var node of this._profileNode.children.values()) {
409 var gridNode = new WebInspector.TimelineTreeView.GridNode(node, this ._totalTime); 409 var gridNode = new WebInspector.TimelineTreeView.GridNode(node, this ._totalTime);
410 this.insertChildOrdered(gridNode); 410 this.insertChildOrdered(gridNode);
411 } 411 }
412 }, 412 },
413 413
414 __proto__: WebInspector.SortableDataGridNode.prototype 414 __proto__: WebInspector.SortableDataGridNode.prototype
415 } 415 }
OLDNEW
« no previous file with comments | « LayoutTests/inspector/tracing/timeline-js-callstacks-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698