Commit 97df95a8 authored by alph's avatar alph Committed by Commit bot

DevTools: Fix highlight/selection of marker events

These one were placed incorrectly because of duration is NaN.
drive-by: get rid of highlightTimeRange function.

Review-Url: https://codereview.chromium.org/2445173002
Cr-Commit-Position: refs/heads/master@{#427260}
parent fec80594
...@@ -209,20 +209,6 @@ WebInspector.ProfileFlameChartDataProvider.prototype = { ...@@ -209,20 +209,6 @@ WebInspector.ProfileFlameChartDataProvider.prototype = {
return false; return false;
}, },
/**
* @override
* @param {number} entryIndex
* @return {!{startTime: number, endTime: number}}
*/
highlightTimeRange: function(entryIndex)
{
var startTime = this._timelineData.entryStartTimes[entryIndex];
return {
startTime: startTime,
endTime: startTime + this._timelineData.entryTotalTimes[entryIndex]
};
},
/** /**
* @override * @override
* @return {number} * @return {number}
......
...@@ -213,20 +213,6 @@ WebInspector.TimelineFlameChartDataProviderBase.prototype = { ...@@ -213,20 +213,6 @@ WebInspector.TimelineFlameChartDataProviderBase.prototype = {
return "#333"; return "#333";
}, },
/**
* @override
* @param {number} entryIndex
* @return {?{startTime: number, endTime: number}}
*/
highlightTimeRange: function(entryIndex)
{
var startTime = this._timelineData.entryStartTimes[entryIndex];
return {
startTime: startTime,
endTime: startTime + this._timelineData.entryTotalTimes[entryIndex]
};
},
/** /**
* @param {number} entryIndex * @param {number} entryIndex
* @return {?WebInspector.TimelineSelection} * @return {?WebInspector.TimelineSelection}
......
...@@ -262,11 +262,6 @@ WebInspector.FlameChartDataProvider.prototype = { ...@@ -262,11 +262,6 @@ WebInspector.FlameChartDataProvider.prototype = {
*/ */
textPadding: function() { }, textPadding: function() { },
/**
* @return {?{startTime: number, endTime: number}}
*/
highlightTimeRange: function(entryIndex) { },
/** /**
* @return {number} * @return {number}
*/ */
...@@ -1481,22 +1476,21 @@ WebInspector.FlameChart.prototype = { ...@@ -1481,22 +1476,21 @@ WebInspector.FlameChart.prototype = {
*/ */
_updateElementPosition: function(element, entryIndex) _updateElementPosition: function(element, entryIndex)
{ {
/** @const */ var elementMinWidth = 2; const elementMinWidthPx = 2;
if (element.parentElement) if (element.parentElement)
element.remove(); element.remove();
if (entryIndex === -1) if (entryIndex === -1)
return; return;
var timeRange = this._dataProvider.highlightTimeRange(entryIndex);
if (!timeRange)
return;
var timelineData = this._timelineData(); var timelineData = this._timelineData();
var barX = this._timeToPositionClipped(timeRange.startTime); var startTime = timelineData.entryStartTimes[entryIndex];
var barRight = this._timeToPositionClipped(timeRange.endTime); var endTime = startTime + (timelineData.entryTotalTimes[entryIndex] || 0);
var barX = this._timeToPositionClipped(startTime);
var barRight = this._timeToPositionClipped(endTime);
if (barRight === 0 || barX === this._offsetWidth) if (barRight === 0 || barX === this._offsetWidth)
return; return;
var barWidth = barRight - barX; var barWidth = barRight - barX;
var barCenter = barX + barWidth / 2; var barCenter = barX + barWidth / 2;
barWidth = Math.max(barWidth, elementMinWidth); barWidth = Math.max(barWidth, elementMinWidthPx);
barX = barCenter - barWidth / 2; barX = barCenter - barWidth / 2;
var barY = this._levelToHeight(timelineData.entryLevels[entryIndex]) - this.scrollOffset(); var barY = this._levelToHeight(timelineData.entryLevels[entryIndex]) - this.scrollOffset();
var style = element.style; var style = element.style;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment