chrome-devtools-frontend 1.0.1512147 → 1.0.1513662

package/front_end/panels/sources/WatchExpressionsSidebarPane.ts

@@ -307,10 +307,10 @@ export class WatchExpressionsSidebarPane extends UI.ThrottledWidget.ThrottledWid
 }
 
 export class WatchExpression extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
-  private treeElementInternal!: UI.TreeOutline.TreeElement;
+  #treeElement!: UI.TreeOutline.TreeElement;
   private nameElement!: Element;
   private valueElement!: Element;
-  private expressionInternal: string|null;
+  #expression: string|null;
   private readonly expandController: ObjectUI.ObjectPropertiesSection.ObjectPropertiesSectionsTreeExpandController;
   private element: HTMLDivElement;
   private editing: boolean;
@@ -324,7 +324,7 @@ export class WatchExpression extends Common.ObjectWrapper.ObjectWrapper<EventTyp
       linkifier: Components.Linkifier.Linkifier) {
     super();
 
-    this.expressionInternal = expression;
+    this.#expression = expression;
     this.expandController = expandController;
     this.element = document.createElement('div');
     this.element.classList.add('watch-expression');
@@ -337,11 +337,11 @@ export class WatchExpression extends Common.ObjectWrapper.ObjectWrapper<EventTyp
   }
 
   treeElement(): UI.TreeOutline.TreeElement {
-    return this.treeElementInternal;
+    return this.#treeElement;
   }
 
   expression(): string|null {
-    return this.expressionInternal;
+    return this.#expression;
   }
 
   async #evaluateExpression(executionContext: SDK.RuntimeModel.ExecutionContext, expression: string):
