third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js - Issue 1636853002: Timeline: simplify handling of event category colors

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 1636853002: Timeline: simplify handling of event category colors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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/timeline/TimelineEventOverview.js ('k') | third_party/WebKit/Source/devtools/front_end/timeline/TimelinePanel.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 1fb40c92e3da2d6e101b6f09140d7218cc809add..af2d368b54ba729085b2df1fac22a06e71fe1415 100644

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

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

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

var color = this._asyncColorByCategory[category.name];

if (color)

return color;

- var parsedColor = WebInspector.Color.parse(category.fillColorStop1);

+ var parsedColor = WebInspector.Color.parse(category.color);

color = parsedColor.setAlpha(0.7).asString(WebInspector.Color.Format.RGBA) || "";

this._asyncColorByCategory[category.name] = color;

return color;

@@ -861,8 +861,8 @@ WebInspector.TimelineFlameChartNetworkDataProvider = function(model)

{

WebInspector.TimelineFlameChartDataProviderBase.call(this, model);

var loadingCategory = WebInspector.TimelineUIUtils.categories()["loading"];

- this._waitingColor = loadingCategory.backgroundColor;

- this._processingColor = loadingCategory.fillColorStop1;

+ this._waitingColor = loadingCategory.childColor;

+ this._processingColor = loadingCategory.color;

}

WebInspector.TimelineFlameChartNetworkDataProvider.prototype = {