chrome-devtools-frontend 1.0.1512147 → 1.0.1513662

package/front_end/panels/timeline/TimelineFlameChartDataProvider.ts

@@ -130,11 +130,11 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
     PerfUI.FlameChart.FlameChartDataProvider {
   private droppedFramePattern: CanvasPattern|null;
   private partialFramePattern: CanvasPattern|null;
-  private timelineDataInternal: PerfUI.FlameChart.FlameChartTimelineData|null = null;
+  #timelineData: PerfUI.FlameChart.FlameChartTimelineData|null = null;
   private currentLevel = 0;
 
   private compatibilityTracksAppender: CompatibilityTracksAppender|null = null;
-  private parsedTrace: Trace.Handlers.Types.ParsedTrace|null = null;
+  private parsedTrace: Trace.TraceModel.ParsedTrace|null = null;
 
   #minimumBoundary = 0;
   private timeSpan = 0;
@@ -455,10 +455,10 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
     return Object.assign(defaultGroupStyle, extra);
   }
 
-  setModel(parsedTrace: Trace.Handlers.Types.ParsedTrace, entityMapper: Utils.EntityMapper.EntityMapper): void {
+  setModel(parsedTrace: Trace.TraceModel.ParsedTrace, entityMapper: Utils.EntityMapper.EntityMapper): void {
     this.reset();
     this.parsedTrace = parsedTrace;
-    const {traceBounds} = parsedTrace.Meta;
+    const {traceBounds} = parsedTrace.data.Meta;
     const minTime = Trace.Helpers.Timing.microToMilli(traceBounds.min);
     const maxTime = Trace.Helpers.Timing.microToMilli(traceBounds.max);
     this.#minimumBoundary = minTime;
@@ -479,9 +479,9 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
         throw new Error(
             'Attempted to instantiate a CompatibilityTracksAppender without having set the trace parse data first.');
       }
-      this.timelineDataInternal = this.#instantiateTimelineData();
+      this.#timelineData = this.#instantiateTimelineData();
       this.compatibilityTracksAppender = new CompatibilityTracksAppender(
-          this.timelineDataInternal, this.parsedTrace, this.entryData, this.entryTypeByLevel, this.#entityMapper);
+          this.#timelineData, this.parsedTrace, this.entryData, this.entryTypeByLevel, this.#entityMapper);
     }
     return this.compatibilityTracksAppender;
   }
@@ -492,10 +492,10 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
    * creates a new instance and returns it.
    */
   #instantiateTimelineData(): PerfUI.FlameChart.FlameChartTimelineData {
