Skip to content

Commit 6ab4487

Browse files
jackfranklinDevtools-frontend LUCI CQ
authored andcommitted
RPP: tidy up trace bounds usage in TimelineMiniMap
R=alinavarkki@chromium.org Bug: none Change-Id: I0cc0c334e52caeace180936e263d5b5e2be29d6f Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6624559 Auto-Submit: Jack Franklin <jacktfranklin@chromium.org> Reviewed-by: Alina Varkki <alinavarkki@chromium.org> Commit-Queue: Jack Franklin <jacktfranklin@chromium.org> Commit-Queue: Alina Varkki <alinavarkki@chromium.org>
1 parent 06dbed9 commit 6ab4487

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

front_end/panels/network/NetworkPanel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ export class NetworkPanel extends UI.Panel.Panel implements
821821

822822
private onFilmFrameSelected(event: Common.EventTarget.EventTargetEvent<number>): void {
823823
const timestamp = event.data;
824-
this.overviewPane.setWindowTimes(0, timestamp);
824+
this.overviewPane.setWindowTimes(Trace.Types.Timing.Milli(0), Trace.Types.Timing.Milli(timestamp));
825825
}
826826

827827
private onFilmFrameEnter(event: Common.EventTarget.EventTargetEvent<number>): void {

front_end/panels/timeline/TimelineMiniMap.test.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ describeWithEnvironment('TimelineMiniMap', function() {
3434
showScreenshots: true,
3535
},
3636
});
37-
// This needs to happen once the MiniMap is in the DOM in order to first set the trace bounds.
38-
TraceBounds.TraceBounds.BoundsManager.instance().resetWithNewBounds(parsedTrace.Meta.traceBounds);
39-
4037
// Now we can zoom into the main thread activity; this means the resize handles are
4138
// not both on the edge of the screen, so it's a more representative screenshot.
4239
const mainThread = getMainThread(parsedTrace.Renderer);

front_end/panels/timeline/TimelineMiniMap.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,14 @@ export class TimelineMiniMap extends
8686
this.#overviewComponent.enableCreateBreadcrumbsButton();
8787

8888
TraceBounds.TraceBounds.onChange(this.#onTraceBoundsChangeBound);
89+
// Set the initial bounds for the overview. Otherwise if we mount & there
90+
// is not an immediate RESET event, then we don't render correctly.
91+
const state = TraceBounds.TraceBounds.BoundsManager.instance().state();
92+
if (state) {
93+
const {timelineTraceWindow, minimapTraceBounds} = state.milli;
94+
this.#overviewComponent.setWindowTimes(timelineTraceWindow.min, timelineTraceWindow.max);
95+
this.#overviewComponent.setBounds(minimapTraceBounds.min, minimapTraceBounds.max);
96+
}
8997
}
9098

9199
#onOverviewPanelWindowChanged(

front_end/ui/legacy/components/perf_ui/TimelineOverviewPane.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ export class TimelineOverviewPane extends Common.ObjectWrapper.eventMixin<EventT
5252
private cursorEnabled = false;
5353
private cursorPosition = 0;
5454
private lastWidth = 0;
55-
private windowStartTime = 0;
56-
private windowEndTime = Infinity;
55+
private windowStartTime = Trace.Types.Timing.Milli(0);
56+
private windowEndTime = Trace.Types.Timing.Milli(Infinity);
5757
private muteOnWindowChanged = false;
5858
#dimHighlightSVG: Element;
5959

@@ -239,8 +239,8 @@ export class TimelineOverviewPane extends Common.ObjectWrapper.eventMixin<EventT
239239
}
240240

241241
reset(): void {
242-
this.windowStartTime = 0;
243-
this.windowEndTime = Infinity;
242+
this.windowStartTime = Trace.Types.Timing.Milli(0);
243+
this.windowEndTime = Trace.Types.Timing.Milli(Infinity);
244244
this.overviewCalculator.reset();
245245
this.overviewGrid.reset();
246246
this.overviewGrid.setResizeEnabled(false);
@@ -274,10 +274,10 @@ export class TimelineOverviewPane extends Common.ObjectWrapper.eventMixin<EventT
274274
return;
275275
}
276276

277-
this.windowStartTime =
278-
event.data.rawStartValue === this.overviewCalculator.minimumBoundary() ? 0 : event.data.rawStartValue;
279-
this.windowEndTime =
280-
event.data.rawEndValue === this.overviewCalculator.maximumBoundary() ? Infinity : event.data.rawEndValue;
277+
this.windowStartTime = Trace.Types.Timing.Milli(
278+
event.data.rawStartValue === this.overviewCalculator.minimumBoundary() ? 0 : event.data.rawStartValue);
279+
this.windowEndTime = Trace.Types.Timing.Milli(
280+
event.data.rawEndValue === this.overviewCalculator.maximumBoundary() ? Infinity : event.data.rawEndValue);
281281

282282
const windowTimes = {
283283
startTime: Trace.Types.Timing.Milli(this.windowStartTime),
@@ -287,7 +287,7 @@ export class TimelineOverviewPane extends Common.ObjectWrapper.eventMixin<EventT
287287
this.dispatchEventToListeners(Events.OVERVIEW_PANE_WINDOW_CHANGED, windowTimes);
288288
}
289289

290-
setWindowTimes(startTime: number, endTime: number): void {
290+
setWindowTimes(startTime: Trace.Types.Timing.Milli, endTime: Trace.Types.Timing.Milli): void {
291291
if (startTime === this.windowStartTime && endTime === this.windowEndTime) {
292292
return;
293293
}

0 commit comments

Comments
 (0)