@@ -371,8 +371,8 @@ export class WatchExpression extends Common.ObjectWrapper.ObjectWrapper<EventTyp
 
   update(): void {
     const currentExecutionContext = UI.Context.Context.instance().flavor(SDK.RuntimeModel.ExecutionContext);
-    if (currentExecutionContext && this.expressionInternal) {
-      void this.#evaluateExpression(currentExecutionContext, this.expressionInternal).then(result => {
+    if (currentExecutionContext && this.#expression) {
+      void this.#evaluateExpression(currentExecutionContext, this.#expression).then(result => {
         if ('object' in result) {
           this.createWatchExpression(result.object, result.exceptionDetails);
         } else {
@@ -386,15 +386,15 @@ export class WatchExpression extends Common.ObjectWrapper.ObjectWrapper<EventTyp
 
   startEditing(): void {
     this.editing = true;
-    this.treeElementInternal.setDisableSelectFocus(true);
+    this.#treeElement.setDisableSelectFocus(true);
     this.element.removeChildren();
     const newDiv = this.element.createChild('div');
     newDiv.textContent = this.nameElement.textContent;
     this.textPrompt = new ObjectUI.ObjectPropertiesSection.ObjectPropertyPrompt();
     this.textPrompt.renderAsBlock();
     const proxyElement = (this.textPrompt.attachAndStartEditing(newDiv, this.finishEditing.bind(this)) as HTMLElement);
-    this.treeElementInternal.listItemElement.classList.add('watch-expression-editing');
-    this.treeElementInternal.collapse();
+    this.#treeElement.listItemElement.classList.add('watch-expression-editing');
+    this.#treeElement.collapse();
     proxyElement.classList.add('watch-expression-text-prompt-proxy');
     proxyElement.addEventListener('keydown', this.promptKeyDown.bind(this), false);
     const selection = this.element.getComponentSelection();
@@ -413,11 +413,11 @@ export class WatchExpression extends Common.ObjectWrapper.ObjectWrapper<EventTyp
     }
 
     this.editing = false;
-    this.treeElementInternal.setDisableSelectFocus(false);
-    this.treeElementInternal.listItemElement.classList.remove('watch-expression-editing');
+    this.#treeElement.setDisableSelectFocus(false);
+    this.#treeElement.listItemElement.classList.remove('watch-expression-editing');
     if (this.textPrompt) {
       this.textPrompt.detach();
-      const newExpression = canceled ? this.expressionInternal : this.textPrompt.text();
+      const newExpression = canceled ? this.#expression : this.textPrompt.text();
       this.textPrompt = undefined;
       this.element.removeChildren();
       this.updateExpression(newExpression);
@@ -432,10 +432,10 @@ export class WatchExpression extends Common.ObjectWrapper.ObjectWrapper<EventTyp
   }
 
   private updateExpression(newExpression: string|null): void {
-    if (this.expressionInternal) {
-      this.expandController.stopWatchSectionsWithId(this.expressionInternal);
+    if (this.#expression) {
+      this.expandController.stopWatchSectionsWithId(this.#expression);
     }
-    this.expressionInternal = newExpression;
+    this.#expression = newExpression;
     this.update();
     this.dispatchEventToListeners(Events.EXPRESSION_UPDATED, this);
   }
@@ -451,15 +451,15 @@ export class WatchExpression extends Common.ObjectWrapper.ObjectWrapper<EventTyp
     this.result = result || null;
 
     this.element.removeChildren();
-    const oldTreeElement = this.treeElementInternal;
+    const oldTreeElement = this.#treeElement;
     this.createWatchExpressionTreeElement(result, exceptionDetails);
     if (oldTreeElement?.parent) {
       const root = oldTreeElement.parent;
       const index = root.indexOfChild(oldTreeElement);
       root.removeChild(oldTreeElement);
-      root.insertChild(this.treeElementInternal, index);
+      root.insertChild(this.#treeElement, index);
     }
-    this.treeElementInternal.select();
+    this.#treeElement.select();
   }
 
   private createWatchExpressionHeader(
@@ -483,9 +483,8 @@ export class WatchExpression extends Common.ObjectWrapper.ObjectWrapper<EventTyp
 
     const titleElement = headerElement.createChild('div', 'watch-expression-title tree-element-title');
     titleElement.appendChild(deleteButton);
-    this.nameElement =
-        ObjectUI.ObjectPropertiesSection.ObjectPropertiesSection.createNameElement(this.expressionInternal);
-    UI.Tooltip.Tooltip.install(this.nameElement as HTMLElement, this.expressionInternal);
+    this.nameElement = ObjectUI.ObjectPropertiesSection.ObjectPropertiesSection.createNameElement(this.#expression);
+    UI.Tooltip.Tooltip.install(this.nameElement as HTMLElement, this.#expression);
     if (Boolean(exceptionDetails) || !expressionValue) {
       this.valueElement = document.createElement('span');
       this.valueElement.classList.add('watch-expression-error');
@@ -515,20 +514,19 @@ export class WatchExpression extends Common.ObjectWrapper.ObjectWrapper<EventTyp
 
     if (!exceptionDetails && expressionValue && expressionValue.hasChildren && !expressionValue.customPreview()) {
       headerElement.classList.add('watch-expression-object-header');
-      this.treeElementInternal = new ObjectUI.ObjectPropertiesSection.RootElement(expressionValue, this.linkifier);
+      this.#treeElement = new ObjectUI.ObjectPropertiesSection.RootElement(expressionValue, this.linkifier);
       this.expandController.watchSection(
-          (this.expressionInternal as string),
-          (this.treeElementInternal as ObjectUI.ObjectPropertiesSection.RootElement));
-      this.treeElementInternal.toggleOnClick = false;
-      this.treeElementInternal.listItemElement.addEventListener('click', this.onSectionClick.bind(this), false);
-      this.treeElementInternal.listItemElement.addEventListener('dblclick', this.dblClickOnWatchExpression.bind(this));
+          (this.#expression as string), (this.#treeElement as ObjectUI.ObjectPropertiesSection.RootElement));
+      this.#treeElement.toggleOnClick = false;
+      this.#treeElement.listItemElement.addEventListener('click', this.onSectionClick.bind(this), false);
+      this.#treeElement.listItemElement.addEventListener('dblclick', this.dblClickOnWatchExpression.bind(this));
     } else {
       headerElement.addEventListener('dblclick', this.dblClickOnWatchExpression.bind(this));
-      this.treeElementInternal = new UI.TreeOutline.TreeElement();
+      this.#treeElement = new UI.TreeOutline.TreeElement();
     }
-    this.treeElementInternal.title = this.element;
-    this.treeElementInternal.listItemElement.classList.add('watch-expression-tree-item');
-    this.treeElementInternal.listItemElement.addEventListener('keydown', event => {
+    this.#treeElement.title = this.element;
+    this.#treeElement.listItemElement.classList.add('watch-expression-tree-item');
+    this.#treeElement.listItemElement.addEventListener('keydown', event => {
       if (event.key === 'Enter' && !this.isEditing()) {
         this.startEditing();
         event.consume(true);
@@ -549,14 +547,14 @@ export class WatchExpression extends Common.ObjectWrapper.ObjectWrapper<EventTyp
     }
 
     function handleClick(this: WatchExpression): void {
-      if (!this.treeElementInternal) {
+      if (!this.#treeElement) {
         return;
       }
 
-      if (this.treeElementInternal.expanded) {
-        this.treeElementInternal.collapse();
+      if (this.#treeElement.expanded) {
+        this.#treeElement.collapse();
       } else if (!this.editing) {
-        this.treeElementInternal.expand();
+        this.#treeElement.expand();
       }
     }
   }

package/front_end/panels/timeline/AnimationsTrackAppender.ts

@@ -29,16 +29,16 @@ export class AnimationsTrackAppender implements TrackAppender {
   readonly appenderName: TrackAppenderName = 'Animations';
 
   #compatibilityBuilder: CompatibilityTracksAppender;
-  #parsedTrace: Readonly<Trace.Handlers.Types.ParsedTrace>;
+  #parsedTrace: Readonly<Trace.TraceModel.ParsedTrace>;
   #eventAppendedCallback = this.#eventAppendedCallbackFunction.bind(this);
 
-  constructor(compatibilityBuilder: CompatibilityTracksAppender, parsedTrace: Trace.Handlers.Types.ParsedTrace) {
+  constructor(compatibilityBuilder: CompatibilityTracksAppender, parsedTrace: Trace.TraceModel.ParsedTrace) {
     this.#compatibilityBuilder = compatibilityBuilder;
     this.#parsedTrace = parsedTrace;
   }
 
   appendTrackAtLevel(trackStartLevel: number, expanded?: boolean|undefined): number {
-    const animations = this.#parsedTrace.Animations.animations;
+    const animations = this.#parsedTrace.data.Animations.animations;
     if (animations.length === 0) {
       return trackStartLevel;
     }

package/front_end/panels/timeline/CompatibilityTracksAppender.ts

@@ -46,8 +46,8 @@ function isShowPostMessageEventsEnabled(): boolean {
 }
 
 export function entryIsVisibleInTimeline(
-    entry: Trace.Types.Events.Event, parsedTrace?: Trace.Handlers.Types.ParsedTrace): boolean {
-  if (parsedTrace?.Meta.traceIsGeneric) {
+    entry: Trace.Types.Events.Event, parsedTrace?: Trace.TraceModel.ParsedTrace): boolean {
+  if (parsedTrace?.data.Meta.traceIsGeneric) {
     return true;
   }
 
@@ -188,7 +188,7 @@ export class CompatibilityTracksAppender {
   #eventsForTrack = new Map<TrackAppender, Trace.Types.Events.Event[]>();
   #trackEventsForTreeview = new Map<TrackAppender, Trace.Types.Events.Event[]>();
   #flameChartData: PerfUI.FlameChart.FlameChartTimelineData;
-  #parsedTrace: Trace.Handlers.Types.ParsedTrace;
+  #parsedTrace: Trace.TraceModel.ParsedTrace;
   #entryData: Trace.Types.Events.Event[];
   #colorGenerator: Common.Color.Generator;
   #allTrackAppenders: TrackAppender[] = [];
@@ -218,7 +218,7 @@ export class CompatibilityTracksAppender {
    * @param entityMapper 3P entity data for the trace.
    */
   constructor(
-      flameChartData: PerfUI.FlameChart.FlameChartTimelineData, parsedTrace: Trace.Handlers.Types.ParsedTrace,
+      flameChartData: PerfUI.FlameChart.FlameChartTimelineData, parsedTrace: Trace.TraceModel.ParsedTrace,
       entryData: Trace.Types.Events.Event[], legacyEntryTypeByLevel: EntryType[],
       entityMapper: TimelineUtils.EntityMapper.EntityMapper|null) {
     this.#flameChartData = flameChartData;
@@ -284,7 +284,7 @@ export class CompatibilityTracksAppender {
     if (!TimelinePanel.extensionDataVisibilitySetting().get()) {
       return;
     }
-    const tracks = this.#parsedTrace.ExtensionTraceData.extensionTrackData;
+    const tracks = this.#parsedTrace.data.ExtensionTraceData.extensionTrackData;
     for (const trackData of tracks) {
       this.#allTrackAppenders.push(new ExtensionTrackAppender(this, trackData));
     }
@@ -318,11 +318,11 @@ export class CompatibilityTracksAppender {
           return 8;
       }
     };
-    const threads = Trace.Handlers.Threads.threadsInTrace(this.#parsedTrace);
+    const threads = Trace.Handlers.Threads.threadsInTrace(this.#parsedTrace.data);
     const showAllEvents = Root.Runtime.experiments.isEnabled('timeline-show-all-events');
 
     for (const {pid, tid, name, type, entries, tree} of threads) {
-      if (this.#parsedTrace.Meta.traceIsGeneric) {
+      if (this.#parsedTrace.data.Meta.traceIsGeneric) {
         // If the trace is generic, we just push all of the threads with no effort to differentiate them, hence
         // overriding the thread type to be OTHER for all threads.
         this.#threadAppenders.push(new ThreadAppender(
@@ -334,7 +334,7 @@ export class CompatibilityTracksAppender {
         continue;
       }
 
-      const matchingWorklet = this.#parsedTrace.AuctionWorklets.worklets.get(pid);
+      const matchingWorklet = this.#parsedTrace.data.AuctionWorklets.worklets.get(pid);
       if (matchingWorklet) {
         // Each AuctionWorklet has two key threads:
         // 1. the Utility Thread

package/front_end/panels/timeline/CountersGraph.ts

@@ -167,12 +167,12 @@ export class CountersGraph extends UI.Widget.VBox {
     }
   }
 
-  setModel(parsedTrace: Trace.Handlers.Types.ParsedTrace|null, events: Trace.Types.Events.Event[]|null): void {
+  setModel(parsedTrace: Trace.TraceModel.ParsedTrace|null, events: Trace.Types.Events.Event[]|null): void {
     this.#events = events;
     if (!events || !parsedTrace) {
       return;
     }
-    const minTime = Trace.Helpers.Timing.traceWindowMilliSeconds(parsedTrace.Meta.traceBounds).min;
+    const minTime = Trace.Helpers.Timing.traceWindowMilliSeconds(parsedTrace.data.Meta.traceBounds).min;
     this.calculator.setZeroTime(minTime);
 
     for (let i = 0; i < this.counters.length; ++i) {
@@ -589,28 +589,28 @@ export class CounterUI {
 }
 
 export class Calculator implements Calculator {
-  private minimumBoundaryInternal: number;
-  private maximumBoundaryInternal: number;
+  #minimumBoundary: number;
+  #maximumBoundary: number;
   private workingArea: number;
-  private zeroTimeInternal: number;
+  #zeroTime: number;
 
   constructor() {
-    this.minimumBoundaryInternal = 0;
-    this.maximumBoundaryInternal = 0;
+    this.#minimumBoundary = 0;
+    this.#maximumBoundary = 0;
     this.workingArea = 0;
-    this.zeroTimeInternal = 0;
+    this.#zeroTime = 0;
   }
   setZeroTime(time: number): void {
-    this.zeroTimeInternal = time;
+    this.#zeroTime = time;
   }
 
   computePosition(time: number): number {
-    return (time - this.minimumBoundaryInternal) / this.boundarySpan() * this.workingArea;
+    return (time - this.#minimumBoundary) / this.boundarySpan() * this.workingArea;
   }
 
   setWindow(minimumBoundary: number, maximumBoundary: number): void {
-    this.minimumBoundaryInternal = minimumBoundary;
-    this.maximumBoundaryInternal = maximumBoundary;
+    this.#minimumBoundary = minimumBoundary;
+    this.#maximumBoundary = maximumBoundary;
   }
 
   setDisplayWidth(clientWidth: number): void {
@@ -622,18 +622,18 @@ export class Calculator implements Calculator {
   }
 
   maximumBoundary(): number {
-    return this.maximumBoundaryInternal;
+    return this.#maximumBoundary;
   }
 
   minimumBoundary(): number {
-    return this.minimumBoundaryInternal;
+    return this.#minimumBoundary;
   }
 
   zeroTime(): number {
-    return this.zeroTimeInternal;
+    return this.#zeroTime;
   }
 
   boundarySpan(): number {
-    return this.maximumBoundaryInternal - this.minimumBoundaryInternal;
+    return this.#maximumBoundary - this.#minimumBoundary;
   }
 }

package/front_end/panels/timeline/EntriesFilter.ts

@@ -20,7 +20,7 @@ import {
  * removed before rendering the resulting thread on the timeline.
  */
 export class EntriesFilter {
-  #parsedTrace: Trace.Handlers.Types.ParsedTrace;
+  #parsedTrace: Trace.TraceModel.ParsedTrace;
   // Track the set of invisible entries.
   #invisibleEntries: Trace.Types.Events.Event[] = [];
   // List of entries whose children are hidden. This list is used to
@@ -31,14 +31,15 @@ export class EntriesFilter {
   // will never change so we can avoid running the potentially expensive search again.
   #entryToDescendantsMap = new Map<Trace.Helpers.TreeHelpers.TraceEntryNode, Trace.Types.Events.Event[]>();
 
-  constructor(parsedTrace: Trace.Handlers.Types.ParsedTrace) {
+  constructor(parsedTrace: Trace.TraceModel.ParsedTrace) {
     this.#parsedTrace = parsedTrace;
   }
 
   #getEntryNode(entry: Trace.Types.Events.Event): Trace.Helpers.TreeHelpers.TraceEntryNode|undefined {
     // The entry might be either from the Samples handler or Renderer handler. So we need to check both handlers to find
     // the EntryNode.
-    return this.#parsedTrace.Samples.entryToNode.get(entry) ?? this.#parsedTrace.Renderer.entryToNode.get(entry);
+    return this.#parsedTrace.data.Samples.entryToNode.get(entry) ??
+        this.#parsedTrace.data.Renderer.entryToNode.get(entry);
   }
 
   /**

package/front_end/panels/timeline/EventsTimelineTreeView.ts

@@ -128,16 +128,16 @@ export class EventsTimelineTreeView extends TimelineTreeView {
 export class Filters extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
   private readonly categoryFilter: Category;
   private readonly durationFilter: IsLong;
-  private readonly filtersInternal: Array<IsLong|Category>;
+  readonly #filters: Array<IsLong|Category>;
   constructor() {
     super();
     this.categoryFilter = new Category();
     this.durationFilter = new IsLong();
-    this.filtersInternal = [this.categoryFilter, this.durationFilter];
+    this.#filters = [this.categoryFilter, this.durationFilter];
   }
 
   filters(): Trace.Extras.TraceFilter.TraceFilter[] {
-    return this.filtersInternal;
+    return this.#filters;
   }
 
   populateToolbar(toolbar: UI.Toolbar.Toolbar): void {

package/front_end/panels/timeline/GPUTrackAppender.ts

@@ -27,9 +27,9 @@ export class GPUTrackAppender implements TrackAppender {
   readonly appenderName: TrackAppenderName = 'GPU';
 
   #compatibilityBuilder: CompatibilityTracksAppender;
-  #parsedTrace: Readonly<Trace.Handlers.Types.ParsedTrace>;
+  #parsedTrace: Readonly<Trace.TraceModel.ParsedTrace>;
 
-  constructor(compatibilityBuilder: CompatibilityTracksAppender, parsedTrace: Trace.Handlers.Types.ParsedTrace) {
+  constructor(compatibilityBuilder: CompatibilityTracksAppender, parsedTrace: Trace.TraceModel.ParsedTrace) {
     this.#compatibilityBuilder = compatibilityBuilder;
     this.#parsedTrace = parsedTrace;
   }
@@ -44,7 +44,7 @@ export class GPUTrackAppender implements TrackAppender {
    * appended the track's events.
    */
   appendTrackAtLevel(trackStartLevel: number, expanded?: boolean|undefined): number {
-    const gpuEvents = this.#parsedTrace.GPU.mainGPUThreadTasks;
+    const gpuEvents = this.#parsedTrace.data.GPU.mainGPUThreadTasks;
     if (gpuEvents.length === 0) {
       return trackStartLevel;
     }

package/front_end/panels/timeline/Initiators.ts

@@ -34,12 +34,12 @@ const MAX_PREDECESSOR_INITIATOR_LIMIT = 10;
  * work backwards to draw each one, as well as the events initiated directly by the entry.
  */
 export function initiatorsDataToDraw(
-    parsedTrace: Trace.Handlers.Types.ParsedTrace, selectedEvent: Trace.Types.Events.Event,
+    parsedTrace: Trace.TraceModel.ParsedTrace, selectedEvent: Trace.Types.Events.Event,
     hiddenEntries: Trace.Types.Events.Event[],
     expandableEntries: Trace.Types.Events.Event[]): readonly InitiatorData[] {
   const initiatorsData = [
-    ...findInitiatorDataPredecessors(parsedTrace, selectedEvent, parsedTrace.Initiators.eventToInitiator),
-    ...findInitiatorDataDirectSuccessors(selectedEvent, parsedTrace.Initiators.initiatorToEvents),
+    ...findInitiatorDataPredecessors(parsedTrace, selectedEvent, parsedTrace.data.Initiators.eventToInitiator),
+    ...findInitiatorDataDirectSuccessors(selectedEvent, parsedTrace.data.Initiators.initiatorToEvents),
   ];
 
   // For each InitiatorData, call a function that makes sure that neither the initiator or initiated entry is hidden.
@@ -51,14 +51,14 @@ export function initiatorsDataToDraw(
 }
 
 export function initiatorsDataToDrawForNetwork(
-    parsedTrace: Trace.Handlers.Types.ParsedTrace,
+    parsedTrace: Trace.TraceModel.ParsedTrace,
     selectedEvent: Trace.Types.Events.Event,
     ): readonly InitiatorData[] {
-  return findInitiatorDataPredecessors(parsedTrace, selectedEvent, parsedTrace.NetworkRequests.eventToInitiator);
+  return findInitiatorDataPredecessors(parsedTrace, selectedEvent, parsedTrace.data.NetworkRequests.eventToInitiator);
 }
 
 function findInitiatorDataPredecessors(
-    parsedTrace: Trace.Handlers.Types.ParsedTrace,
+    parsedTrace: Trace.TraceModel.ParsedTrace,
     selectedEvent: Trace.Types.Events.Event,
     eventToInitiator: Map<Trace.Types.Events.Event, Trace.Types.Events.Event>,
     ): readonly InitiatorData[] {
@@ -85,7 +85,7 @@ function findInitiatorDataPredecessors(
       continue;
     }
 
-    const nodeForCurrentEvent = parsedTrace.Renderer.entryToNode.get(currentEvent);
+    const nodeForCurrentEvent = parsedTrace.data.Renderer.entryToNode.get(currentEvent);
     if (!nodeForCurrentEvent) {
       // Should not happen - if it does something odd is going
       // on so let's give up.
@@ -125,9 +125,9 @@ function findInitiatorDataDirectSuccessors(
  */
 function getClosestVisibleInitiatorEntriesAncestors(
     initiatorData: InitiatorData, expandableEntries: Trace.Types.Events.Event[],
-    hiddenEntries: Trace.Types.Events.Event[], parsedTrace: Trace.Handlers.Types.ParsedTrace): InitiatorData {
+    hiddenEntries: Trace.Types.Events.Event[], parsedTrace: Trace.TraceModel.ParsedTrace): InitiatorData {
   if (hiddenEntries.includes(initiatorData.event)) {
-    let nextParent = parsedTrace.Renderer.entryToNode.get(initiatorData.event)?.parent;
+    let nextParent = parsedTrace.data.Renderer.entryToNode.get(initiatorData.event)?.parent;
     while (nextParent?.entry && !expandableEntries.includes(nextParent?.entry)) {
       nextParent = nextParent.parent ?? undefined;
     }
@@ -136,7 +136,7 @@ function getClosestVisibleInitiatorEntriesAncestors(
   }
 
   if (hiddenEntries.includes(initiatorData.initiator)) {
-    let nextParent = parsedTrace.Renderer.entryToNode.get(initiatorData.initiator)?.parent;
+    let nextParent = parsedTrace.data.Renderer.entryToNode.get(initiatorData.initiator)?.parent;
     while (nextParent?.entry && !expandableEntries.includes(nextParent?.entry)) {
       nextParent = nextParent.parent ?? undefined;
     }

package/front_end/panels/timeline/InteractionsTrackAppender.ts

@@ -32,10 +32,10 @@ export class InteractionsTrackAppender implements TrackAppender {
 
   #colorGenerator: Common.Color.Generator;
   #compatibilityBuilder: CompatibilityTracksAppender;
-  #parsedTrace: Readonly<Trace.Handlers.Types.ParsedTrace>;
+  #parsedTrace: Readonly<Trace.TraceModel.ParsedTrace>;
 
   constructor(
-      compatibilityBuilder: CompatibilityTracksAppender, parsedTrace: Trace.Handlers.Types.ParsedTrace,
+      compatibilityBuilder: CompatibilityTracksAppender, parsedTrace: Trace.TraceModel.ParsedTrace,
       colorGenerator: Common.Color.Generator) {
     this.#compatibilityBuilder = compatibilityBuilder;
     this.#colorGenerator = colorGenerator;
@@ -52,7 +52,7 @@ export class InteractionsTrackAppender implements TrackAppender {
    * appended the track's events.
    */
   appendTrackAtLevel(trackStartLevel: number, expanded?: boolean): number {
-    if (this.#parsedTrace.UserInteractions.interactionEvents.length === 0) {
+    if (this.#parsedTrace.data.UserInteractions.interactionEvents.length === 0) {
       return trackStartLevel;
     }
     this.#appendTrackHeaderAtLevel(trackStartLevel, expanded);
@@ -69,7 +69,7 @@ export class InteractionsTrackAppender implements TrackAppender {
    * appended.
    */
   #appendTrackHeaderAtLevel(currentLevel: number, expanded?: boolean): void {
-    const trackIsCollapsible = this.#parsedTrace.UserInteractions.interactionEvents.length > 0;
+    const trackIsCollapsible = this.#parsedTrace.data.UserInteractions.interactionEvents.length > 0;
     const style = buildGroupStyle({collapsible: trackIsCollapsible, useDecoratorsForOverview: true});
     const group = buildTrackHeader(
         VisualLoggingTrackName.INTERACTIONS, currentLevel, i18nString(UIStrings.interactions), style,
@@ -87,7 +87,7 @@ export class InteractionsTrackAppender implements TrackAppender {
    * interactions (the first available level to append more data).
    */
   #appendInteractionsAtLevel(trackStartLevel: number): number {
-    const {interactionEventsWithNoNesting, interactionsOverThreshold} = this.#parsedTrace.UserInteractions;
+    const {interactionEventsWithNoNesting, interactionsOverThreshold} = this.#parsedTrace.data.UserInteractions;
 
     const addCandyStripeToLongInteraction =
         (event: Trace.Types.Events.SyntheticInteractionPair, index: number): void => {

package/front_end/panels/timeline/LayoutShiftsTrackAppender.ts

@@ -51,9 +51,9 @@ export class LayoutShiftsTrackAppender implements TrackAppender {
   readonly appenderName: TrackAppenderName = 'LayoutShifts';
 
   #compatibilityBuilder: CompatibilityTracksAppender;
-  #parsedTrace: Readonly<Trace.Handlers.Types.ParsedTrace>;
+  #parsedTrace: Readonly<Trace.TraceModel.ParsedTrace>;
 
-  constructor(compatibilityBuilder: CompatibilityTracksAppender, parsedTrace: Trace.Handlers.Types.ParsedTrace) {
+  constructor(compatibilityBuilder: CompatibilityTracksAppender, parsedTrace: Trace.TraceModel.ParsedTrace) {
     this.#compatibilityBuilder = compatibilityBuilder;
     this.#parsedTrace = parsedTrace;
   }
@@ -68,7 +68,7 @@ export class LayoutShiftsTrackAppender implements TrackAppender {
    * appended the track's events.
    */
   appendTrackAtLevel(trackStartLevel: number, expanded?: boolean): number {
-    if (this.#parsedTrace.LayoutShifts.clusters.length === 0) {
+    if (this.#parsedTrace.data.LayoutShifts.clusters.length === 0) {
       return trackStartLevel;
     }
     this.#appendTrackHeaderAtLevel(trackStartLevel, expanded);
@@ -101,10 +101,10 @@ export class LayoutShiftsTrackAppender implements TrackAppender {
    * layout shifts (the first available level to append more data).
    */
   #appendLayoutShiftsAtLevel(currentLevel: number): number {
-    const allClusters = this.#parsedTrace.LayoutShifts.clusters;
+    const allClusters = this.#parsedTrace.data.LayoutShifts.clusters;
     this.#compatibilityBuilder.appendEventsAtLevel(allClusters, currentLevel, this);
 
-    const allLayoutShifts = this.#parsedTrace.LayoutShifts.clusters.flatMap(cluster => cluster.events);
+    const allLayoutShifts = this.#parsedTrace.data.LayoutShifts.clusters.flatMap(cluster => cluster.events);
     void this.preloadScreenshots(allLayoutShifts);
     return this.#compatibilityBuilder.appendEventsAtLevel(allLayoutShifts, currentLevel, this);
   }
@@ -226,10 +226,10 @@ export class LayoutShiftsTrackAppender implements TrackAppender {
   }
 
   static createShiftViz(
-      event: Trace.Types.Events.SyntheticLayoutShift, parsedTrace: Trace.Handlers.Types.ParsedTrace,
+      event: Trace.Types.Events.SyntheticLayoutShift, parsedTrace: Trace.TraceModel.ParsedTrace,
       maxSize: Geometry.Size): HTMLElement|undefined {
     const screenshots = event.parsedData.screenshots;
-    const {viewportRect, devicePixelRatio: dpr} = parsedTrace.Meta;
+    const {viewportRect, devicePixelRatio: dpr} = parsedTrace.data.Meta;
     const vizContainer = document.createElement('div');
     vizContainer.classList.add('layout-shift-viz');
 

package/front_end/panels/timeline/ModificationsManager.ts

@@ -29,7 +29,7 @@ export class AnnotationModifiedEvent extends Event {
 }
 
 interface ModificationsManagerData {
-  parsedTrace: Trace.Handlers.Types.ParsedTrace;
+  parsedTrace: Trace.TraceModel.ParsedTrace;
   traceBounds: Trace.Types.Timing.TraceWindowMicro;
   rawTraceEvents: readonly Trace.Types.Events.Event[];
   syntheticEvents: Trace.Types.Events.SyntheticBased[];
@@ -40,7 +40,7 @@ export class ModificationsManager extends EventTarget {
   #entriesFilter: EntriesFilter;
   #timelineBreadcrumbs: TimelineComponents.Breadcrumbs.Breadcrumbs;
   #modifications: Trace.Types.File.Modifications|null = null;
-  #parsedTrace: Trace.Handlers.Types.ParsedTrace;
+  #parsedTrace: Trace.TraceModel.ParsedTrace;
   #eventsSerializer: Trace.EventsSerializer.EventsSerializer;
   #overlayForAnnotation: Map<Trace.Types.File.Annotation, Trace.Types.Overlays.Overlay>;
   readonly #annotationsHiddenSetting: Common.Settings.Setting<boolean>;
@@ -75,26 +75,19 @@ export class ModificationsManager extends EventTarget {
       activeManager = modificationsManagerByTraceIndex[traceIndex];
       ModificationsManager.activeManager()?.applyModificationsIfPresent();
     }
+
     const parsedTrace = traceModel.parsedTrace(traceIndex);
     if (!parsedTrace) {
       throw new Error('ModificationsManager was initialized without a corresponding trace data');
     }
-    const traceBounds = parsedTrace.Meta.traceBounds;
-    const traceEvents = traceModel.rawTraceEvents(traceIndex);
-    if (!traceEvents) {
-      throw new Error('ModificationsManager was initialized without a corresponding raw trace events array');
-    }
-    const syntheticEventsManager = traceModel.syntheticTraceEventsManager(traceIndex);
-    if (!syntheticEventsManager) {
-      throw new Error('ModificationsManager was initialized without a corresponding SyntheticEventsManager');
-    }
-    const metadata = traceModel.metadata(traceIndex);
+
+    const traceBounds = parsedTrace.data.Meta.traceBounds;
     const newModificationsManager = new ModificationsManager({
       parsedTrace,
       traceBounds,
-      rawTraceEvents: traceEvents,
-      modifications: metadata?.modifications,
-      syntheticEvents: syntheticEventsManager.getSyntheticTraces(),
+      rawTraceEvents: parsedTrace.traceEvents,
+      modifications: parsedTrace.metadata.modifications,
+      syntheticEvents: parsedTrace.syntheticEventsManager.getSyntheticTraces(),
     });
     modificationsManagerByTraceIndex[traceIndex] = newModificationsManager;
     activeManager = newModificationsManager;

package/front_end/panels/timeline/TargetForEvent.ts

@@ -11,9 +11,9 @@ import type * as Trace from '../../models/trace/trace.js';
  * page's target.
  **/
 export function targetForEvent(
-    parsedTrace: Trace.Handlers.Types.ParsedTrace, event: Trace.Types.Events.Event): SDK.Target.Target|null {
+    parsedTrace: Trace.TraceModel.ParsedTrace, event: Trace.Types.Events.Event): SDK.Target.Target|null {
   const targetManager = SDK.TargetManager.TargetManager.instance();
-  const workerId = parsedTrace.Workers.workerIdByThread.get(event.tid);
+  const workerId = parsedTrace.data.Workers.workerIdByThread.get(event.tid);
   if (workerId) {
     return targetManager.targetById(workerId);
   }

package/front_end/panels/timeline/ThirdPartyTreeView.ts

@@ -59,7 +59,7 @@ export class ThirdPartyTreeViewWidget extends TimelineTreeView.TimelineTreeView
   }
 
   override setModelWithEvents(
-      selectedEvents: Trace.Types.Events.Event[]|null, parsedTrace?: Trace.Handlers.Types.ParsedTrace|null,
+      selectedEvents: Trace.Types.Events.Event[]|null, parsedTrace?: Trace.TraceModel.ParsedTrace|null,
       entityMappings?: Utils.EntityMapper.EntityMapper|null): void {
     super.setModelWithEvents(selectedEvents, parsedTrace, entityMappings);