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

Side by Side Diff: Source/devtools/front_end/TimelineFlameChart.js

Issue 180783018: DevTools: follow up to r168484, do not add same parent twice into flame chart. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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 /* 1 /*
2 * Copyright (C) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 this._timelineData.entryTotalTimes[recordIndex] = childStart Time - record.startTime; 214 this._timelineData.entryTotalTimes[recordIndex] = childStart Time - record.startTime;
215 recordIndex = -1; 215 recordIndex = -1;
216 } else { 216 } else {
217 this._pushRecord(record, true, level, currentTime, childStar tTime); 217 this._pushRecord(record, true, level, currentTime, childStar tTime);
218 } 218 }
219 } 219 }
220 this._pushRecord(record, false, level, childStartTime, childEndTime) ; 220 this._pushRecord(record, false, level, childStartTime, childEndTime) ;
221 this._appendRecord(childRecord, level + 1); 221 this._appendRecord(childRecord, level + 1);
222 currentTime = childEndTime; 222 currentTime = childEndTime;
223 } 223 }
224 if (recordEndTime !== currentTime || record.children.length === 0) 224 if (recordIndex === -1 && recordEndTime !== currentTime || record.childr en.length === 0)
225 this._pushRecord(record, true, level, currentTime, recordEndTime); 225 this._pushRecord(record, true, level, currentTime, recordEndTime);
226 226
227 this._maxStackDepth = Math.max(this._maxStackDepth, level + 2); 227 this._maxStackDepth = Math.max(this._maxStackDepth, level + 2);
228 }, 228 },
229 229
230 /** 230 /**
231 * @param {!WebInspector.TimelineModel.Record} record 231 * @param {!WebInspector.TimelineModel.Record} record
232 * @param {boolean} isSelfSegment 232 * @param {boolean} isSelfSegment
233 * @param {number} level 233 * @param {number} level
234 * @param {number} startTime 234 * @param {number} startTime
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 */ 432 */
433 _onEntrySelected: function(event) 433 _onEntrySelected: function(event)
434 { 434 {
435 var entryIndex = event.data; 435 var entryIndex = event.data;
436 var record = this._dataProvider._records[entryIndex]; 436 var record = this._dataProvider._records[entryIndex];
437 this._delegate.selectRecord(record); 437 this._delegate.selectRecord(record);
438 }, 438 },
439 439
440 __proto__: WebInspector.View.prototype 440 __proto__: WebInspector.View.prototype
441 } 441 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698