Index: Source/devtools/front_end/timeline/TimelineFlameChart.js |
diff --git a/Source/devtools/front_end/timeline/TimelineFlameChart.js b/Source/devtools/front_end/timeline/TimelineFlameChart.js |
index d2abe42878a5c6b9c29c2ff342777e7cf5ebeb1d..4c1e3f4ec2fcb630adadbd765fc23ceb7a0514b7 100644 |
--- a/Source/devtools/front_end/timeline/TimelineFlameChart.js |
+++ b/Source/devtools/front_end/timeline/TimelineFlameChart.js |
@@ -116,12 +116,36 @@ WebInspector.TimelineFlameChartDataProvider.prototype = { |
return null; |
}, |
+ /** |
+ * @param {number} startTime |
+ * @param {number} endTime |
+ * @return {?Array.<!WebInspector.FlameChartDataProvider.Marker>} |
+ */ |
+ timelineMarkers: function(startTime, endTime) |
+ { |
+ function compare(time, event) |
+ { |
+ return time - event.startTime; |
+ } |
+ var left = this._markerEvents.lowerBound(startTime, compare); |
+ var right = this._markerEvents.upperBound(endTime, compare); |
+ var result = []; |
+ for (var i = left; i < right; i++) { |
+ var event = this._markerEvents[i]; |
+ var title = WebInspector.TracingTimelineUIUtils.eventTitle(event, this._model); |
+ var color = WebInspector.TimelineUIUtilsImpl.markerEventColor(event.name); |
+ result.push(new WebInspector.FlameChartDataProvider.Marker(event.startTime, title, color)); |
+ } |
+ return result; |
+ }, |
+ |
reset: function() |
{ |
this._timelineData = null; |
/** @type {!Array.<!WebInspector.TracingModel.Event>} */ |
this._entryEvents = []; |
this._entryIndexToTitle = {}; |
+ this._markerEvents = []; |
}, |
/** |
@@ -168,8 +192,10 @@ WebInspector.TimelineFlameChartDataProvider.prototype = { |
var jsStackHeight = 0; |
for (var i = 0; i < events.length; ++i) { |
var e = events[i]; |
- if (!e.endTime && e.phase !== WebInspector.TracingModel.Phase.Instant) |
+ if (!e.endTime && e.phase !== WebInspector.TracingModel.Phase.Instant && e.phase !== "I") |
alph
2014/07/21 12:05:30
&& e.phase !== "I" seems to be not needed anymore.
yurys
2014/07/21 13:49:48
Done.
|
continue; |
+ if (WebInspector.TracingTimelineUIUtils.isMarkerEvent(e)) |
+ this._markerEvents.push(e); |
if (!this._isVisible(e)) |
continue; |
while (openEvents.length && openEvents.peekLast().endTime <= e.startTime) { |