| OLD | NEW |
| 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 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 { | 350 { |
| 351 var entryType = this._entryType(entryIndex); | 351 var entryType = this._entryType(entryIndex); |
| 352 if (entryType === WebInspector.TimelineFlameChartEntryType.Event) { | 352 if (entryType === WebInspector.TimelineFlameChartEntryType.Event) { |
| 353 var event = /** @type {!WebInspector.TracingModel.Event} */ (this._e
ntryData[entryIndex]); | 353 var event = /** @type {!WebInspector.TracingModel.Event} */ (this._e
ntryData[entryIndex]); |
| 354 if (event.phase === WebInspector.TracingModel.Phase.AsyncStepInto ||
event.phase === WebInspector.TracingModel.Phase.AsyncStepPast) | 354 if (event.phase === WebInspector.TracingModel.Phase.AsyncStepInto ||
event.phase === WebInspector.TracingModel.Phase.AsyncStepPast) |
| 355 return event.name + ":" + event.args["step"]; | 355 return event.name + ":" + event.args["step"]; |
| 356 if (event._blackboxRoot) | 356 if (event._blackboxRoot) |
| 357 return WebInspector.UIString("Blackboxed"); | 357 return WebInspector.UIString("Blackboxed"); |
| 358 var name = WebInspector.TimelineUIUtils.eventStyle(event).title; | 358 var name = WebInspector.TimelineUIUtils.eventStyle(event).title; |
| 359 // TODO(yurys): support event dividers | 359 // TODO(yurys): support event dividers |
| 360 var detailsText = WebInspector.TimelineUIUtils.buildDetailsTextForTr
aceEvent(event, this._model.target()); | 360 var detailsText = WebInspector.TimelineUIUtils.buildDetailsTextForTr
aceEvent(event, this._model.targetByEvent(event)); |
| 361 if (event.name === WebInspector.TimelineModel.RecordType.JSFrame &&
detailsText) | 361 if (event.name === WebInspector.TimelineModel.RecordType.JSFrame &&
detailsText) |
| 362 return detailsText; | 362 return detailsText; |
| 363 return detailsText ? WebInspector.UIString("%s (%s)", name, detailsT
ext) : name; | 363 return detailsText ? WebInspector.UIString("%s (%s)", name, detailsT
ext) : name; |
| 364 } | 364 } |
| 365 var title = this._entryIndexToTitle[entryIndex]; | 365 var title = this._entryIndexToTitle[entryIndex]; |
| 366 if (!title) { | 366 if (!title) { |
| 367 title = WebInspector.UIString("Unexpected entryIndex %d", entryIndex
); | 367 title = WebInspector.UIString("Unexpected entryIndex %d", entryIndex
); |
| 368 console.error(title); | 368 console.error(title); |
| 369 } | 369 } |
| 370 return title; | 370 return title; |
| (...skipping 1145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1516 /** | 1516 /** |
| 1517 * @constructor | 1517 * @constructor |
| 1518 * @param {!WebInspector.TimelineSelection} selection | 1518 * @param {!WebInspector.TimelineSelection} selection |
| 1519 * @param {number} entryIndex | 1519 * @param {number} entryIndex |
| 1520 */ | 1520 */ |
| 1521 WebInspector.TimelineFlameChartView.Selection = function(selection, entryIndex) | 1521 WebInspector.TimelineFlameChartView.Selection = function(selection, entryIndex) |
| 1522 { | 1522 { |
| 1523 this.timelineSelection = selection; | 1523 this.timelineSelection = selection; |
| 1524 this.entryIndex = entryIndex; | 1524 this.entryIndex = entryIndex; |
| 1525 } | 1525 } |
| OLD | NEW |