third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js - Issue 2746333002: DevTools: move recurring flag into AsyncTask, control cancelation from embedder only.

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 2746333002: DevTools: move recurring flag into AsyncTask, control cancelation from embedder only. (Closed)

Patch Set: using _END now Created 3 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/perf_ui/FlameChart.js ('k') | third_party/WebKit/Source/modules/filesystem/DOMFileSystem.cpp » ('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 e85439fe65bfda124757908bc255fff80bf977ed..ceb1b1e7d635003f66fd22ce04b90c226ec538f4 100644

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

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

@@ -337,7 +337,8 @@ Timeline.TimelineFlameChartDataProvider = class {

var level = this._currentLevel + openEvents.length;

if (flowEventsEnabled)

this._appendFlowEvent(e, level);

- this._appendEvent(e, level);

+ if (e.phase !== SDK.TracingModel.Phase.FlowEnd)

+ this._appendEvent(e, level);

if (!isExtension && TimelineModel.TimelineModel.isMarkerEvent(e))

this._timelineData.entryTotalTimes[this._entryData.length] = undefined;

@@ -768,7 +769,6 @@ Timeline.TimelineFlameChartDataProvider = class {

this._flowEventIndexById.set(event.id, pushStartFlow(event));

break;

case SDK.TracingModel.Phase.FlowEnd:

- pushEndFlow(event, this._flowEventIndexById.get(event.id));

this._flowEventIndexById.delete(event.id);

break;

}