chrome-devtools-frontend 1.0.1515796 → 1.0.1515988

package/front_end/models/har/Writer.ts

@@ -59,7 +59,7 @@ export class Writer {
     const compositeProgress = new Common.Progress.CompositeProgress(progress);
 
     const content = await Writer.harStringForRequests(requests, options, compositeProgress);
-    if (progress.isCanceled()) {
+    if (progress.canceled) {
       return;
     }
     await Writer.writeToStream(stream, compositeProgress, content);
@@ -69,8 +69,8 @@ export class Writer {
       requests: SDK.NetworkRequest.NetworkRequest[], options: BuildOptions,
       compositeProgress: Common.Progress.CompositeProgress): Promise<string> {
     const progress = compositeProgress.createSubProgress();
-    progress.setTitle(i18nString(UIStrings.collectingContent));
-    progress.setTotalWork(requests.length);
+    progress.title = i18nString(UIStrings.collectingContent);
+    progress.totalWork = requests.length;
 
     // Sort by issueTime because this is recorded as startedDateTime in HAR logs.
     requests.sort((reqA, reqB) => reqA.issueTime() - reqB.issueTime());
@@ -82,9 +82,9 @@ export class Writer {
     }
 
     await Promise.all(promises);
-    progress.done();
+    progress.done = true;
 
-    if (progress.isCanceled()) {
+    if (progress.canceled) {
       return '';
     }
     return JSON.stringify({log: harLog}, null, jsonIndent);
@@ -106,7 +106,7 @@ export class Writer {
     }
 
     function contentLoaded(entry: EntryDTO, contentDataOrError: TextUtils.ContentData.ContentDataOrError): void {
-      progress.incrementWorked();
+      ++progress.worked;
       const contentData = TextUtils.ContentData.ContentData.asDeferredContent(contentDataOrError);
       let encoded: true|boolean = contentData.isEncoded;
       if (contentData.content !== null) {
@@ -127,14 +127,14 @@ export class Writer {
       stream: Common.StringOutputStream.OutputStream, compositeProgress: Common.Progress.CompositeProgress,
       fileContent: string): Promise<void> {
     const progress = compositeProgress.createSubProgress();
-    progress.setTitle(i18nString(UIStrings.writingFile));
-    progress.setTotalWork(fileContent.length);
-    for (let i = 0; i < fileContent.length && !progress.isCanceled(); i += chunkSize) {
+    progress.title = i18nString(UIStrings.writingFile);
+    progress.totalWork = fileContent.length;
+    for (let i = 0; i < fileContent.length && !progress.canceled; i += chunkSize) {
       const chunk = fileContent.substr(i, chunkSize);
       await stream.write(chunk);
-      progress.incrementWorked(chunk.length);
+      progress.worked += chunk.length;
     }
-    progress.done();
+    progress.done = true;
   }
 }
 

package/front_end/models/persistence/FileSystemWorkspaceBinding.ts

@@ -276,14 +276,14 @@ export class FileSystem extends Workspace.Workspace.ProjectStore {
     if (!queriesToRun.length) {
       queriesToRun.push('');
     }
-    progress.setTotalWork(queriesToRun.length);
+    progress.totalWork = queriesToRun.length;
 
     for (const query of queriesToRun) {
       const files = await this.#fileSystem.searchInPath(searchConfig.isRegex() ? '' : query, progress);
       files.sort(Platform.StringUtilities.naturalOrderComparator);
       workingFileSet = Platform.ArrayUtilities.intersectOrdered(
           workingFileSet, files, Platform.StringUtilities.naturalOrderComparator);
-      progress.incrementWorked(1);
+      ++progress.worked;
     }
 
     const result = new Map();
@@ -294,7 +294,7 @@ export class FileSystem extends Workspace.Workspace.ProjectStore {
       }
     }
 
-    progress.done();
+    progress.done = true;
     return result;
   }
 

package/front_end/models/persistence/IsolatedFileSystem.ts

@@ -184,7 +184,7 @@ export class IsolatedFileSystem extends PlatformFileSystem {
     let activePath = '';
     for (const path of paths) {
       activePath = activePath + '/' + path;
-      dirEntry = await this.innerCreateFolderIfNeeded(activePath);
+      dirEntry = await this.#createFolderIfNeeded(activePath);
       if (!dirEntry) {
         return null;
       }
@@ -192,7 +192,7 @@ export class IsolatedFileSystem extends PlatformFileSystem {
     return dirEntry;
   }
 
-  private innerCreateFolderIfNeeded(path: string): Promise<DirectoryEntry|null> {
+  #createFolderIfNeeded(path: string): Promise<DirectoryEntry|null> {
     return new Promise(resolve => {
       this.domFileSystem.root.getDirectory(path, {create: true}, dirEntry => resolve(dirEntry), error => {
         this.domFileSystem.root.getFile(
@@ -517,13 +517,13 @@ export class IsolatedFileSystem extends PlatformFileSystem {
 
       function innerCallback(files: Platform.DevToolsPath.RawPathString[]): void {
         resolve(files.map(path => Common.ParsedURL.ParsedURL.rawPathToUrlString(path)));
-        progress.incrementWorked(1);
+        ++progress.worked;
       }
     });
   }
 
   override indexContent(progress: Common.Progress.Progress): void {
-    progress.setTotalWork(1);
+    progress.totalWork = 1;
     const requestId = this.manager.registerProgress(progress);
     Host.InspectorFrontendHost.InspectorFrontendHostInstance.indexPath(
         requestId, this.#embedderPath, JSON.stringify(this.excludedEmbedderFolders));

package/front_end/models/persistence/IsolatedFileSystemManager.ts

@@ -123,7 +123,7 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
       const fileSystems = event.data;
       const promises = [];
       for (let i = 0; i < fileSystems.length; ++i) {
-        promises.push(this.innerAddFileSystem(fileSystems[i], false));
+        promises.push(this.#addFileSystem(fileSystems[i], false));
       }
       void Promise.all(promises).then(onFileSystemsAdded);
     }
@@ -154,7 +154,7 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
     return this.fileSystemsLoadedPromise;
   }
 
-  private innerAddFileSystem(fileSystem: Host.InspectorFrontendHostAPI.DevToolsFileSystem, dispatchEvent: boolean):
+  #addFileSystem(fileSystem: Host.InspectorFrontendHostAPI.DevToolsFileSystem, dispatchEvent: boolean):
       Promise<IsolatedFileSystem|null> {
     const embedderPath = fileSystem.fileSystemPath;
     const fileSystemURL = Common.ParsedURL.ParsedURL.rawPathToUrlString(fileSystem.fileSystemPath);
@@ -196,7 +196,7 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
       this.fileSystemRequestResolve.call(null, null);
       this.fileSystemRequestResolve = null;
     } else if (fileSystem) {
-      void this.innerAddFileSystem(fileSystem, true).then(fileSystem => {
+      void this.#addFileSystem(fileSystem, true).then(fileSystem => {
         if (this.fileSystemRequestResolve) {
           this.fileSystemRequestResolve.call(null, fileSystem);
           this.fileSystemRequestResolve = null;
@@ -287,7 +287,7 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
     if (!progress) {
       return;
     }
-    progress.setTotalWork(totalWork);
+    progress.totalWork = totalWork;
   }
 
   private onIndexingWorked(
@@ -297,8 +297,8 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
     if (!progress) {
       return;
     }
-    progress.incrementWorked(worked);
-    if (progress.isCanceled()) {
+    progress.worked += worked;
+    if (progress.canceled) {
       Host.InspectorFrontendHost.InspectorFrontendHostInstance.stopIndexing(requestId);
       this.onIndexingDone(event);
     }
@@ -311,7 +311,7 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
     if (!progress) {
       return;
     }
-    progress.done();
+    progress.done = true;
     this.progresses.delete(requestId);
   }
 

package/front_end/models/persistence/PersistenceImpl.ts

@@ -64,19 +64,19 @@ export class PersistenceImpl extends Common.ObjectWrapper.ObjectWrapper<EventTyp
   }
 
   async addBinding(binding: PersistenceBinding): Promise<void> {
-    await this.innerAddBinding(binding);
+    await this.#addBinding(binding);
   }
 
   async addBindingForTest(binding: PersistenceBinding): Promise<void> {
-    await this.innerAddBinding(binding);
+    await this.#addBinding(binding);
   }
 
   async removeBinding(binding: PersistenceBinding): Promise<void> {
-    await this.innerRemoveBinding(binding);
+    await this.#removeBinding(binding);
   }
 
   async removeBindingForTest(binding: PersistenceBinding): Promise<void> {
-    await this.innerRemoveBinding(binding);
+    await this.#removeBinding(binding);
   }
 
   #setupBindings(networkUISourceCode: Workspace.UISourceCode.UISourceCode): Promise<void> {
@@ -86,7 +86,7 @@ export class PersistenceImpl extends Common.ObjectWrapper.ObjectWrapper<EventTyp
     return this.#mapping.computeNetworkStatus(networkUISourceCode);
   }
 
-  private async innerAddBinding(binding: PersistenceBinding): Promise<void> {
+  async #addBinding(binding: PersistenceBinding): Promise<void> {
     bindings.set(binding.network, binding);
     bindings.set(binding.fileSystem, binding);
 
@@ -119,7 +119,7 @@ export class PersistenceImpl extends Common.ObjectWrapper.ObjectWrapper<EventTyp
     this.dispatchEventToListeners(Events.BindingCreated, binding);
   }
 
-  private async innerRemoveBinding(binding: PersistenceBinding): Promise<void> {
+  async #removeBinding(binding: PersistenceBinding): Promise<void> {
     if (bindings.get(binding.network) !== binding) {
       return;
     }
@@ -150,12 +150,12 @@ export class PersistenceImpl extends Common.ObjectWrapper.ObjectWrapper<EventTyp
   private onStatusAdded(status: AutomappingStatus): Promise<void> {
     const binding = new PersistenceBinding(status.network, status.fileSystem);
     statusBindings.set(status, binding);
-    return this.innerAddBinding(binding);
+    return this.#addBinding(binding);
   }
 
   private async onStatusRemoved(status: AutomappingStatus): Promise<void> {
     const binding = statusBindings.get(status) as PersistenceBinding;
-    await this.innerRemoveBinding(binding);
+    await this.#removeBinding(binding);
   }
 
   private onWorkingCopyChanged(event: Common.EventTarget.EventTargetEvent<Workspace.UISourceCode.UISourceCode>): void {

package/front_end/models/persistence/PlatformFileSystem.ts

@@ -148,7 +148,7 @@ export class PlatformFileSystem extends Common.ObjectWrapper.ObjectWrapper<Event
 
   indexContent(progress: Common.Progress.Progress): void {
     queueMicrotask(() => {
-      progress.done();
+      progress.done = true;
     });
   }
 

package/front_end/models/trace/ModelImpl.ts

@@ -14,12 +14,6 @@ import * as Types from './types/types.js';
 // processors. Currently there is only one implemented, but you will see
 // references to "processors" plural because it can easily be extended in the future.
 
-export interface ParseConfig {
-  metadata?: Types.File.MetaData;
-  isFreshRecording?: boolean;
-  resolveSourceMap?: Types.Configuration.ParseOptions['resolveSourceMap'];
-}
-
 /**
  * The Model is responsible for parsing arrays of raw trace events and storing the
  * resulting data. It can store multiple traces at once, and can return the data for
@@ -87,10 +81,8 @@ export class Model extends EventTarget {
    * });
    * void this.traceModel.parse(events);
    **/
-  async parse(traceEvents: readonly Types.Events.Event[], config?: ParseConfig): Promise<void> {
+  async parse(traceEvents: readonly Types.Events.Event[], config?: Types.Configuration.ParseOptions): Promise<void> {
     const metadata = config?.metadata || {};
-    const isFreshRecording = config?.isFreshRecording || false;
-    const isCPUProfile = metadata?.dataOrigin === Types.File.DataOrigin.CPU_PROFILE;
     // During parsing, periodically update any listeners on each processors'
     // progress (if they have any updates).
     const onTraceUpdate = (event: Event): void => {
@@ -106,13 +98,7 @@ export class Model extends EventTarget {
     try {
       // Wait for all outstanding promises before finishing the async execution,
       // but perform all tasks in parallel.
-      const parseConfig: Types.Configuration.ParseOptions = {
-        isFreshRecording,
-        isCPUProfile,
-        metadata,
-        resolveSourceMap: config?.resolveSourceMap,
-      };
-      await this.#processor.parse(traceEvents, parseConfig);
+      await this.#processor.parse(traceEvents, config ?? {});
       if (!this.#processor.data) {
         throw new Error('processor did not parse trace');
       }

package/front_end/models/trace/Processor.ts

@@ -152,6 +152,10 @@ export class TraceProcessor extends EventTarget {
       throw new Error(`Trace processor can't start parsing when not idle. Current state: ${this.#status}`);
     }
 
+    if (typeof options.isCPUProfile === 'undefined' && options.metadata) {
+      options.isCPUProfile = options.metadata.dataOrigin === Types.File.DataOrigin.CPU_PROFILE;
+    }
+
     options.logger?.start('total');
     try {
       this.#status = Status.PARSING;
@@ -424,9 +428,9 @@ export class TraceProcessor extends EventTarget {
     insightSet.model = newModel;
   }
 
-  #computeInsightSet(
-      data: Handlers.Types.HandlerData, context: Insights.Types.InsightSetContext,
-      options: Types.Configuration.ParseOptions): void {
+  #computeInsightSet(data: Handlers.Types.HandlerData, context: Insights.Types.InsightSetContext): void {
+    const logger = context.options.logger;
+
     let id, urlString, navigation;
     if (context.navigation) {
       id = context.navigationId;
@@ -442,8 +446,8 @@ export class TraceProcessor extends EventTarget {
     for (const [name, insight] of Object.entries(TraceProcessor.getInsightRunners())) {
       let model: Insights.Types.InsightModel|Error;
       try {
-        options.logger?.start(`insights:${name}`);
-        model = insight.generateInsight(data, context, options.insightTimeFormatters);
+        logger?.start(`insights:${name}`);
+        model = insight.generateInsight(data, context);
         model.frameId = context.frameId;
         const navId = context.navigation?.args.data?.navigationId;
         if (navId) {
@@ -456,7 +460,7 @@ export class TraceProcessor extends EventTarget {
       } catch (err) {
         model = err;
       } finally {
-        options.logger?.end(`insights:${name}`);
+        logger?.end(`insights:${name}`);
       }
       Object.assign(insightSetModel, {[name]: model});
     }
@@ -503,7 +507,7 @@ export class TraceProcessor extends EventTarget {
       this.#insights = new Map();
     }
     this.#insights.set(insightSet.id, insightSet);
-    this.sortInsightSet(insightSet, options.metadata ?? null);
+    this.sortInsightSet(insightSet, context.options.metadata ?? null);
   }
 
   /**
@@ -543,11 +547,12 @@ export class TraceProcessor extends EventTarget {
         data.Meta.traceBounds;
 
     const context: Insights.Types.InsightSetContext = {
+      options,
       bounds,
       frameId: data.Meta.mainFrameId,
       // No navigation or lantern context applies to this initial/no-navigation period.
     };
-    this.#computeInsightSet(data, context, options);
+    this.#computeInsightSet(data, context);
   }
 
   /**
@@ -593,13 +598,14 @@ export class TraceProcessor extends EventTarget {
     }
 
     const context: Insights.Types.InsightSetContext = {
+      options,
       bounds,
       frameId,
       navigation,
       navigationId,
       lantern,
     };
-    this.#computeInsightSet(data, context, options);
+    this.#computeInsightSet(data, context);
   }
 }
 

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

@@ -93,9 +93,9 @@ function workletType(input: string): Types.Events.AuctionWorkletType {
  * create everything other than the `args` field, as those are identical
  * regardless of the type of event.
  */
-function makeSyntheticEventBase(event: Types.Events.AuctionWorkletDoneWithProcess|
-                                Types.Events.AuctionWorkletRunningInProcess):
-    Omit<Types.Events.SyntheticAuctionWorklet, 'args'> {
+function makeSyntheticEventBase(
+    event: Types.Events.AuctionWorkletDoneWithProcess|
+    Types.Events.AuctionWorkletRunningInProcess): Omit<Types.Events.SyntheticAuctionWorklet, 'args'> {
   return Helpers.SyntheticEvents.SyntheticEventsManager
       .registerSyntheticEvent<Omit<Types.Events.SyntheticAuctionWorklet, 'args'>>({
         rawSourceEvent: event,
@@ -178,6 +178,6 @@ export interface AuctionWorkletsData {
 
 export function data(): AuctionWorkletsData {
   return {
-    worklets: new Map(createdSyntheticEvents),
+    worklets: createdSyntheticEvents,
   };
 }

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

@@ -95,8 +95,8 @@ export interface FramesData {
 
 export function data(): FramesData {
   return {
-    frames: model ? Array.from(model.frames()) : [],
-    framesById: model ? {...model.framesById()} : {},
+    frames: model?.frames() ?? [],
+    framesById: model?.framesById() ?? {},
   };
 }
 

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

@@ -37,15 +37,14 @@ import type {HandlerName} from './types.js';
 // score for the given recording, and almost certainly not the
 // navigation-to-unload CLS score.
 
-interface LayoutShifts {
+interface LayoutShiftsData {
   clusters: readonly Types.Events.SyntheticLayoutShiftCluster[];
   clustersByNavigationId: Map<Types.Events.NavigationId, Types.Events.SyntheticLayoutShiftCluster[]>;
   sessionMaxScore: number;
   // The session window which contains the SessionMaxScore
   clsWindowID: number;
   // We use these to calculate root causes for a given LayoutShift
-  // TODO(crbug/41484172): should be readonly
-  prePaintEvents: Types.Events.PrePaint[];
+  prePaintEvents: readonly Types.Events.PrePaint[];
   paintImageEvents: Types.Events.PaintImage[];
   layoutInvalidationEvents: readonly Types.Events.LayoutInvalidationTracking[];
   scheduleStyleInvalidationEvents: readonly Types.Events.ScheduleStyleInvalidationTracking[];
@@ -55,8 +54,7 @@ interface LayoutShifts {
   layoutImageUnsizedEvents: readonly Types.Events.LayoutImageUnsized[];
   remoteFonts: readonly RemoteFont[];
   scoreRecords: readonly ScoreRecord[];
-  // TODO(crbug/41484172): should be readonly
-  backendNodeIds: Protocol.DOM.BackendNodeId[];
+  backendNodeIds: Set<Protocol.DOM.BackendNodeId>;
 }
 
 interface RemoteFont {
@@ -524,7 +522,7 @@ async function buildLayoutShiftsClusters(): Promise<void> {
   }
 }
 
-export function data(): LayoutShifts {
+export function data(): LayoutShiftsData {
   return {
     clusters,
     sessionMaxScore,
@@ -532,15 +530,14 @@ export function data(): LayoutShifts {
     prePaintEvents,
     layoutInvalidationEvents,
     scheduleStyleInvalidationEvents,
-    styleRecalcInvalidationEvents: [],
+    styleRecalcInvalidationEvents,
     renderFrameImplCreateChildFrameEvents,
     domLoadingEvents,
     layoutImageUnsizedEvents,
     remoteFonts,
     scoreRecords,
-    // TODO(crbug/41484172): change the type so no need to clone
-    backendNodeIds: [...backendNodeIds],
-    clustersByNavigationId: new Map(clustersByNavigationId),
+    backendNodeIds,
+    clustersByNavigationId,
     paintImageEvents,
   };
 }

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

@@ -28,11 +28,15 @@ let devicePixelRatio: number|null = null;
 let processNames = new Map<Types.Events.ProcessID, Types.Events.ProcessName>();
 
 let topLevelRendererIds = new Set<Types.Events.ProcessID>();
-const traceBounds: Types.Timing.TraceWindowMicro = {
-  min: Types.Timing.Micro(Number.POSITIVE_INFINITY),
-  max: Types.Timing.Micro(Number.NEGATIVE_INFINITY),
-  range: Types.Timing.Micro(Number.POSITIVE_INFINITY),
-};
+
+function makeNewTraceBounds(): Types.Timing.TraceWindowMicro {
+  return {
+    min: Types.Timing.Micro(Number.POSITIVE_INFINITY),
+    max: Types.Timing.Micro(Number.NEGATIVE_INFINITY),
+    range: Types.Timing.Micro(Number.POSITIVE_INFINITY),
+  };
+}
+let traceBounds: Types.Timing.TraceWindowMicro = makeNewTraceBounds();
 
 /**
  * These represent the user navigating. Values such as First Contentful Paint,
@@ -98,9 +102,7 @@ export function reset(): void {
   rendererProcessesByFrameId = new Map();
   framesByProcessId = new Map();
 
-  traceBounds.min = Types.Timing.Micro(Number.POSITIVE_INFINITY);
-  traceBounds.max = Types.Timing.Micro(Number.NEGATIVE_INFINITY);
-  traceBounds.range = Types.Timing.Micro(Number.POSITIVE_INFINITY);
+  traceBounds = makeNewTraceBounds();
   traceStartedTimeFromTracingStartedEvent = Types.Timing.Micro(-1);
 
   traceIsGeneric = true;
@@ -490,7 +492,7 @@ export type FrameProcessData =
 
 export function data(): MetaHandlerData {
   return {
-    traceBounds: {...traceBounds},
+    traceBounds,
     browserProcessId,
     browserThreadId,
     processNames,

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

@@ -109,7 +109,7 @@ export interface Data {
   legacySyntheticScreenshots: Types.Events.LegacySyntheticScreenshot[]|null;
   screenshots: Types.Events.Screenshot[]|null;
 }
-// TODO(crbug/41484172): should be readonly
+
 export function data(): Data {
   return {
     legacySyntheticScreenshots: syntheticScreenshots.length ? syntheticScreenshots : null,

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

@@ -54,14 +54,14 @@ export function reset(): void {
 }
 
 export function handleEvent(event: Types.Events.Event): void {
-  const getOrMakeScript = (isolate: string, scriptIdAsNumber: number): Script => {
+  const getOrMakeScript = (isolate: string|number, scriptIdAsNumber: number): Script => {
     const scriptId = String(scriptIdAsNumber) as Protocol.Runtime.ScriptId;
     const key = `${isolate}.${scriptId}`;
     return Platform.MapUtilities.getWithDefault(
         scriptById, key, () => ({isolate, scriptId, frame: '', ts: 0} as Script));
   };
 
-  if (Types.Events.isTargetRundownEvent(event) && event.args.data) {
+  if (Types.Events.isRundownScriptCompiled(event) && event.args.data) {
     const {isolate, scriptId, frame} = event.args.data;
     const script = getOrMakeScript(isolate, scriptId);
     script.frame = frame;
@@ -70,7 +70,7 @@ export function handleEvent(event: Types.Events.Event): void {
     return;
   }
 
-  if (Types.Events.isV8SourceRundownEvent(event)) {
+  if (Types.Events.isRundownScript(event)) {
     const {isolate, scriptId, url, sourceUrl, sourceMapUrl, sourceMapUrlElided} = event.args.data;
     const script = getOrMakeScript(isolate, scriptId);
     script.url = url;
@@ -91,14 +91,14 @@ export function handleEvent(event: Types.Events.Event): void {
     return;
   }
 
-  if (Types.Events.isV8SourceRundownSourcesScriptCatchupEvent(event)) {
+  if (Types.Events.isRundownScriptSource(event)) {
     const {isolate, scriptId, sourceText} = event.args.data;
     const script = getOrMakeScript(isolate, scriptId);
     script.content = sourceText;
     return;
   }
 
-  if (Types.Events.isV8SourceRundownSourcesLargeScriptCatchupEvent(event)) {
+  if (Types.Events.isRundownScriptSourceLarge(event)) {
     const {isolate, scriptId, sourceText} = event.args.data;
     const script = getOrMakeScript(isolate, scriptId);
     script.content = (script.content ?? '') + sourceText;

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

@@ -9,14 +9,8 @@ import {data as metaHandlerData} from './MetaHandler.js';
 import {ScoreClassification} from './PageLoadMetricsHandler.js';
 import type {HandlerName} from './types.js';
 
-// This handler serves two purposes. It generates a list of events that are
-// used to show user clicks in the timeline. It is also used to gather
-// EventTimings into Interactions, which we use to show interactions and
-// highlight long interactions to the user, along with INP.
-
-// We don't need to know which process / thread these events occurred in,
-// because they are effectively global, so we just track all that we find.
-let allEvents: Types.Events.EventTimingBeginOrEnd[] = [];
+// This handler gathers EventTimings into Interactions, which we use to show
+// interactions and highlight long interactions to the user, along with INP.
 
 let beginCommitCompositorFrameEvents: Types.Events.BeginCommitCompositorFrame[] = [];
 let parseMetaViewportEvents: Types.Events.ParseMetaViewport[] = [];
@@ -27,8 +21,6 @@ const INP_GOOD_TIMING = LONG_INTERACTION_THRESHOLD;
 const INP_MEDIUM_TIMING = Helpers.Timing.milliToMicro(Types.Timing.Milli(500));
 
 export interface UserInteractionsData {
-  /** All the user events we found in the trace */
-  allEvents: readonly Types.Events.EventTimingBeginOrEnd[];
   /** All the BeginCommitCompositorFrame events we found in the trace */
   beginCommitCompositorFrameEvents: readonly Types.Events.BeginCommitCompositorFrame[];
   /** All the ParseMetaViewport events we found in the trace */
@@ -68,7 +60,6 @@ let eventTimingEndEventsById = new Map<string, Types.Events.EventTimingEnd>();
 let eventTimingStartEventsForInteractions: Types.Events.EventTimingBegin[] = [];
 
 export function reset(): void {
-  allEvents = [];
   beginCommitCompositorFrameEvents = [];
   parseMetaViewportEvents = [];
   interactionEvents = [];
@@ -98,8 +89,6 @@ export function handleEvent(event: Types.Events.Event): void {
     eventTimingEndEventsById.set(event.id, event);
   }
 
-  allEvents.push(event);
-
   // From this point on we want to find events that represent interactions.
   // These events are always start events - those are the ones that contain all
   // the metadata about the interaction.
@@ -351,7 +340,6 @@ export async function finalize(): Promise<void> {
 
 export function data(): UserInteractionsData {
   return {
-    allEvents,
     beginCommitCompositorFrameEvents,
     parseMetaViewportEvents,
     interactionEvents,

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

@@ -226,9 +226,8 @@ export function data(): UserTimingsData {
     performanceMeasures: syntheticEvents.filter(e => e.cat === 'blink.user_timing') as
         Types.Events.SyntheticUserTimingPair[],
     consoleTimings: syntheticEvents.filter(e => e.cat === 'blink.console') as Types.Events.SyntheticConsoleTimingPair[],
-    // TODO(crbug/41484172): UserTimingsHandler.test.ts fails if this is not copied.
-    performanceMarks: [...performanceMarkEvents],
-    timestampEvents: [...timestampEvents],
-    measureTraceByTraceId: new Map(measureTraceByTraceId),
+    performanceMarks: performanceMarkEvents,
+    timestampEvents,
+    measureTraceByTraceId,
   };
 }

package/front_end/models/trace/insights/CLSCulprits.ts

@@ -471,7 +471,7 @@ function getUnsizedImageRootCauses(
   return rootCausesByShift;
 }
 
-export function isCLSCulprits(insight: InsightModel): insight is CLSCulpritsInsightModel {
+export function isCLSCulpritsInsight(insight: InsightModel): insight is CLSCulpritsInsightModel {
   return insight.insightKey === InsightKeys.CLS_CULPRITS;
 }
 

package/front_end/models/trace/insights/DocumentLatency.ts

@@ -81,7 +81,7 @@ const TARGET_MS = 100;
 // Threshold for compression savings.
 const IGNORE_THRESHOLD_IN_BYTES = 1400;
 
-export function isDocumentLatency(x: InsightModel): x is DocumentLatencyInsightModel {
+export function isDocumentLatencyInsight(x: InsightModel): x is DocumentLatencyInsightModel {
   return x.insightKey === 'DocumentLatency';
 }
 
@@ -190,13 +190,12 @@ function finalize(partialModel: PartialInsightModel<DocumentLatencyInsightModel>
 }
 
 export function generateInsight(
-    data: Handlers.Types.HandlerData, context: InsightSetContext,
-    timeFormatters?: Types.Configuration.InsightTimeFormatters): DocumentLatencyInsightModel {
+    data: Handlers.Types.HandlerData, context: InsightSetContext): DocumentLatencyInsightModel {
   if (!context.navigation) {
     return finalize({});
   }
 
-  const millisToString = timeFormatters?.milli ?? i18n.TimeUtilities.millisToString;
+  const millisToString = context.options.insightTimeFormatters?.milli ?? i18n.TimeUtilities.millisToString;
 
   const documentRequest = data.NetworkRequests.byId.get(context.navigationId);
   if (!documentRequest) {

package/front_end/models/trace/insights/DuplicatedJavaScript.ts

@@ -60,7 +60,7 @@ function finalize(partialModel: PartialInsightModel<DuplicatedJavaScriptInsightM
   };
 }
 
-export function isDuplicatedJavaScript(model: InsightModel): model is DuplicatedJavaScriptInsightModel {
+export function isDuplicatedJavaScriptInsight(model: InsightModel): model is DuplicatedJavaScriptInsightModel {
   return model.insightKey === InsightKeys.DUPLICATE_JAVASCRIPT;
 }