chrome-devtools-frontend 1.0.1367881 → 1.0.1380117

package/front_end/models/{timeline_model/TimelineProfileTree.test.ts → trace/extras/TraceTree.test.ts}

@@ -2,19 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import type * as Protocol from '../../generated/protocol.js';
-import * as Timeline from '../../panels/timeline/timeline.js';
-import {describeWithEnvironment} from '../../testing/EnvironmentHelpers.js';
+import type * as Protocol from '../../../generated/protocol.js';
+import * as Timeline from '../../../panels/timeline/timeline.js';
+import {describeWithEnvironment} from '../../../testing/EnvironmentHelpers.js';
 import {
   getMainThread,
   makeCompleteEvent,
   makeProfileCall,
-} from '../../testing/TraceHelpers.js';
-import {TraceLoader} from '../../testing/TraceLoader.js';
-import * as TimelineModel from '../timeline_model/timeline_model.js';
-import * as Trace from '../trace/trace.js';
+} from '../../../testing/TraceHelpers.js';
+import {TraceLoader} from '../../../testing/TraceLoader.js';
+import * as Trace from '../trace.js';
 
-describeWithEnvironment('TimelineProfileTree', () => {
+import * as TraceTree from './TraceTree.js';
+
+describeWithEnvironment('TraceTree', () => {
   describe('TopDownRootNode', () => {
     it('builds the root node and its children properly from an event tree', () => {
       // This builds the following tree:
@@ -28,7 +29,7 @@ describeWithEnvironment('TimelineProfileTree', () => {
         eventB,
         eventC,
       ];
-      const root = new TimelineModel.TimelineProfileTree.TopDownRootNode(
+      const root = new TraceTree.TopDownRootNode(
           events, [], Trace.Types.Timing.MilliSeconds(0), Trace.Types.Timing.MilliSeconds(200_000));
 
       const children = root.children();
@@ -56,14 +57,14 @@ describeWithEnvironment('TimelineProfileTree', () => {
         eventD,
         eventB,
       ];
-      const root = new TimelineModel.TimelineProfileTree.TopDownRootNode(
+      const root = new TraceTree.TopDownRootNode(
           events, [], Trace.Types.Timing.MilliSeconds(0), Trace.Types.Timing.MilliSeconds(200_000));
 
       const rootChildren = root.children();
       assert.strictEqual(rootChildren.size, 2);
 
       const rootChildIterator = rootChildren.values();
-      const nodeA = rootChildIterator.next().value as TimelineModel.TimelineProfileTree.TopDownNode;
+      const nodeA = rootChildIterator.next().value as TraceTree.TopDownNode;
       assert.strictEqual(nodeA.event, eventA);
       assert.strictEqual(rootChildIterator.next().value!.event, eventB);
 
@@ -91,7 +92,7 @@ describeWithEnvironment('TimelineProfileTree', () => {
         eventC,
         eventD,
       ];
-      const root = new TimelineModel.TimelineProfileTree.TopDownRootNode(
+      const root = new TraceTree.TopDownRootNode(
           events, [], Trace.Types.Timing.MilliSeconds(0), Trace.Types.Timing.MilliSeconds(200_000));
 
       const rootChildren = root.children();
@@ -99,7 +100,7 @@ describeWithEnvironment('TimelineProfileTree', () => {
 
       const rootChildIterator = rootChildren.values();
       assert.strictEqual(rootChildIterator.next().value!.event, eventA);
-      const nodeB = rootChildIterator.next().value as TimelineModel.TimelineProfileTree.TopDownNode;
+      const nodeB = rootChildIterator.next().value as TraceTree.TopDownNode;
       assert.strictEqual(nodeB.event, eventB);
 
       const nodeBChildren = nodeB.children();
@@ -129,7 +130,7 @@ describeWithEnvironment('TimelineProfileTree', () => {
         eventD,
         eventE,
       ];
-      const root = new TimelineModel.TimelineProfileTree.TopDownRootNode(
+      const root = new TraceTree.TopDownRootNode(
           events, [], Trace.Types.Timing.MilliSeconds(0), Trace.Types.Timing.MilliSeconds(200_000));
 
       const rootChildren = root.children();
@@ -139,7 +140,7 @@ describeWithEnvironment('TimelineProfileTree', () => {
       assert.strictEqual(
           rootChildIterator.next().value!.selfTime, Trace.Helpers.Timing.microSecondsToMilliseconds(eventA.dur));
 
-      const nodeB = rootChildIterator.next().value as TimelineModel.TimelineProfileTree.TopDownNode;
+      const nodeB = rootChildIterator.next().value as TraceTree.TopDownNode;
       const nodeBSelfTime = Trace.Types.Timing.MicroSeconds(eventB.dur - eventC.dur - eventD.dur);
       assert.strictEqual(nodeB.selfTime, Trace.Helpers.Timing.microSecondsToMilliseconds(nodeBSelfTime));
 
@@ -176,7 +177,7 @@ describeWithEnvironment('TimelineProfileTree', () => {
         eventB,
         eventC,
       ];
-      const root = new TimelineModel.TimelineProfileTree.TopDownRootNode(
+      const root = new TraceTree.TopDownRootNode(
           events, [], Trace.Types.Timing.MilliSeconds(0), Trace.Types.Timing.MilliSeconds(200_000));
 
       const children = root.children();
@@ -204,24 +205,24 @@ describeWithEnvironment('TimelineProfileTree', () => {
         eventD,
         eventB,
       ];
-      const root = new TimelineModel.TimelineProfileTree.BottomUpRootNode(
-          events, new TimelineModel.TimelineModelFilter.TimelineInvisibleEventsFilter([]), [],
-          Trace.Types.Timing.MilliSeconds(0), Trace.Types.Timing.MilliSeconds(200_000), null);
+      const root = new TraceTree.BottomUpRootNode(
+          events, new Trace.Extras.TraceFilter.InvisibleEventsFilter([]), [], Trace.Types.Timing.MilliSeconds(0),
+          Trace.Types.Timing.MilliSeconds(200_000), null);
       const rootChildren = root.children();
       assert.strictEqual(rootChildren.size, 4);
 
       const rootChildIterator = rootChildren.values();
 
-      const nodeC = rootChildIterator.next().value as TimelineModel.TimelineProfileTree.TopDownNode;
+      const nodeC = rootChildIterator.next().value as TraceTree.TopDownNode;
       assert.strictEqual(nodeC.event, eventC);
 
-      const nodeD = rootChildIterator.next().value as TimelineModel.TimelineProfileTree.TopDownNode;
+      const nodeD = rootChildIterator.next().value as TraceTree.TopDownNode;
       assert.strictEqual(nodeD.event, eventD);
 
-      const nodeA = rootChildIterator.next().value as TimelineModel.TimelineProfileTree.TopDownNode;
+      const nodeA = rootChildIterator.next().value as TraceTree.TopDownNode;
       assert.strictEqual(nodeA.event, eventA);
 
-      const nodeB = rootChildIterator.next().value as TimelineModel.TimelineProfileTree.TopDownNode;
+      const nodeB = rootChildIterator.next().value as TraceTree.TopDownNode;
       assert.strictEqual(nodeB.event, eventB);
 
       const nodeCChildren = nodeC.children();
@@ -258,24 +259,24 @@ describeWithEnvironment('TimelineProfileTree', () => {
         eventD,
       ];
 
-      const root = new TimelineModel.TimelineProfileTree.BottomUpRootNode(
-          events, new TimelineModel.TimelineModelFilter.TimelineInvisibleEventsFilter([]), [],
-          Trace.Types.Timing.MilliSeconds(0), Trace.Types.Timing.MilliSeconds(200_000), null);
+      const root = new TraceTree.BottomUpRootNode(
+          events, new Trace.Extras.TraceFilter.InvisibleEventsFilter([]), [], Trace.Types.Timing.MilliSeconds(0),
+          Trace.Types.Timing.MilliSeconds(200_000), null);
       const rootChildren = root.children();
       assert.strictEqual(rootChildren.size, 4);
 
       const rootChildIterator = rootChildren.values();
 
-      const nodeA = rootChildIterator.next().value as TimelineModel.TimelineProfileTree.TopDownNode;
+      const nodeA = rootChildIterator.next().value as TraceTree.TopDownNode;
       assert.strictEqual(nodeA.event, eventA);
 
-      const nodeC = rootChildIterator.next().value as TimelineModel.TimelineProfileTree.TopDownNode;
+      const nodeC = rootChildIterator.next().value as TraceTree.TopDownNode;
       assert.strictEqual(nodeC.event, eventC);
 
-      const nodeD = rootChildIterator.next().value as TimelineModel.TimelineProfileTree.TopDownNode;
+      const nodeD = rootChildIterator.next().value as TraceTree.TopDownNode;
       assert.strictEqual(nodeD.event, eventD);
 
-      const nodeB = rootChildIterator.next().value as TimelineModel.TimelineProfileTree.TopDownNode;
+      const nodeB = rootChildIterator.next().value as TraceTree.TopDownNode;
       assert.strictEqual(nodeB.event, eventB);
 
       const nodeCChildren = nodeC.children();
@@ -314,9 +315,9 @@ describeWithEnvironment('TimelineProfileTree', () => {
         eventD,
         eventE,
       ];
-      const root = new TimelineModel.TimelineProfileTree.BottomUpRootNode(
-          events, new TimelineModel.TimelineModelFilter.TimelineInvisibleEventsFilter([]), [],
-          Trace.Types.Timing.MilliSeconds(0), Trace.Types.Timing.MilliSeconds(200_000), null);
+      const root = new TraceTree.BottomUpRootNode(
+          events, new Trace.Extras.TraceFilter.InvisibleEventsFilter([]), [], Trace.Types.Timing.MilliSeconds(0),
+          Trace.Types.Timing.MilliSeconds(200_000), null);
 
       const rootChildren = root.children();
       assert.strictEqual(rootChildren.size, 5);
@@ -325,17 +326,17 @@ describeWithEnvironment('TimelineProfileTree', () => {
       assert.strictEqual(
           rootChildIterator.next().value!.selfTime, Trace.Helpers.Timing.microSecondsToMilliseconds(eventA.dur));
 
-      const nodeC = rootChildIterator.next().value as TimelineModel.TimelineProfileTree.TopDownNode;
+      const nodeC = rootChildIterator.next().value as TraceTree.TopDownNode;
       assert.strictEqual(nodeC.selfTime, Trace.Helpers.Timing.microSecondsToMilliseconds(eventC.dur));
 
-      const nodeE = rootChildIterator.next().value as TimelineModel.TimelineProfileTree.TopDownNode;
+      const nodeE = rootChildIterator.next().value as TraceTree.TopDownNode;
       assert.strictEqual(nodeE.selfTime, Trace.Helpers.Timing.microSecondsToMilliseconds(eventE.dur));
 
-      const nodeD = rootChildIterator.next().value as TimelineModel.TimelineProfileTree.TopDownNode;
+      const nodeD = rootChildIterator.next().value as TraceTree.TopDownNode;
       const nodeDSelfTime = Trace.Types.Timing.MicroSeconds(eventD.dur - eventE.dur);
       assert.strictEqual(nodeD.selfTime, Trace.Helpers.Timing.microSecondsToMilliseconds(nodeDSelfTime));
 
-      const nodeB = rootChildIterator.next().value as TimelineModel.TimelineProfileTree.TopDownNode;
+      const nodeB = rootChildIterator.next().value as TraceTree.TopDownNode;
       const nodeBSelfTime = Trace.Types.Timing.MicroSeconds(eventB.dur - eventC.dur - eventD.dur);
       assert.strictEqual(nodeB.selfTime, Trace.Helpers.Timing.microSecondsToMilliseconds(nodeBSelfTime));
     });
@@ -349,12 +350,12 @@ describeWithEnvironment('TimelineProfileTree', () => {
       const textFilter = new Timeline.TimelineFilters.TimelineRegExp();
       const modelFilters = [
         Timeline.TimelineUIUtils.TimelineUIUtils.visibleEventsFilter(),
-        new TimelineModel.TimelineModelFilter.ExclusiveNameFilter([
+        new Trace.Extras.TraceFilter.ExclusiveNameFilter([
           Trace.Types.Events.Name.RUN_TASK,
         ]),
       ];
-      const root = new TimelineModel.TimelineProfileTree.BottomUpRootNode(
-          mainThread.entries, textFilter, modelFilters, bounds.min, bounds.max, null);
+      const root =
+          new TraceTree.BottomUpRootNode(mainThread.entries, textFilter, modelFilters, bounds.min, bounds.max, null);
       const rootChildren = root.children();
       const values = Array.from(rootChildren.values());
       // Find the list of profile calls that have been calculated as the top level rows in the Bottom Up table.
@@ -380,7 +381,7 @@ describeWithEnvironment('TimelineProfileTree', () => {
       if (!profileCallEntry) {
         throw new Error('Could not find a profile call');
       }
-      const eventId = TimelineModel.TimelineProfileTree.generateEventID(profileCallEntry);
+      const eventId = TraceTree.generateEventID(profileCallEntry);
       assert.strictEqual(eventId, 'f:performConcurrentWorkOnRoot@7');
     });
 
@@ -397,7 +398,7 @@ describeWithEnvironment('TimelineProfileTree', () => {
       if (!profileCallEntry) {
         throw new Error('Could not find a profile call');
       }
-      const eventId = TimelineModel.TimelineProfileTree.generateEventID(profileCallEntry);
+      const eventId = TraceTree.generateEventID(profileCallEntry);
       assert.strictEqual(eventId, 'f:Compile@0');
     });
   });
@@ -405,7 +406,7 @@ describeWithEnvironment('TimelineProfileTree', () => {
   describe('eventStackFrame', () => {
     it('extracts the stackFrame for ProfileCalls', async function() {
       const event = makeProfileCall('somefunc', 100, 10, undefined, undefined, undefined, 'https://x.com/file.mjs');
-      const stackFrame = TimelineModel.TimelineProfileTree.eventStackFrame(event) as Protocol.Runtime.CallFrame;
+      const stackFrame = TraceTree.eventStackFrame(event) as Protocol.Runtime.CallFrame;
       assert.strictEqual(stackFrame.functionName, 'somefunc');
       assert.strictEqual(stackFrame.url, 'https://x.com/file.mjs');
     });

package/front_end/models/{timeline_model/TimelineProfileTree.ts → trace/extras/TraceTree.ts}

@@ -2,23 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import type * as Protocol from '../../generated/protocol.js';
-import * as Trace from '../../models/trace/trace.js';
+import type * as Protocol from '../../../generated/protocol.js';
+import * as Helpers from '../helpers/helpers.js';
+import * as Types from '../types/types.js';
 
 import {TimelineJSProfileProcessor} from './TimelineJSProfile.js';
-import type {TimelineModelFilter} from './TimelineModelFilter.js';
+import type {TraceFilter} from './TraceFilter.js';
 
 export class Node {
   totalTime: number;
   selfTime: number;
   id: string|symbol;
-  event: Trace.Types.Events.Event|null;
+  event: Types.Events.Event|null;
   parent!: Node|null;
   groupId: string;
   isGroupNodeInternal: boolean;
   depth: number;
 
-  constructor(id: string|symbol, event: Trace.Types.Events.Event|null) {
+  constructor(id: string|symbol, event: Types.Events.Event|null) {
     this.totalTime = 0;
     this.selfTime = 0;
     this.id = id;
@@ -48,7 +49,7 @@ export class Node {
     throw 'Not implemented';
   }
 
-  searchTree(matchFunction: (arg0: Trace.Types.Events.Event) => boolean, results?: Node[]): Node[] {
+  searchTree(matchFunction: (arg0: Types.Events.Event) => boolean, results?: Node[]): Node[] {
     results = results || [];
     if (this.event && matchFunction(this.event)) {
       results.push(this);
@@ -66,7 +67,7 @@ export class TopDownNode extends Node {
   childrenInternal: ChildrenCache|null;
   override parent: TopDownNode|null;
 
-  constructor(id: string|symbol, event: Trace.Types.Events.Event|null, parent: TopDownNode|null) {
+  constructor(id: string|symbol, event: Types.Events.Event|null, parent: TopDownNode|null) {
     super(id, event);
     this.root = parent && parent.root;
     this.hasChildrenInternal = false;
@@ -102,7 +103,7 @@ export class TopDownNode extends Node {
     }
     const startTime = root.startTime;
     const endTime = root.endTime;
-    const instantEventCallback = root.doNotAggregate ? onInstantEvent : undefined;
+    const instantEventCallback = (root.doNotAggregate || root.includeInstantEvents) ? onInstantEvent : undefined;
     const eventIdCallback = root.doNotAggregate ? undefined : generateEventID;
     const eventGroupIdCallback = root.getEventGroupIdCallback();
     let depth = 0;
@@ -112,21 +113,21 @@ export class TopDownNode extends Node {
     let currentDirectChild: Node|null = null;
 
     // Walk on the full event tree to find this node's children.
-    Trace.Helpers.Trace.forEachEvent(
+    Helpers.Trace.forEachEvent(
         root.events,
         {
           onStartEvent,
           onEndEvent,
           onInstantEvent: instantEventCallback,
-          startTime: Trace.Helpers.Timing.millisecondsToMicroseconds(startTime),
-          endTime: Trace.Helpers.Timing.millisecondsToMicroseconds(endTime),
+          startTime: Helpers.Timing.millisecondsToMicroseconds(startTime),
+          endTime: Helpers.Timing.millisecondsToMicroseconds(endTime),
           eventFilter: root.filter,
           ignoreAsyncEvents: false,
         },
     );
 
-    function onStartEvent(e: Trace.Types.Events.Event): void {
-      const {startTime: currentStartTime, endTime: currentEndTime} = Trace.Helpers.Timing.eventTimingsMilliSeconds(e);
+    function onStartEvent(e: Types.Events.Event): void {
+      const {startTime: currentStartTime, endTime: currentEndTime} = Helpers.Timing.eventTimingsMilliSeconds(e);
 
       ++depth;
       if (depth > path.length + 2) {
@@ -143,7 +144,7 @@ export class TopDownNode extends Node {
       processEvent(e, duration);
     }
 
-    function onInstantEvent(e: Trace.Types.Events.Event): void {
+    function onInstantEvent(e: Types.Events.Event): void {
       ++depth;
       if (matchedDepth === path.length && depth <= path.length + 2) {
         processEvent(e, 0);
@@ -154,7 +155,7 @@ export class TopDownNode extends Node {
     /**
      * Creates a child node.
      */
-    function processEvent(e: Trace.Types.Events.Event, duration: number): void {
+    function processEvent(e: Types.Events.Event, duration: number): void {
       if (depth === path.length + 2) {
         if (!currentDirectChild) {
           return;
@@ -191,8 +192,8 @@ export class TopDownNode extends Node {
      * is a child of this node. As the check is done, the partial result
      * is cached on `matchedDepth`, for future checks.
      */
-    function matchPath(e: Trace.Types.Events.Event): boolean {
-      const {endTime} = Trace.Helpers.Timing.eventTimingsMilliSeconds(e);
+    function matchPath(e: Types.Events.Event): boolean {
+      const {endTime} = Helpers.Timing.eventTimingsMilliSeconds(e);
       if (matchedDepth === path.length) {
         return true;
       }
@@ -236,27 +237,32 @@ export class TopDownNode extends Node {
 }
 
 export class TopDownRootNode extends TopDownNode {
-  readonly filter: (e: Trace.Types.Events.Event) => boolean;
-  readonly events: Trace.Types.Events.Event[];
-  readonly startTime: Trace.Types.Timing.MilliSeconds;
-  readonly endTime: Trace.Types.Timing.MilliSeconds;
-  eventGroupIdCallback: ((arg0: Trace.Types.Events.Event) => string)|null|undefined;
+  readonly filter: (e: Types.Events.Event) => boolean;
+  /** This is all events passed in to create the tree, and it's very likely that it included events outside of the passed startTime/endTime as that filtering is done in `Helpers.Trace.forEachEvent` */
+  readonly events: Types.Events.Event[];
+  readonly startTime: Types.Timing.MilliSeconds;
+  readonly endTime: Types.Timing.MilliSeconds;
+  eventGroupIdCallback: ((arg0: Types.Events.Event) => string)|null|undefined;
+  /** Default behavior is to aggregate similar trace events into one Node based on generateEventID(), eventGroupIdCallback(), etc. Set true to keep nodes 1:1 with events. */
   readonly doNotAggregate: boolean|undefined;
+  readonly includeInstantEvents?: boolean;
   override totalTime: number;
   override selfTime: number;
 
   constructor(
-      events: Trace.Types.Events.Event[], filters: TimelineModelFilter[], startTime: Trace.Types.Timing.MilliSeconds,
-      endTime: Trace.Types.Timing.MilliSeconds, doNotAggregate?: boolean,
-      eventGroupIdCallback?: ((arg0: Trace.Types.Events.Event) => string)|null) {
+      events: Types.Events.Event[], filters: TraceFilter[], startTime: Types.Timing.MilliSeconds,
+      endTime: Types.Timing.MilliSeconds, doNotAggregate?: boolean,
+      eventGroupIdCallback?: ((arg0: Types.Events.Event) => string)|null, includeInstantEvents?: boolean) {
     super('', null, null);
     this.root = this;
     this.events = events;
-    this.filter = (e: Trace.Types.Events.Event): boolean => filters.every(f => f.accept(e));
+    this.filter = (e: Types.Events.Event): boolean => filters.every(f => f.accept(e));
     this.startTime = startTime;
     this.endTime = endTime;
     this.eventGroupIdCallback = eventGroupIdCallback;
     this.doNotAggregate = doNotAggregate;
+    this.includeInstantEvents = includeInstantEvents;
+
     this.totalTime = endTime - startTime;
     this.selfTime = this.totalTime;
   }
@@ -290,30 +296,30 @@ export class TopDownRootNode extends TopDownNode {
     return groupNodes;
   }
 
-  getEventGroupIdCallback(): ((arg0: Trace.Types.Events.Event) => string)|null|undefined {
+  getEventGroupIdCallback(): ((arg0: Types.Events.Event) => string)|null|undefined {
     return this.eventGroupIdCallback;
   }
 }
 
 export class BottomUpRootNode extends Node {
   private childrenInternal: ChildrenCache|null;
-  readonly events: Trace.Types.Events.Event[];
-  private textFilter: TimelineModelFilter;
-  readonly filter: (e: Trace.Types.Events.Event) => boolean;
-  readonly startTime: Trace.Types.Timing.MilliSeconds;
-  readonly endTime: Trace.Types.Timing.MilliSeconds;
-  private eventGroupIdCallback: ((arg0: Trace.Types.Events.Event) => string)|null;
+  readonly events: Types.Events.Event[];
+  private textFilter: TraceFilter;
+  readonly filter: (e: Types.Events.Event) => boolean;
+  readonly startTime: Types.Timing.MilliSeconds;
+  readonly endTime: Types.Timing.MilliSeconds;
+  private eventGroupIdCallback: ((arg0: Types.Events.Event) => string)|null;
   override totalTime: number;
 
   constructor(
-      events: Trace.Types.Events.Event[], textFilter: TimelineModelFilter, filters: TimelineModelFilter[],
-      startTime: Trace.Types.Timing.MilliSeconds, endTime: Trace.Types.Timing.MilliSeconds,
-      eventGroupIdCallback: ((arg0: Trace.Types.Events.Event) => string)|null) {
+      events: Types.Events.Event[], textFilter: TraceFilter, filters: TraceFilter[],
+      startTime: Types.Timing.MilliSeconds, endTime: Types.Timing.MilliSeconds,
+      eventGroupIdCallback: ((arg0: Types.Events.Event) => string)|null) {
     super('', null);
     this.childrenInternal = null;
     this.events = events;
     this.textFilter = textFilter;
-    this.filter = (e: Trace.Types.Events.Event): boolean => filters.every(f => f.accept(e));
+    this.filter = (e: Types.Events.Event): boolean => filters.every(f => f.accept(e));
     this.startTime = startTime;
     this.endTime = endTime;
     this.eventGroupIdCallback = eventGroupIdCallback;
@@ -349,20 +355,20 @@ export class BottomUpRootNode extends Node {
     const selfTimeStack: number[] = [endTime - startTime];
     const firstNodeStack: boolean[] = [];
     const totalTimeById = new Map<string, number>();
-    Trace.Helpers.Trace.forEachEvent(
+    Helpers.Trace.forEachEvent(
         this.events,
         {
           onStartEvent,
           onEndEvent,
-          startTime: Trace.Helpers.Timing.millisecondsToMicroseconds(this.startTime),
-          endTime: Trace.Helpers.Timing.millisecondsToMicroseconds(this.endTime),
+          startTime: Helpers.Timing.millisecondsToMicroseconds(this.startTime),
+          endTime: Helpers.Timing.millisecondsToMicroseconds(this.endTime),
           eventFilter: this.filter,
           ignoreAsyncEvents: false,
         },
     );
 
-    function onStartEvent(e: Trace.Types.Events.Event): void {
-      const {startTime: currentStartTime, endTime: currentEndTime} = Trace.Helpers.Timing.eventTimingsMilliSeconds(e);
+    function onStartEvent(e: Types.Events.Event): void {
+      const {startTime: currentStartTime, endTime: currentEndTime} = Helpers.Timing.eventTimingsMilliSeconds(e);
 
       const actualEndTime = currentEndTime !== undefined ? Math.min(currentEndTime, endTime) : endTime;
       const duration = actualEndTime - Math.max(currentStartTime, startTime);
@@ -376,7 +382,7 @@ export class BottomUpRootNode extends Node {
       firstNodeStack.push(noNodeOnStack);
     }
 
-    function onEndEvent(event: Trace.Types.Events.Event): void {
+    function onEndEvent(event: Types.Events.Event): void {
       const id = generateEventID(event);
       let node = nodeById.get(id);
       if (!node) {
@@ -428,7 +434,7 @@ export class GroupNode extends Node {
   private readonly childrenInternal: ChildrenCache;
   override isGroupNodeInternal: boolean;
 
-  constructor(id: string, parent: BottomUpRootNode|TopDownRootNode, event: Trace.Types.Events.Event) {
+  constructor(id: string, parent: BottomUpRootNode|TopDownRootNode, event: Types.Events.Event) {
     super(id, event);
     this.childrenInternal = new Map();
     this.parent = parent;
@@ -458,7 +464,7 @@ export class BottomUpNode extends Node {
   private cachedChildren: ChildrenCache|null;
   private hasChildrenInternal: boolean;
 
-  constructor(root: BottomUpRootNode, id: string, event: Trace.Types.Events.Event, hasChildren: boolean, parent: Node) {
+  constructor(root: BottomUpRootNode, id: string, event: Types.Events.Event, hasChildren: boolean, parent: Node) {
     super(id, event);
     this.parent = parent;
     this.root = root;
@@ -481,25 +487,25 @@ export class BottomUpNode extends Node {
     }
     const selfTimeStack: number[] = [0];
     const eventIdStack: string[] = [];
-    const eventStack: Trace.Types.Events.Event[] = [];
+    const eventStack: Types.Events.Event[] = [];
     const nodeById = new Map<string, BottomUpNode>();
     const startTime = this.root.startTime;
     const endTime = this.root.endTime;
     let lastTimeMarker: number = startTime;
     const self = this;
-    Trace.Helpers.Trace.forEachEvent(
+    Helpers.Trace.forEachEvent(
         this.root.events,
         {
           onStartEvent,
           onEndEvent,
-          startTime: Trace.Helpers.Timing.millisecondsToMicroseconds(startTime),
-          endTime: Trace.Helpers.Timing.millisecondsToMicroseconds(endTime),
+          startTime: Helpers.Timing.millisecondsToMicroseconds(startTime),
+          endTime: Helpers.Timing.millisecondsToMicroseconds(endTime),
           eventFilter: this.root.filter,
           ignoreAsyncEvents: false,
         },
     );
-    function onStartEvent(e: Trace.Types.Events.Event): void {
-      const {startTime: currentStartTime, endTime: currentEndTime} = Trace.Helpers.Timing.eventTimingsMilliSeconds(e);
+    function onStartEvent(e: Types.Events.Event): void {
+      const {startTime: currentStartTime, endTime: currentEndTime} = Helpers.Timing.eventTimingsMilliSeconds(e);
       const actualEndTime = currentEndTime !== undefined ? Math.min(currentEndTime, endTime) : endTime;
       const duration = actualEndTime - Math.max(currentStartTime, startTime);
       if (duration < 0) {
@@ -512,8 +518,8 @@ export class BottomUpNode extends Node {
       eventStack.push(e);
     }
 
-    function onEndEvent(e: Trace.Types.Events.Event): void {
-      const {startTime: currentStartTime, endTime: currentEndTime} = Trace.Helpers.Timing.eventTimingsMilliSeconds(e);
+    function onEndEvent(e: Types.Events.Event): void {
+      const {startTime: currentStartTime, endTime: currentEndTime} = Helpers.Timing.eventTimingsMilliSeconds(e);
       const selfTime = selfTimeStack.pop();
       const id = eventIdStack.pop();
       eventStack.pop();
@@ -545,7 +551,7 @@ export class BottomUpNode extends Node {
     return this.cachedChildren;
   }
 
-  override searchTree(matchFunction: (arg0: Trace.Types.Events.Event) => boolean, results?: Node[]): Node[] {
+  override searchTree(matchFunction: (arg0: Types.Events.Event) => boolean, results?: Node[]): Node[] {
     results = results || [];
     if (this.event && matchFunction(this.event)) {
       results.push(this);
@@ -554,8 +560,8 @@ export class BottomUpNode extends Node {
   }
 }
 
-export function eventStackFrame(event: Trace.Types.Events.Event): Protocol.Runtime.CallFrame|null {
-  if (Trace.Types.Events.isProfileCall(event)) {
+export function eventStackFrame(event: Types.Events.Event): Protocol.Runtime.CallFrame|null {
+  if (Types.Events.isProfileCall(event)) {
     return event.callFrame;
   }
   const topFrame = event.args?.data?.stackTrace?.[0];
@@ -565,8 +571,8 @@ export function eventStackFrame(event: Trace.Types.Events.Event): Protocol.Runti
   return {...topFrame, scriptId: String(topFrame.scriptId) as Protocol.Runtime.ScriptId};
 }
 
-export function generateEventID(event: Trace.Types.Events.Event): string {
-  if (Trace.Types.Events.isProfileCall(event)) {
+export function generateEventID(event: Types.Events.Event): string {
+  if (Types.Events.isProfileCall(event)) {
     const name = TimelineJSProfileProcessor.isNativeRuntimeFrame(event.callFrame) ?
         TimelineJSProfileProcessor.nativeGroup(event.callFrame.functionName) :
         event.callFrame.functionName;
@@ -574,7 +580,7 @@ export function generateEventID(event: Trace.Types.Events.Event): string {
     return `f:${name}@${location}`;
   }
 
-  if (Trace.Types.Events.isTimeStamp(event)) {
+  if (Types.Events.isTimeStamp(event)) {
     return `${event.name}:${event.args.data.message}`;
   }
 

package/front_end/models/trace/extras/extras.ts

@@ -6,4 +6,8 @@ export * as FetchNodes from './FetchNodes.js';
 export * as FilmStrip from './FilmStrip.js';
 export * as MainThreadActivity from './MainThreadActivity.js';
 export * as Metadata from './Metadata.js';
+export * as ThirdParties from './ThirdParties.js';
+export * as TimelineJSProfile from './TimelineJSProfile.js';
+export * as TraceFilter from './TraceFilter.js';
+export * as TraceTree from './TraceTree.js';
 export * as URLForEntry from './URLForEntry.js';

package/front_end/models/trace/handlers/AnimationHandler.ts

@@ -5,15 +5,12 @@
 import * as Helpers from '../helpers/helpers.js';
 import * as Types from '../types/types.js';
 
-import {HandlerState} from './types.js';
-
 const animations: Types.Events.Animation[] = [];
 const animationsSyntheticEvents: Types.Events.SyntheticAnimationPair[] = [];
 
 export interface AnimationData {
   animations: readonly Types.Events.SyntheticAnimationPair[];
 }
-let handlerState = HandlerState.UNINITIALIZED;
 
 export function reset(): void {
   animations.length = 0;
@@ -30,14 +27,9 @@ export function handleEvent(event: Types.Events.Event): void {
 export async function finalize(): Promise<void> {
   const syntheticEvents = Helpers.Trace.createMatchedSortedSyntheticEvents(animations);
   animationsSyntheticEvents.push(...syntheticEvents);
-  handlerState = HandlerState.FINALIZED;
 }
 
 export function data(): AnimationData {
-  if (handlerState !== HandlerState.FINALIZED) {
-    throw new Error('Animation handler is not finalized');
-  }
-
   return {
     animations: animationsSyntheticEvents,
   };

package/front_end/models/trace/handlers/ExtensionTraceDataHandler.ts

@@ -5,7 +5,7 @@
 import * as Helpers from '../helpers/helpers.js';
 import * as Types from '../types/types.js';
 
-import {type HandlerName, HandlerState} from './types.js';
+import type {HandlerName} from './types.js';
 import {data as userTimingsData} from './UserTimingsHandler.js';
 
 const extensionFlameChartEntries: Types.Extensions.SyntheticExtensionTrackEntry[] = [];
@@ -18,14 +18,12 @@ export interface ExtensionTraceData {
   extensionMarkers: readonly Types.Extensions.SyntheticExtensionMarker[];
   entryToNode: Map<Types.Events.Event, Helpers.TreeHelpers.TraceEntryNode>;
 }
-let handlerState = HandlerState.UNINITIALIZED;
 
 export function handleEvent(_event: Types.Events.Event): void {
   // Implementation not needed because data is sourced from UserTimingsHandler
 }
 
 export function reset(): void {
-  handlerState = HandlerState.INITIALIZED;
   extensionFlameChartEntries.length = 0;
   extensionTrackData.length = 0;
   extensionMarkers.length = 0;
@@ -33,11 +31,7 @@ export function reset(): void {
 }
 
 export async function finalize(): Promise<void> {
-  if (handlerState !== HandlerState.INITIALIZED) {
-    throw new Error('ExtensionTraceData handler is not initialized');
-  }
   createExtensionFlameChartEntries();
-  handlerState = HandlerState.FINALIZED;
 }
 
 function createExtensionFlameChartEntries(): void {
@@ -120,10 +114,6 @@ export function extensionDataInTiming(timing: Types.Events.SyntheticUserTimingPa
 }
 
 export function data(): ExtensionTraceData {
-  if (handlerState !== HandlerState.FINALIZED) {
-    throw new Error('ExtensionTraceData handler is not finalized');
-  }
-
   return {
     entryToNode,
     extensionTrackData: [...extensionTrackData],