Skip to content

Commit 641a621

Browse files
and-oliDevtools-frontend LUCI CQ
authored andcommitted
Do not change extension entries colors based on devtools theme
Before this CL we were using colors from devtools palette. Some of these, where taken from theme tokens, which vary depending on devtools theme. This was not the initially intended behavior, as colors tend to have a meaning, so we don't want them to change based on the UI colors (e.g. we don't want "primary" colors to look red if devtools theme color is red). Instead what we want are the colors of the default theme, regardless of the theme devtools has. Bug: 358307050 Change-Id: Ic4bb5a3216d19aedaba6d6aafce2c891372e7dda Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/5961601 Reviewed-by: Jack Franklin <[email protected]> Commit-Queue: Jack Franklin <[email protected]> Auto-Submit: Andres Olivares <[email protected]>
1 parent 26e5f43 commit 641a621

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

front_end/panels/timeline/extensions/ExtensionUI.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ export function extensionEntryColor(event: Trace.Types.Extensions.SyntheticExten
99
const color = event.args.color;
1010
// Use a default value for when the color of the extension entry
1111
// was not passed or was set an unknown value.
12-
let themeColor = '--ref-palette-primary70';
12+
let themeColor = '--ref-palette-blue70';
1313
switch (color) {
1414
case 'primary':
15-
themeColor = '--ref-palette-primary70';
15+
themeColor = '--ref-palette-blue70';
1616
break;
1717
case 'primary-light':
18-
themeColor = '--ref-palette-primary80';
18+
themeColor = '--ref-palette-blue80';
1919
break;
2020
case 'primary-dark':
21-
themeColor = '--ref-palette-primary60';
21+
themeColor = '--ref-palette-blue60';
2222
break;
2323
case 'secondary':
2424
themeColor = '--ref-palette-purple80';
@@ -30,13 +30,13 @@ export function extensionEntryColor(event: Trace.Types.Extensions.SyntheticExten
3030
themeColor = '--ref-palette-purple70';
3131
break;
3232
case 'tertiary':
33-
themeColor = '--ref-palette-tertiary70';
33+
themeColor = '--ref-palette-green70';
3434
break;
3535
case 'tertiary-light':
36-
themeColor = '--ref-palette-tertiary80';
36+
themeColor = '--ref-palette-green80';
3737
break;
3838
case 'tertiary-dark':
39-
themeColor = '--ref-palette-tertiary60';
39+
themeColor = '--ref-palette-green60';
4040
break;
4141
case 'warning':
4242
themeColor = '--ref-palette-yellow70';

front_end/panels/timeline/track_appenders/ExtensionTrackAppender.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ describeWithEnvironment('ExtensionTrackAppender', function() {
147147
styleElement.id = 'fake-perf-panel-colors';
148148
styleElement.textContent = `
149149
:root {
150-
--ref-palette-primary70: rgb(4 4 4);
151-
--ref-palette-tertiary70: rgb(10 10 10);
150+
--ref-palette-blue70: rgb(4 4 4);
151+
--ref-palette-green70: rgb(10 10 10);
152152
}
153153
`;
154154
document.documentElement.appendChild(styleElement);
@@ -168,12 +168,12 @@ describeWithEnvironment('ExtensionTrackAppender', function() {
168168
for (const event of allExtensionTrackEntries) {
169169
assert.strictEqual(extensionTrackAppenders[0].titleForEvent(event), event.name);
170170
if (event.args.color === 'tertiary') {
171-
// "tertiary" color category is mapped to --ref-palette-tertiary70
171+
// "tertiary" color category is mapped to --ref-palette-green70
172172
// which is faked out to 10, 10, 10
173173
assert.strictEqual(extensionTrackAppenders[0].colorForEvent(event), 'rgb(10 10 10)');
174174
} else {
175175
// Unknown colors are mapped to "primary" by default, and
176-
// "primary" color category is mapped to --ref-palette-primary70
176+
// "primary" color category is mapped to --ref-palette-blue70
177177
// which is faked out to 4, 4, 4
178178
assert.strictEqual(extensionTrackAppenders[0].colorForEvent(event), 'rgb(4 4 4)');
179179
}
@@ -197,7 +197,7 @@ describeWithEnvironment('ExtensionTrackAppender', function() {
197197
},
198198
cat: 'devtools.extension',
199199
} as unknown as Trace.Types.Events.Event;
200-
// "primary" color category is mapped to --ref-palette-primary70
200+
// "primary" color category is mapped to --ref-palette-blue70
201201
// which is faked out to 4, 4, 4
202202
assert.strictEqual(extensionTrackAppenders[0].colorForEvent(mockExtensionEntryNoColor), 'rgb(4 4 4)');
203203
assert.strictEqual(extensionTrackAppenders[0].colorForEvent(mockExtensionEntryUnknownColor), 'rgb(4 4 4)');

front_end/panels/timeline/track_appenders/TimingsTrackAppender.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ describeWithEnvironment('TimingTrackAppender', function() {
298298
styleElement.id = 'fake-perf-panel-colors';
299299
styleElement.textContent = `
300300
:root {
301-
--ref-palette-primary70: rgb(4 4 4);
301+
--ref-palette-blue70: rgb(4 4 4);
302302
--ref-palette-error60: rgb(10 10 10);
303303
}
304304
`;
@@ -336,7 +336,7 @@ describeWithEnvironment('TimingTrackAppender', function() {
336336
assert.strictEqual(timingsTrackAppender.colorForEvent(event), 'rgb(10 10 10)');
337337
} else {
338338
// Unknown colors are mapped to "primary" by default, and
339-
// "primary" color category is mapped to --ref-palette-primary70
339+
// "primary" color category is mapped to --ref-palette-blue70
340340
// which is faked out to 4, 4, 4
341341
assert.strictEqual(timingsTrackAppender.colorForEvent(event), 'rgb(4 4 4)');
342342
}
@@ -357,7 +357,7 @@ describeWithEnvironment('TimingTrackAppender', function() {
357357
},
358358
cat: 'devtools.extension',
359359
} as unknown as Trace.Types.Events.Event;
360-
// "primary" color category is mapped to --ref-palette-primary70
360+
// "primary" color category is mapped to --ref-palette-blue70
361361
// which is faked out to 4, 4, 4
362362
assert.strictEqual(timingsTrackAppender.colorForEvent(mockExtensionEntryNoColor), 'rgb(4 4 4)');
363363
assert.strictEqual(timingsTrackAppender.colorForEvent(mockExtensionEntryUnknownColor), 'rgb(4 4 4)');

0 commit comments

Comments
 (0)