third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js - Issue 2080633002: DevTools: render markers as circles on the main timeline.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js

Issue 2080633002: DevTools: render markers as circles on the main timeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebaselined tests Created 4 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/LayoutTests/inspector/tracing/timeline-time-stamp-expected.txt ('k') | third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js

diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js

index e3671badf0a6fe1682217e033be3a42a1026c9d0..f7154e4d5b11623345cafcc006cbabc6a3095275 100644

--- a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js

+++ b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js

@@ -639,7 +639,7 @@ WebInspector.TimelineFlameChartDataProvider.prototype = {

prepareHighlightedEntryInfo: function(entryIndex)

{

- var time;

+ var time = "";

var title;

var warning;

var type = this._entryType(entryIndex);

@@ -648,9 +648,11 @@ WebInspector.TimelineFlameChartDataProvider.prototype = {

var totalTime = event.duration;

var selfTime = event.selfTime;

var /** @const */ eps = 1e-6;

- time = typeof totalTime === "number" && Math.abs(totalTime - selfTime) > eps && selfTime > eps ?

- WebInspector.UIString("%s (self %s)", Number.millisToString(totalTime, true), Number.millisToString(selfTime, true)) :

- Number.millisToString(totalTime, true);

+ if (typeof totalTime === "number") {

+ time = Math.abs(totalTime - selfTime) > eps && selfTime > eps ?

+ WebInspector.UIString("%s (self %s)", Number.millisToString(totalTime, true), Number.millisToString(selfTime, true)) :

+ Number.millisToString(totalTime, true);

+ }

title = this.entryTitle(entryIndex);

warning = WebInspector.TimelineUIUtils.eventWarning(event);

} else if (type === WebInspector.TimelineFlameChartEntryType.Frame) {

@@ -826,7 +828,12 @@ WebInspector.TimelineFlameChartDataProvider.prototype = {

var index = this._entryData.length;

this._entryData.push(event);

this._timelineData.entryLevels[index] = level;

- this._timelineData.entryTotalTimes[index] = event.duration || WebInspector.TimelineFlameChartDataProvider.InstantEventVisibleDurationMs;

+ var duration;

+ if (WebInspector.TimelineModel.isMarkerEvent(event))

+ duration = undefined;

+ else

+ duration = event.duration || WebInspector.TimelineFlameChartDataProvider.InstantEventVisibleDurationMs;

+ this._timelineData.entryTotalTimes[index] = duration;

this._timelineData.entryStartTimes[index] = event.startTime;