-    if (!this.timelineDataInternal) {
-      this.timelineDataInternal = PerfUI.FlameChart.FlameChartTimelineData.createEmpty();
+    if (!this.#timelineData) {
+      this.#timelineData = PerfUI.FlameChart.FlameChartTimelineData.createEmpty();
     }
-    return this.timelineDataInternal;
+    return this.#timelineData;
   }
 
   /**
@@ -537,7 +537,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
     if (!this.parsedTrace) {
       return [];
     }
-    return this.parsedTrace.Meta.mainFrameNavigations;
+    return this.parsedTrace.data.Meta.mainFrameNavigations;
   }
 
   entryTitle(entryIndex: number): string|null {
@@ -546,7 +546,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
       return '';
     }
     if (entryType === EntryType.TRACK_APPENDER) {
-      const timelineData = (this.timelineDataInternal as PerfUI.FlameChart.FlameChartTimelineData);
+      const timelineData = (this.#timelineData as PerfUI.FlameChart.FlameChartTimelineData);
       const eventLevel = timelineData.entryLevels[entryIndex];
       const event = (this.entryData[entryIndex]);
       return this.compatibilityTracksAppender?.titleForEvent(event, eventLevel) || null;
@@ -581,9 +581,9 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
     this.entryIndexToTitle = [];
     this.#eventIndexByEvent = new Map();
 
-    if (this.timelineDataInternal) {
+    if (this.#timelineData) {
       this.compatibilityTracksAppender?.setFlameChartDataAndEntryData(
-          this.timelineDataInternal, this.entryData, this.entryTypeByLevel);
+          this.#timelineData, this.entryData, this.entryTypeByLevel);
       this.compatibilityTracksAppender?.threadAppenders().forEach(
           threadAppender => threadAppender.setHeaderAppended(false));
     }
@@ -607,7 +607,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
 
     this.compatibilityTracksAppender?.reset();
     this.compatibilityTracksAppender = null;
-    this.timelineDataInternal = null;
+    this.#timelineData = null;
     this.parsedTrace = null;
     this.#entityMapper = null;
     this.#lastInitiatorEntryIndex = -1;
@@ -623,13 +623,13 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
    * the new trace engine). The result built data is cached and returned.
    */
   timelineData(rebuild = false): PerfUI.FlameChart.FlameChartTimelineData {
-    if (!rebuild && this.timelineDataInternal && this.timelineDataInternal.entryLevels.length !== 0) {
+    if (!rebuild && this.#timelineData && this.#timelineData.entryLevels.length !== 0) {
       // If the flame chart data is built already and we don't want to rebuild, we can return the cached data.
       // |entryLevels.length| is used to check if the cached data is not empty (correctly built),
-      return this.timelineDataInternal;
+      return this.#timelineData;
     }
 
-    this.timelineDataInternal = PerfUI.FlameChart.FlameChartTimelineData.createEmpty();
+    this.#timelineData = PerfUI.FlameChart.FlameChartTimelineData.createEmpty();
 
     if (rebuild) {
       // This function will interact with the |compatibilityTracksAppender|, which needs the reference of
@@ -644,13 +644,13 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
       // Note for readers: NodeJS CpuProfiles are purposefully NOT generic.
       // We wrap them in a `TracingStartedInPage` event, which causes them to
       // be treated like "real" Chrome traces. This is by design!
-      if (this.parsedTrace.Meta.traceIsGeneric) {
+      if (this.parsedTrace.data.Meta.traceIsGeneric) {
         this.#processGenericTrace();
       } else {
         this.#processInspectorTrace();
       }
     }
-    return this.timelineDataInternal;
+    return this.#timelineData;
   }
 
   #processGenericTrace(): void {
@@ -662,7 +662,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
 
     for (const [pid, threadAppenders] of appendersByProcess) {
       const processGroupStyle = this.buildGroupStyle({shareHeaderLine: false});
-      const processName = this.parsedTrace?.Meta.processNames.get(pid)?.args.name || 'Process';
+      const processName = this.parsedTrace?.data.Meta.processNames.get(pid)?.args.name || 'Process';
       this.appendHeader(`${processName} (${pid})`, processGroupStyle, true, false);
       for (const appender of threadAppenders) {
         appender.setHeaderNestingLevel(1);
@@ -718,19 +718,19 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
       // main thread track. Therefore in this check we look to see if the
       // current appender is a ThreadAppender and represnets the Main Thread.
       // If it is, we mark the group as selected.
-      if (this.timelineDataInternal && !this.timelineDataInternal.selectedGroup) {
+      if (this.#timelineData && !this.#timelineData.selectedGroup) {
         if (appender instanceof ThreadAppender &&
             (appender.threadType === Trace.Handlers.Threads.ThreadType.MAIN_THREAD ||
              appender.threadType === Trace.Handlers.Threads.ThreadType.CPU_PROFILE)) {
           const group = this.compatibilityTracksAppender?.groupForAppender(appender);
           if (group) {
-            this.timelineDataInternal.selectedGroup = group;
+            this.#timelineData.selectedGroup = group;
           }
         }
       }
     }
-    if (this.timelineDataInternal?.selectedGroup) {
-      this.timelineDataInternal.selectedGroup.expanded = true;
+    if (this.#timelineData?.selectedGroup) {
+      this.#timelineData.selectedGroup.expanded = true;
     }
   }
 
@@ -763,7 +763,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
       if (!Trace.Helpers.Timing.eventIsInBounds(entry, visibleWindow)) {
         continue;
       }
-      if (!filter || filter.accept(entry, this.parsedTrace || undefined)) {
+      if (!filter || filter.accept(entry, this.parsedTrace?.data || undefined)) {
         const startTimeMilli = Trace.Helpers.Timing.microToMilli(entry.ts);
         results.push({index: i, startTimeMilli, provider: 'main'});
       }
@@ -786,9 +786,9 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
     if (!this.parsedTrace) {
       return;
     }
-    const filmStrip = Trace.Extras.FilmStrip.fromParsedTrace(this.parsedTrace);
+    const filmStrip = Trace.Extras.FilmStrip.fromHandlerData(this.parsedTrace.data);
     const hasScreenshots = filmStrip.frames.length > 0;
-    const hasFrames = this.parsedTrace.Frames.frames.length > 0;
+    const hasFrames = this.parsedTrace.data.Frames.frames.length > 0;
     if (!hasFrames && !hasScreenshots) {
       return;
     }
@@ -799,7 +799,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
     this.appendHeader(i18nString(UIStrings.frames), this.framesGroupStyle, false /* selectable */, expanded);
 
     this.entryTypeByLevel[this.currentLevel] = EntryType.FRAME;
-    for (const frame of this.parsedTrace.Frames.frames) {
+    for (const frame of this.parsedTrace.data.Frames.frames) {
       this.#appendFrame(frame);
     }
     ++this.currentLevel;
@@ -811,7 +811,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
   }
 
   #appendScreenshots(filmStrip: Trace.Extras.FilmStrip.Data): void {
-    if (!this.timelineDataInternal || !this.parsedTrace) {
+    if (!this.#timelineData || !this.parsedTrace) {
       return;
     }
     this.appendHeader('', this.screenshotsGroupStyle, false /* selectable */);
@@ -821,18 +821,19 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
     for (const filmStripFrame of filmStrip.frames) {
       const screenshotTimeInMilliSeconds = Trace.Helpers.Timing.microToMilli(filmStripFrame.screenshotEvent.ts);
       this.entryData.push(filmStripFrame.screenshotEvent);
-      (this.timelineDataInternal.entryLevels as number[]).push(this.currentLevel);
-      (this.timelineDataInternal.entryStartTimes as number[]).push(screenshotTimeInMilliSeconds);
+      (this.#timelineData.entryLevels as number[]).push(this.currentLevel);
+      (this.#timelineData.entryStartTimes as number[]).push(screenshotTimeInMilliSeconds);
       if (prevTimestamp) {
-        (this.timelineDataInternal.entryTotalTimes as number[]).push(screenshotTimeInMilliSeconds - prevTimestamp);
+        (this.#timelineData.entryTotalTimes as number[]).push(screenshotTimeInMilliSeconds - prevTimestamp);
       }
       prevTimestamp = screenshotTimeInMilliSeconds;
     }
     if (filmStrip.frames.length && prevTimestamp !== undefined) {
-      const maxRecordTimeMillis = Trace.Helpers.Timing.traceWindowMilliSeconds(this.parsedTrace.Meta.traceBounds).max;
+      const maxRecordTimeMillis =
+          Trace.Helpers.Timing.traceWindowMilliSeconds(this.parsedTrace.data.Meta.traceBounds).max;
 
       // Set the total time of the final screenshot so it takes up the remainder of the trace.
-      (this.timelineDataInternal.entryTotalTimes as number[]).push(maxRecordTimeMillis - prevTimestamp);
+      (this.#timelineData.entryTotalTimes as number[]).push(maxRecordTimeMillis - prevTimestamp);
     }
     ++this.currentLevel;
   }
@@ -855,7 +856,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
         return null;
       }
       const event = (this.entryData[entryIndex]);
-      const timelineData = (this.timelineDataInternal as PerfUI.FlameChart.FlameChartTimelineData);
+      const timelineData = (this.#timelineData as PerfUI.FlameChart.FlameChartTimelineData);
       const eventLevel = timelineData.entryLevels[entryIndex];
       const popoverInfo = this.compatibilityTracksAppender.popoverInfo(event, eventLevel);
       title = popoverInfo.title;
@@ -922,7 +923,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
       return;
     }
 
-    const timelineData = (this.timelineDataInternal as PerfUI.FlameChart.FlameChartTimelineData);
+    const timelineData = (this.#timelineData as PerfUI.FlameChart.FlameChartTimelineData);
     const eventLevel = timelineData.entryLevels[entryIndex];
     const event = (this.entryData[entryIndex]);
     return this.compatibilityTracksAppender?.getDrawOverride(event, eventLevel);
@@ -952,7 +953,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
       return this.#entryColorForFrame(entryIndex);
     }
     if (entryType === EntryType.TRACK_APPENDER) {
-      const timelineData = (this.timelineDataInternal as PerfUI.FlameChart.FlameChartTimelineData);
+      const timelineData = (this.#timelineData as PerfUI.FlameChart.FlameChartTimelineData);
       const eventLevel = timelineData.entryLevels[entryIndex];
       const event = (this.entryData[entryIndex]);
       return this.compatibilityTracksAppender?.colorForEvent(event, eventLevel) || '';
@@ -1194,14 +1195,14 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
       // decorated.
       return true;
     }
-    return Boolean(this.parsedTrace?.Warnings.perEvent.get(event));
+    return Boolean(this.parsedTrace?.data.Warnings.perEvent.get(event));
   }
 
   private appendHeader(title: string, style: PerfUI.FlameChart.GroupStyle, selectable: boolean, expanded?: boolean):
       PerfUI.FlameChart.Group {
     const group =
         ({startLevel: this.currentLevel, name: title, style, selectable, expanded} as PerfUI.FlameChart.Group);
-    (this.timelineDataInternal as PerfUI.FlameChart.FlameChartTimelineData).groups.push(group);
+    (this.#timelineData as PerfUI.FlameChart.FlameChartTimelineData).groups.push(group);
     return group;
   }
 
@@ -1210,12 +1211,12 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
     this.entryData.push(frame);
     const durationMilliseconds = Trace.Helpers.Timing.microToMilli(frame.duration);
     this.entryIndexToTitle[index] = i18n.TimeUtilities.millisToString(durationMilliseconds, true);
-    if (!this.timelineDataInternal) {
+    if (!this.#timelineData) {
       return;
     }
-    this.timelineDataInternal.entryLevels[index] = this.currentLevel;
-    this.timelineDataInternal.entryTotalTimes[index] = durationMilliseconds;
-    this.timelineDataInternal.entryStartTimes[index] = Trace.Helpers.Timing.microToMilli(frame.startTime);
+    this.#timelineData.entryLevels[index] = this.currentLevel;
+    this.#timelineData.entryTotalTimes[index] = durationMilliseconds;
+    this.#timelineData.entryStartTimes[index] = Trace.Helpers.Timing.microToMilli(frame.startTime);
   }
 
   createSelection(entryIndex: number): TimelineSelection|null {
@@ -1235,7 +1236,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
     if (!this.compatibilityTracksAppender) {
       return null;
     }
-    const level = this.timelineDataInternal?.entryLevels[entryIndex] ?? null;
+    const level = this.#timelineData?.entryLevels[entryIndex] ?? null;
     if (level === null) {
       return null;
     }
@@ -1264,7 +1265,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
     // the case that this Entry is hidden by the Context Menu action.
     // Try revealing the entry and getting the index again.
     if (index === -1) {
-      if (this.timelineDataInternal?.selectedGroup) {
+      if (this.#timelineData?.selectedGroup) {
         ModificationsManager.activeManager()?.getEntriesFilter().revealEntry(selection.event);
         this.timelineData(true);
       }
@@ -1304,7 +1305,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
    * @returns if we should re-render the flame chart (canvas)
    */
   buildFlowForInitiator(entryIndex: number): boolean {
-    if (!this.parsedTrace || !this.compatibilityTracksAppender || !this.timelineDataInternal) {
+    if (!this.parsedTrace || !this.compatibilityTracksAppender || !this.#timelineData) {
       return false;
     }
 
@@ -1317,16 +1318,16 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
 
     this.#lastInitiatorEntryIndex = entryIndex;
 
-    const previousInitiatorsDataLength = this.timelineDataInternal.initiatorsData.length;
+    const previousInitiatorsDataLength = this.#timelineData.initiatorsData.length;
 
     if (entryIndex === -1) {
       // User has deselected an event, so if it had any initiators we need to clear them.
-      if (this.timelineDataInternal.initiatorsData.length === 0) {
+      if (this.#timelineData.initiatorsData.length === 0) {
         // The previous selected entry had no initiators, so we can early exit and not redraw anything.
         return false;
       }
       // Clear initiator data and trigger a re-render.
-      this.timelineDataInternal.emptyInitiators();
+      this.#timelineData.emptyInitiators();
       return true;
     }
 
@@ -1340,7 +1341,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
     // Avoid re-building the initiators if we already did it previously.
     const cached = this.#initiatorsCache.get(entryIndex);
     if (cached) {
-      this.timelineDataInternal.initiatorsData = cached;
+      this.#timelineData.initiatorsData = cached;
       return true;
     }
 
@@ -1349,7 +1350,7 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
     // 2. Know that it's not an event with initiators that are cached.
     const event = this.entryData[entryIndex];
     // Reset to clear any previous arrows from the last event.
-    this.timelineDataInternal.emptyInitiators();
+    this.#timelineData.emptyInitiators();
 
     const hiddenEvents: Trace.Types.Events.Event[] =
         ModificationsManager.activeManager()?.getEntriesFilter().invisibleEntries() ?? [];
@@ -1376,14 +1377,14 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
       if (eventIndex === null || initiatorIndex === null) {
         continue;
       }
-      this.timelineDataInternal.initiatorsData.push({
+      this.#timelineData.initiatorsData.push({
         initiatorIndex,
         eventIndex,
         isInitiatorHidden: initiatorData.isInitiatorHidden,
         isEntryHidden: initiatorData.isEntryHidden,
       });
     }
-    this.#initiatorsCache.set(entryIndex, this.timelineDataInternal.initiatorsData);
+    this.#initiatorsCache.set(entryIndex, this.#timelineData.initiatorsData);
     return true;
   }
 

package/front_end/panels/timeline/TimelineFlameChartNetworkDataProvider.ts

@@ -32,9 +32,9 @@ export class TimelineFlameChartNetworkDataProvider implements PerfUI.FlameChart.
   #maxLevel = 0;
   #networkTrackAppender: NetworkTrackAppender|null = null;
 
-  #timelineDataInternal: PerfUI.FlameChart.FlameChartTimelineData|null = null;
+  #timelineData: PerfUI.FlameChart.FlameChartTimelineData|null = null;
   #lastSelection: Selection|null = null;
-  #parsedTrace: Trace.Handlers.Types.ParsedTrace|null = null;
+  #parsedTrace: Trace.TraceModel.ParsedTrace|null = null;
   #eventIndexByEvent = new Map<NetworkTrackEvent, number|null>();
   // -1 means no entry is selected.
   #lastInitiatorEntry = -1;
@@ -57,13 +57,13 @@ export class TimelineFlameChartNetworkDataProvider implements PerfUI.FlameChart.
     this.#timeSpan = 0;
     this.#eventIndexByEvent.clear();
     this.#events = [];
-    this.#timelineDataInternal = null;
+    this.#timelineData = null;
     this.#parsedTrace = null;
 
     this.#networkTrackAppender = null;
   }
 
-  setModel(parsedTrace: Trace.Handlers.Types.ParsedTrace, entityMapper: TimelineUtils.EntityMapper.EntityMapper): void {
+  setModel(parsedTrace: Trace.TraceModel.ParsedTrace, entityMapper: TimelineUtils.EntityMapper.EntityMapper): void {
     this.reset();
     this.#parsedTrace = parsedTrace;
     this.#entityMapper = entityMapper;
@@ -72,17 +72,17 @@ export class TimelineFlameChartNetworkDataProvider implements PerfUI.FlameChart.
     this.#setTimingBoundsData(this.#parsedTrace);
   }
 
-  setEvents(parsedTrace: Trace.Handlers.Types.ParsedTrace): void {
-    if (parsedTrace.NetworkRequests.webSocket) {
-      parsedTrace.NetworkRequests.webSocket.forEach(webSocketData => {
+  setEvents(parsedTrace: Trace.TraceModel.ParsedTrace): void {
+    if (parsedTrace.data.NetworkRequests.webSocket) {
+      parsedTrace.data.NetworkRequests.webSocket.forEach(webSocketData => {
         if (webSocketData.syntheticConnection) {
           this.#events.push(webSocketData.syntheticConnection);
         }
         this.#events.push(...webSocketData.events);
       });
     }
-    if (parsedTrace.NetworkRequests.byTime) {
-      this.#events.push(...parsedTrace.NetworkRequests.byTime);
+    if (parsedTrace.data.NetworkRequests.byTime) {
+      this.#events.push(...parsedTrace.data.NetworkRequests.byTime);
     }
   }
 
@@ -100,23 +100,23 @@ export class TimelineFlameChartNetworkDataProvider implements PerfUI.FlameChart.
   }
 
   timelineData(): PerfUI.FlameChart.FlameChartTimelineData {
-    if (this.#timelineDataInternal && this.#timelineDataInternal.entryLevels.length !== 0) {
+    if (this.#timelineData && this.#timelineData.entryLevels.length !== 0) {
       // The flame chart data is built already, so return the cached data.
-      return this.#timelineDataInternal;
+      return this.#timelineData;
     }
 
-    this.#timelineDataInternal = PerfUI.FlameChart.FlameChartTimelineData.createEmpty();
+    this.#timelineData = PerfUI.FlameChart.FlameChartTimelineData.createEmpty();
     if (!this.#parsedTrace) {
-      return this.#timelineDataInternal;
+      return this.#timelineData;
     }
 
     if (!this.#events.length) {
       this.setEvents(this.#parsedTrace);
     }
-    this.#networkTrackAppender = new NetworkTrackAppender(this.#timelineDataInternal, this.#events);
+    this.#networkTrackAppender = new NetworkTrackAppender(this.#timelineData, this.#events);
     this.#maxLevel = this.#networkTrackAppender.appendTrackAtLevel(0);
 
-    return this.#timelineDataInternal;
+    return this.#timelineData;
   }
 
   minimumBoundary(): number {
@@ -413,8 +413,8 @@ export class TimelineFlameChartNetworkDataProvider implements PerfUI.FlameChart.
    * Sets the minimum time and total time span of a trace using the
    * new engine data.
    */
-  #setTimingBoundsData(newParsedTrace: Trace.Handlers.Types.ParsedTrace): void {
-    const {traceBounds} = newParsedTrace.Meta;
+  #setTimingBoundsData(newParsedTrace: Trace.TraceModel.ParsedTrace): void {
+    const {traceBounds} = newParsedTrace.data.Meta;
     const minTime = Trace.Helpers.Timing.microToMilli(traceBounds.min);
     const maxTime = Trace.Helpers.Timing.microToMilli(traceBounds.max);
     this.#minimumBoundary = minTime;
@@ -429,7 +429,7 @@ export class TimelineFlameChartNetworkDataProvider implements PerfUI.FlameChart.
    * to re-render.
    */
   #updateTimelineData(startTime: Trace.Types.Timing.Milli, endTime: Trace.Types.Timing.Milli): void {
-    if (!this.#networkTrackAppender || !this.#timelineDataInternal) {
+    if (!this.#networkTrackAppender || !this.#timelineData) {
       return;
     }
     this.#maxLevel = this.#networkTrackAppender.relayoutEntriesWithinBounds(this.#events, startTime, endTime);
@@ -437,13 +437,13 @@ export class TimelineFlameChartNetworkDataProvider implements PerfUI.FlameChart.
     // TODO(crbug.com/1459225): Remove this recreating code.
     // Force to create a new PerfUI.FlameChart.FlameChartTimelineData instance
     // to force the flamechart to re-render. This also causes crbug.com/1459225.
-    this.#timelineDataInternal = PerfUI.FlameChart.FlameChartTimelineData.create({
-      entryLevels: this.#timelineDataInternal?.entryLevels,
-      entryTotalTimes: this.#timelineDataInternal?.entryTotalTimes,
-      entryStartTimes: this.#timelineDataInternal?.entryStartTimes,
-      groups: this.#timelineDataInternal?.groups,
-      initiatorsData: this.#timelineDataInternal.initiatorsData,
-      entryDecorations: this.#timelineDataInternal.entryDecorations,
+    this.#timelineData = PerfUI.FlameChart.FlameChartTimelineData.create({
+      entryLevels: this.#timelineData?.entryLevels,
+      entryTotalTimes: this.#timelineData?.entryTotalTimes,
+      entryStartTimes: this.#timelineData?.entryStartTimes,
+      groups: this.#timelineData?.groups,
+      initiatorsData: this.#timelineData.initiatorsData,
+      entryDecorations: this.#timelineData.entryDecorations,
     });
   }
 
@@ -512,7 +512,7 @@ export class TimelineFlameChartNetworkDataProvider implements PerfUI.FlameChart.
         continue;
       }
 
-      if (!filter || filter.accept(entry, this.#parsedTrace ?? undefined)) {
+      if (!filter || filter.accept(entry, this.#parsedTrace?.data ?? undefined)) {
         const startTimeMilli = Trace.Helpers.Timing.microToMilli(entry.ts);
         results.push({startTimeMilli, index: i, provider: 'network'});
       }
@@ -529,19 +529,19 @@ export class TimelineFlameChartNetworkDataProvider implements PerfUI.FlameChart.
     if (!this.#parsedTrace) {
       return [];
     }
-    return this.#parsedTrace.Meta.mainFrameNavigations;
+    return this.#parsedTrace.data.Meta.mainFrameNavigations;
   }
 
   buildFlowForInitiator(entryIndex: number): boolean {
     if (!this.#parsedTrace) {
       return false;
     }
-    if (!this.#timelineDataInternal) {
+    if (!this.#timelineData) {
       return false;
     }
     if (entryIndex > -1 && this.#lastInitiatorEntry === entryIndex) {
       if (this.#lastInitiatorsData) {
-        this.#timelineDataInternal.initiatorsData = this.#lastInitiatorsData;
+        this.#timelineData.initiatorsData = this.#lastInitiatorsData;
       }
       return true;
     }
@@ -550,7 +550,7 @@ export class TimelineFlameChartNetworkDataProvider implements PerfUI.FlameChart.
     }
 
     // Remove all previously assigned decorations indicating that the flow event entries are hidden
-    const previousInitiatorsDataLength = this.#timelineDataInternal.initiatorsData.length;
+    const previousInitiatorsDataLength = this.#timelineData.initiatorsData.length;
     // |entryIndex| equals -1 means there is no entry selected, just clear the
     // initiator cache if there is any previous arrow and return true to
     // re-render.
@@ -561,13 +561,13 @@ export class TimelineFlameChartNetworkDataProvider implements PerfUI.FlameChart.
         return false;
       }
       // Reset to clear any previous arrows from the last event.
-      this.#timelineDataInternal.emptyInitiators();
+      this.#timelineData.emptyInitiators();
       return true;
     }
 
     const event = this.#events[entryIndex];
     // Reset to clear any previous arrows from the last event.
-    this.#timelineDataInternal.emptyInitiators();
+    this.#timelineData.emptyInitiators();
     this.#lastInitiatorEntry = entryIndex;
 
     const initiatorsData = initiatorsDataToDrawForNetwork(this.#parsedTrace, event);
@@ -581,12 +581,12 @@ export class TimelineFlameChartNetworkDataProvider implements PerfUI.FlameChart.
       if (eventIndex === null || initiatorIndex === null) {
         continue;
       }
-      this.#timelineDataInternal.initiatorsData.push({
+      this.#timelineData.initiatorsData.push({
         initiatorIndex,
         eventIndex,
       });
     }
-    this.#lastInitiatorsData = this.#timelineDataInternal.initiatorsData;
+    this.#lastInitiatorsData = this.#timelineData.initiatorsData;
     return true;
   }
 }