Skip to content

Commit eba8569

Browse files
finnurbrekiDevtools-frontend LUCI CQ
authored andcommitted
[PerfGraph]: Fix track headers getting squished.
Track headers for Track Groups were getting squished with the headers for tracks below it. This CL also updates the trace file to include a track group, to validate the fix. Bug: 443216198 (follow-up fix) Change-Id: Iea38bde438831bac194ef870bc1cb785ced891fb Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6969011 Commit-Queue: Finnur Thorarinsson <[email protected]> Reviewed-by: Connor Clark <[email protected]>
1 parent c16c0e7 commit eba8569

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

front_end/panels/timeline/ExtensionTrackAppender.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ export class ExtensionTrackAppender implements TrackAppender {
4343
if (totalEntryCount === 0) {
4444
return trackStartLevel;
4545
}
46-
this.#appendTopLevelHeaderAtLevel(trackStartLevel, expanded);
46+
const compact = !this.#extensionTopLevelTrack.isTrackGroup && totalEntryCount < 2;
47+
this.#appendTopLevelHeaderAtLevel(trackStartLevel, compact, expanded);
4748
return this.#appendExtensionTrackData(trackStartLevel);
4849
}
4950

@@ -53,9 +54,10 @@ export class ExtensionTrackAppender implements TrackAppender {
5354
* header corresponds to the track name, in the latter it corresponds
5455
* to the track group name.
5556
*/
56-
#appendTopLevelHeaderAtLevel(currentLevel: number, expanded?: boolean): void {
57-
const style =
58-
buildGroupStyle({shareHeaderLine: true, collapsible: PerfUI.FlameChart.GroupCollapsibleState.IF_MULTI_ROW});
57+
#appendTopLevelHeaderAtLevel(currentLevel: number, compact: boolean, expanded?: boolean): void {
58+
const style = compact ?
59+
buildGroupStyle({shareHeaderLine: true, collapsible: PerfUI.FlameChart.GroupCollapsibleState.NEVER}) :
60+
buildGroupStyle({shareHeaderLine: false, collapsible: PerfUI.FlameChart.GroupCollapsibleState.ALWAYS});
5961
const headerTitle = this.#extensionTopLevelTrack.name;
6062
const jsLogContext = this.#extensionTopLevelTrack.name === '🅰️ Angular' ? VisualLoggingTrackName.ANGULAR_TRACK :
6163
VisualLoggingTrackName.EXTENSION;
Binary file not shown.
2.51 KB
Loading

0 commit comments

Comments
 (0)