chrome-devtools-frontend 1.0.1512147 → 1.0.1513662

package/front_end/panels/timeline/TimelineUIUtils.ts

@@ -476,6 +476,9 @@ const UIStrings = {
 const str_ = i18n.i18n.registerUIStrings('panels/timeline/TimelineUIUtils.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 
+// Look for scheme:// plus text and exclude any punctuation at the end.
+export const URL_REGEX = /(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}:\/\/)[^\s"]{2,}[^\s"'\)\}\],:;.!?]/u;
+
 let eventDispatchDesciptors: EventDispatchTypeDescriptor[];
 
 let colorGenerator: Common.Color.Generator;
@@ -524,7 +527,7 @@ export class TimelineUIUtils {
   }
 
   static testContentMatching(
-      traceEvent: Trace.Types.Events.Event, regExp: RegExp, parsedTrace?: Trace.Handlers.Types.ParsedTrace): boolean {
+      traceEvent: Trace.Types.Events.Event, regExp: RegExp, handlerData?: Trace.Handlers.Types.HandlerData): boolean {
     const title = TimelineUIUtils.eventStyle(traceEvent).title;
     const tokens = [title];
 
@@ -535,14 +538,14 @@ export class TimelineUIUtils {
       // legacy model which does not have a reference to the new engine's data.
       // So if we are missing the data, we just fallback to the name from the
       // callFrame.
-      if (!parsedTrace?.Samples) {
+      if (!handlerData?.Samples) {
         tokens.push(traceEvent.callFrame.functionName);
       } else {
-        tokens.push(Trace.Handlers.ModelHandlers.Samples.getProfileCallFunctionName(parsedTrace.Samples, traceEvent));
+        tokens.push(Trace.Handlers.ModelHandlers.Samples.getProfileCallFunctionName(handlerData.Samples, traceEvent));
       }
     }
-    if (parsedTrace) {
-      const url = Trace.Handlers.Helpers.getNonResolvedURL(traceEvent, parsedTrace);
+    if (handlerData) {
+      const url = Trace.Handlers.Helpers.getNonResolvedURL(traceEvent, handlerData);
       if (url) {
         tokens.push(url);
       }
@@ -648,7 +651,7 @@ export class TimelineUIUtils {
 
   static async buildDetailsNodeForTraceEvent(
       event: Trace.Types.Events.Event, target: SDK.Target.Target|null, linkifier: LegacyComponents.Linkifier.Linkifier,
-      isFreshRecording = false, parsedTrace: Trace.Handlers.Types.ParsedTrace): Promise<Node|null> {
+      isFreshRecording = false, parsedTrace: Trace.TraceModel.ParsedTrace): Promise<Node|null> {
     let details: HTMLElement|HTMLSpanElement|(Element | null)|Text|null = null;
     let detailsText;
     // TODO(40287735): update this code with type-safe data checks.
@@ -669,7 +672,7 @@ export class TimelineUIUtils {
       case Trace.Types.Events.Name.RESOURCE_RECEIVE_DATA:
       case Trace.Types.Events.Name.RESOURCE_RECEIVE_RESPONSE:
       case Trace.Types.Events.Name.RESOURCE_FINISH: {
-        const url = Trace.Handlers.Helpers.getNonResolvedURL(event, parsedTrace);
+        const url = Trace.Handlers.Helpers.getNonResolvedURL(event, parsedTrace.data);
         if (url) {
           const options = {
             tabStop: true,
@@ -897,9 +900,7 @@ export class TimelineUIUtils {
    * of the link is the URL, so the visible string to the user is unchanged.
    */
   static parseStringForLinks(rawString: string): DocumentFragment {
-    // Look for scheme:// plus text and exclude any punctuation at the end.
-    const urlRegex = /(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}:\/\/)[^\s"]{2,}[^\s"'\)\}\],:;.!?]/u;
-    const results = TextUtils.TextUtils.Utils.splitStringByRegexes(rawString, [urlRegex]);
+    const results = TextUtils.TextUtils.Utils.splitStringByRegexes(rawString, [URL_REGEX]);
     const nodes = results.map(result => {
       if (result.regexIndex === -1) {
         return result.value;
@@ -913,7 +914,7 @@ export class TimelineUIUtils {
   }
 
   static async buildTraceEventDetails(
-      parsedTrace: Trace.Handlers.Types.ParsedTrace,
+      parsedTrace: Trace.TraceModel.ParsedTrace,
       event: Trace.Types.Events.Event,
       linkifier: LegacyComponents.Linkifier.Linkifier,
       canShowPieChart: boolean,
@@ -932,7 +933,7 @@ export class TimelineUIUtils {
       // @ts-expect-error TODO(crbug.com/1011811): Remove symbol usage.
       if (typeof event[previewElementSymbol] === 'undefined') {
         let previewElement: (Element|null)|null = null;
-        const url = Trace.Handlers.Helpers.getNonResolvedURL(event, parsedTrace);
+        const url = Trace.Handlers.Helpers.getNonResolvedURL(event, parsedTrace.data);
         if (url) {
           previewElement = await LegacyComponents.ImagePreview.ImagePreview.build(url, false, {
             imageAltText: LegacyComponents.ImagePreview.ImagePreview.defaultAltTextForImageURL(url),
@@ -964,8 +965,8 @@ export class TimelineUIUtils {
     const unsafeEventArgs = event.args as Record<string, any>;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const unsafeEventData = event.args?.data as Record<string, any>;
-    const initiator = parsedTrace.Initiators.eventToInitiator.get(event) ?? null;
-    const initiatorFor = parsedTrace.Initiators.initiatorToEvents.get(event) ?? null;
+    const initiator = parsedTrace.data.Initiators.eventToInitiator.get(event) ?? null;
+    const initiatorFor = parsedTrace.data.Initiators.initiatorToEvents.get(event) ?? null;
 
     let url: Platform.DevToolsPath.UrlString|null = null;
 
@@ -1002,7 +1003,7 @@ export class TimelineUIUtils {
       contentHelper.appendElementRow(i18nString(UIStrings.details), detailContainer);
     }
 
-    if (parsedTrace.Meta.traceIsGeneric) {
+    if (parsedTrace.data.Meta.traceIsGeneric) {
       TimelineUIUtils.renderEventJson(event, contentHelper);
       return contentHelper.fragment;
     }
@@ -1222,7 +1223,7 @@ export class TimelineUIUtils {
       case Trace.Types.Events.Name.DECODE_IMAGE:
       case Trace.Types.Events.Name.DRAW_LAZY_PIXEL_REF: {
         relatedNodeLabel = i18nString(UIStrings.ownerElement);
-        url = Trace.Handlers.Helpers.getNonResolvedURL(event, parsedTrace);
+        url = Trace.Handlers.Helpers.getNonResolvedURL(event, parsedTrace.data);
         if (url) {
           const options = {
             tabStop: true,
@@ -1512,7 +1513,7 @@ export class TimelineUIUtils {
     const stackTrace = Trace.Helpers.Trace.getZeroIndexedStackTraceInEventPayload(event);
     if (Trace.Types.Events.isUserTiming(event) || Trace.Types.Extensions.isSyntheticExtensionEntry(event) ||
         Trace.Types.Events.isProfileCall(event) || initiator || initiatorFor || stackTrace ||
-        parsedTrace?.Invalidations.invalidationsForEvent.get(event)) {
+        parsedTrace?.data.Invalidations.invalidationsForEvent.get(event)) {
       await TimelineUIUtils.generateCauses(event, contentHelper, parsedTrace);
     }
 
@@ -1698,11 +1699,11 @@ export class TimelineUIUtils {
 
   static async generateCauses(
       event: Trace.Types.Events.Event, contentHelper: TimelineDetailsContentHelper,
-      parsedTrace: Trace.Handlers.Types.ParsedTrace): Promise<void> {
+      parsedTrace: Trace.TraceModel.ParsedTrace): Promise<void> {
     const {startTime} = Trace.Helpers.Timing.eventTimingsMilliSeconds(event);
     let initiatorStackLabel = i18nString(UIStrings.initiatorStackTrace);
     let stackLabel = i18nString(UIStrings.stackTrace);
-    const stackTraceForEvent = Trace.Extras.StackTraceForEvent.get(event, parsedTrace);
+    const stackTraceForEvent = Trace.Extras.StackTraceForEvent.get(event, parsedTrace.data);
     if (stackTraceForEvent?.callFrames.length || stackTraceForEvent?.description || stackTraceForEvent?.parent) {
       contentHelper.addSection(i18nString(UIStrings.stackTrace));
       contentHelper.createChildStackTraceElement(stackTraceForEvent);
@@ -1735,9 +1736,9 @@ export class TimelineUIUtils {
         break;
     }
 
-    const initiator = parsedTrace.Initiators.eventToInitiator.get(event);
-    const initiatorFor = parsedTrace.Initiators.initiatorToEvents.get(event);
-    const invalidations = parsedTrace.Invalidations.invalidationsForEvent.get(event);
+    const initiator = parsedTrace.data.Initiators.eventToInitiator.get(event);
+    const initiatorFor = parsedTrace.data.Initiators.initiatorToEvents.get(event);
+    const invalidations = parsedTrace.data.Invalidations.invalidationsForEvent.get(event);
 
     if (initiator) {
       // If we have an initiator for the event, we can show its stack trace, a link to reveal the initiator,
@@ -1775,7 +1776,7 @@ export class TimelineUIUtils {
     }
 
     if (invalidations?.length) {
-      const totalInvalidations = parsedTrace.Invalidations.invalidationCountForEvent.get(event) ??
+      const totalInvalidations = parsedTrace.data.Invalidations.invalidationCountForEvent.get(event) ??
           0;  // Won't be 0, but saves us dealing with undefined.
       contentHelper.addSection(i18nString(UIStrings.invalidations, {PH1: totalInvalidations}));
       await TimelineUIUtils.generateInvalidationsList(invalidations, contentHelper);
@@ -1907,9 +1908,9 @@ export class TimelineUIUtils {
 
   /** Populates the passed object then returns true/false if it makes sense to show the pie chart */
   private static aggregatedStatsForTraceEvent(
-      total: TimeRangeCategoryStats, parsedTrace: Trace.Handlers.Types.ParsedTrace,
+      total: TimeRangeCategoryStats, parsedTrace: Trace.TraceModel.ParsedTrace,
       event: Trace.Types.Events.Event): boolean {
-    const node = parsedTrace.Renderer.entryToNode.get(event);
+    const node = parsedTrace.data.Renderer.entryToNode.get(event);
     if (!node) {
       return false;
     }
@@ -1958,9 +1959,9 @@ export class TimelineUIUtils {
   }
 
   static async buildPicturePreviewContent(
-      parsedTrace: Trace.Handlers.Types.ParsedTrace, event: Trace.Types.Events.Paint,
+      parsedTrace: Trace.TraceModel.ParsedTrace, event: Trace.Types.Events.Paint,
       target: SDK.Target.Target): Promise<Element|null> {
-    const snapshotEvent = parsedTrace.LayerTree.paintsToSnapshots.get(event);
+    const snapshotEvent = parsedTrace.data.LayerTree.paintsToSnapshots.get(event);
     if (!snapshotEvent) {
       return null;
     }
@@ -2307,7 +2308,7 @@ export class TimelineUIUtils {
   }
 
   static getOriginWithEntity(
-      entityMapper: Utils.EntityMapper.EntityMapper|null, parsedTrace: Trace.Handlers.Types.ParsedTrace,
+      entityMapper: Utils.EntityMapper.EntityMapper|null, parsedTrace: Trace.TraceModel.ParsedTrace,
       event: Trace.Types.Events.Event): string|null {
     const resolvedURL = Utils.SourceMapsResolver.SourceMapsResolver.resolvedURLForEntry(parsedTrace, event);
     if (!resolvedURL) {
@@ -2346,7 +2347,7 @@ export class EventDispatchTypeDescriptor {
 
 export class TimelineDetailsContentHelper {
   fragment: DocumentFragment;
-  private linkifierInternal: LegacyComponents.Linkifier.Linkifier|null;
+  #linkifier: LegacyComponents.Linkifier.Linkifier|null;
   private target: SDK.Target.Target|null;
   element: HTMLDivElement;
   private tableElement: HTMLElement;
@@ -2354,7 +2355,7 @@ export class TimelineDetailsContentHelper {
   constructor(target: SDK.Target.Target|null, linkifier: LegacyComponents.Linkifier.Linkifier|null) {
     this.fragment = document.createDocumentFragment();
 
-    this.linkifierInternal = linkifier;
+    this.#linkifier = linkifier;
     this.target = target;
 
     this.element = document.createElement('div');
@@ -2385,7 +2386,7 @@ export class TimelineDetailsContentHelper {
   }
 
   linkifier(): LegacyComponents.Linkifier.Linkifier|null {
-    return this.linkifierInternal;
+    return this.#linkifier;
   }
 
   appendTextRow(title: string, value: string|number|boolean): void {
@@ -2415,7 +2416,7 @@ export class TimelineDetailsContentHelper {
 
   appendLocationRow(
       title: string, url: string, startLine: number, startColumn?: number, text?: string, omitOrigin?: boolean): void {
-    if (!this.linkifierInternal) {
+    if (!this.#linkifier) {
       return;
     }
 
@@ -2427,7 +2428,7 @@ export class TimelineDetailsContentHelper {
       text,
       omitOrigin,
     };
-    const link = this.linkifierInternal.maybeLinkifyScriptLocation(
+    const link = this.#linkifier.maybeLinkifyScriptLocation(
         this.target, null, url as Platform.DevToolsPath.UrlString, startLine, options);
     if (!link) {
       return;
@@ -2436,11 +2437,11 @@ export class TimelineDetailsContentHelper {
   }
 
   appendLocationRange(title: string, url: Platform.DevToolsPath.UrlString, startLine: number, endLine?: number): void {
-    if (!this.linkifierInternal || !this.target) {
+    if (!this.#linkifier || !this.target) {
       return;
     }
     const locationContent = document.createElement('span');
-    const link = this.linkifierInternal.maybeLinkifyScriptLocation(
+    const link = this.#linkifier.maybeLinkifyScriptLocation(
         this.target, null, url, startLine, {tabStop: true, inlineFrameIndex: 0});
     if (!link) {
       return;
@@ -2452,7 +2453,7 @@ export class TimelineDetailsContentHelper {
   }
 
   createChildStackTraceElement(stackTrace: Protocol.Runtime.StackTrace): void {
-    if (!this.linkifierInternal) {
+    if (!this.#linkifier) {
       return;
     }
     const resolvedStackTrace: Protocol.Runtime.StackTrace = structuredClone(stackTrace);
@@ -2470,7 +2471,7 @@ export class TimelineDetailsContentHelper {
     const stackTraceElement =
         this.tableElement.createChild('div', 'timeline-details-view-row timeline-details-stack-values');
     const callFrameContents = new LegacyComponents.JSPresentationUtils.StackTracePreviewContent(
-        undefined, this.target ?? undefined, this.linkifierInternal,
+        undefined, this.target ?? undefined, this.#linkifier,
         {stackTrace: resolvedStackTrace, tabStops: true, showColumnNumber: true});
     callFrameContents.markAsRoot();
     callFrameContents.show(stackTraceElement);
@@ -2494,7 +2495,7 @@ export interface TimelineMarkerStyle {
  * the LCP (for example) relative to the last navigation.
  **/
 export function timeStampForEventAdjustedForClosestNavigationIfPossible(
-    event: Trace.Types.Events.Event, parsedTrace: Trace.Handlers.Types.ParsedTrace|null): Trace.Types.Timing.Milli {
+    event: Trace.Types.Events.Event, parsedTrace: Trace.TraceModel.ParsedTrace|null): Trace.Types.Timing.Milli {
   if (!parsedTrace) {
     const {startTime} = Trace.Helpers.Timing.eventTimingsMilliSeconds(event);
     return startTime;
@@ -2502,9 +2503,9 @@ export function timeStampForEventAdjustedForClosestNavigationIfPossible(
 
   const time = Trace.Helpers.Timing.timeStampForEventAdjustedByClosestNavigation(
       event,
-      parsedTrace.Meta.traceBounds,
-      parsedTrace.Meta.navigationsByNavigationId,
-      parsedTrace.Meta.navigationsByFrameId,
+      parsedTrace.data.Meta.traceBounds,
+      parsedTrace.data.Meta.navigationsByNavigationId,
+      parsedTrace.data.Meta.navigationsByFrameId,
   );
   return Trace.Helpers.Timing.microToMilli(time);
 }
@@ -2515,7 +2516,7 @@ export function timeStampForEventAdjustedForClosestNavigationIfPossible(
  * the LCP time. This method does not filter out events: for example, it treats
  * every LCP Candidate event as a potential marker event.
  **/
-export function isMarkerEvent(parsedTrace: Trace.Handlers.Types.ParsedTrace, event: Trace.Types.Events.Event): boolean {
+export function isMarkerEvent(parsedTrace: Trace.TraceModel.ParsedTrace, event: Trace.Types.Events.Event): boolean {
   const {Name} = Trace.Types.Events;
 
   if (event.name === Name.TIME_STAMP || event.name === Name.NAVIGATION_START) {
@@ -2523,7 +2524,7 @@ export function isMarkerEvent(parsedTrace: Trace.Handlers.Types.ParsedTrace, eve
   }
 
   if (Trace.Types.Events.isFirstContentfulPaint(event) || Trace.Types.Events.isFirstPaint(event)) {
-    return event.args.frame === parsedTrace.Meta.mainFrameId;
+    return event.args.frame === parsedTrace.data.Meta.mainFrameId;
   }
 
   if (Trace.Types.Events.isMarkDOMContent(event) || Trace.Types.Events.isMarkLoad(event) ||
@@ -2547,10 +2548,10 @@ export function isMarkerEvent(parsedTrace: Trace.Handlers.Types.ParsedTrace, eve
 }
 
 function getEventSelfTime(
-    event: Trace.Types.Events.Event, parsedTrace: Trace.Handlers.Types.ParsedTrace): Trace.Types.Timing.Micro {
+    event: Trace.Types.Events.Event, parsedTrace: Trace.TraceModel.ParsedTrace): Trace.Types.Timing.Micro {
   const mapToUse = Trace.Types.Extensions.isSyntheticExtensionEntry(event) ?
-      parsedTrace.ExtensionTraceData.entryToNode :
-      parsedTrace.Renderer.entryToNode;
+      parsedTrace.data.ExtensionTraceData.entryToNode :
+      parsedTrace.data.Renderer.entryToNode;
   const selfTime = mapToUse.get(event)?.selfTime;
   return selfTime ? selfTime : Trace.Types.Timing.Micro(0);
 }

package/front_end/panels/timeline/TimingsTrackAppender.ts

@@ -48,16 +48,16 @@ export class TimingsTrackAppender implements TrackAppender {
 
   #colorGenerator: Common.Color.Generator;
   #compatibilityBuilder: CompatibilityTracksAppender;
-  #parsedTrace: Readonly<Trace.Handlers.Types.ParsedTrace>;
+  #parsedTrace: Readonly<Trace.TraceModel.ParsedTrace>;
   #extensionMarkers: readonly Trace.Types.Extensions.SyntheticExtensionMarker[];
   constructor(
-      compatibilityBuilder: CompatibilityTracksAppender, parsedTrace: Trace.Handlers.Types.ParsedTrace,
+      compatibilityBuilder: CompatibilityTracksAppender, parsedTrace: Trace.TraceModel.ParsedTrace,
       colorGenerator: Common.Color.Generator) {
     this.#compatibilityBuilder = compatibilityBuilder;
     this.#colorGenerator = colorGenerator;
     this.#parsedTrace = parsedTrace;
     const extensionDataEnabled = TimelinePanel.extensionDataVisibilitySetting().get();
-    this.#extensionMarkers = extensionDataEnabled ? this.#parsedTrace.ExtensionTraceData.extensionMarkers : [];
+    this.#extensionMarkers = extensionDataEnabled ? this.#parsedTrace.data.ExtensionTraceData.extensionMarkers : [];
   }
 
   /**
@@ -71,14 +71,14 @@ export class TimingsTrackAppender implements TrackAppender {
    */
   appendTrackAtLevel(trackStartLevel: number, expanded?: boolean): number {
     const extensionMarkersAreEmpty = this.#extensionMarkers.length === 0;
-    const performanceMarks = this.#parsedTrace.UserTimings.performanceMarks.filter(
+    const performanceMarks = this.#parsedTrace.data.UserTimings.performanceMarks.filter(
         m => !Trace.Handlers.ModelHandlers.ExtensionTraceData.extensionDataInPerformanceTiming(m).devtoolsObj);
-    const performanceMeasures = this.#parsedTrace.UserTimings.performanceMeasures.filter(
+    const performanceMeasures = this.#parsedTrace.data.UserTimings.performanceMeasures.filter(
         m => !Trace.Handlers.ModelHandlers.ExtensionTraceData.extensionDataInPerformanceTiming(m).devtoolsObj);
-    const timestampEvents = this.#parsedTrace.UserTimings.timestampEvents.filter(
+    const timestampEvents = this.#parsedTrace.data.UserTimings.timestampEvents.filter(
         timeStamp =>
             !Trace.Handlers.ModelHandlers.ExtensionTraceData.extensionDataInConsoleTimeStamp(timeStamp).devtoolsObj);
-    const consoleTimings = this.#parsedTrace.UserTimings.consoleTimings;
+    const consoleTimings = this.#parsedTrace.data.UserTimings.consoleTimings;
     if (extensionMarkersAreEmpty && performanceMarks.length === 0 && performanceMeasures.length === 0 &&
         timestampEvents.length === 0 && consoleTimings.length === 0) {
       return trackStartLevel;
@@ -101,7 +101,7 @@ export class TimingsTrackAppender implements TrackAppender {
    * appended.
    */
   #appendTrackHeaderAtLevel(currentLevel: number, expanded?: boolean): void {
-    const trackIsCollapsible = this.#parsedTrace.UserTimings.performanceMeasures.length > 0;
+    const trackIsCollapsible = this.#parsedTrace.data.UserTimings.performanceMeasures.length > 0;
     const style = buildGroupStyle({useFirstLineForOverview: true, collapsible: trackIsCollapsible});
     const group = buildTrackHeader(
         VisualLoggingTrackName.TIMINGS, currentLevel, i18nString(UIStrings.timings), style, /* selectable= */ true,
@@ -127,7 +127,7 @@ export class TimingsTrackAppender implements TrackAppender {
       this.#compatibilityBuilder.getFlameChartTimelineData().entryTotalTimes[index] = Number.NaN;
     }
 
-    const minTimeMs = Trace.Helpers.Timing.microToMilli(this.#parsedTrace.Meta.traceBounds.min);
+    const minTimeMs = Trace.Helpers.Timing.microToMilli(this.#parsedTrace.data.Meta.traceBounds.min);
     const flameChartMarkers = markers.map(marker => {
       // The timestamp for user timing trace events is set to the
       // start time passed by the user at the call site of the timing
@@ -272,9 +272,9 @@ export class TimingsTrackAppender implements TrackAppender {
         Trace.Types.Events.isConsoleTimeStamp(event) || isExtensibilityMarker) {
       const timeOfEvent = Trace.Helpers.Timing.timeStampForEventAdjustedByClosestNavigation(
           event,
-          this.#parsedTrace.Meta.traceBounds,
-          this.#parsedTrace.Meta.navigationsByNavigationId,
-          this.#parsedTrace.Meta.navigationsByFrameId,
+          this.#parsedTrace.data.Meta.traceBounds,
+          this.#parsedTrace.data.Meta.navigationsByNavigationId,
+          this.#parsedTrace.data.Meta.navigationsByFrameId,
       );
       info.formattedTime = getDurationString(timeOfEvent);
     }

package/front_end/panels/timeline/TracingLayerTree.ts

@@ -149,61 +149,61 @@ export class TracingFrameLayerTree {
 
 export class TracingLayer implements SDK.LayerTreeBase.Layer {
   private parentLayerId: string|null;
-  private parentInternal: SDK.LayerTreeBase.Layer|null;
+  parentInternal: SDK.LayerTreeBase.Layer|null;
   private layerId: string;
-  private nodeInternal: SDK.DOMModel.DOMNode|null;
-  private offsetXInternal: number;
-  private offsetYInternal: number;
-  private widthInternal: number;
-  private heightInternal: number;
-  private childrenInternal: SDK.LayerTreeBase.Layer[];
-  private quadInternal: number[];
-  private scrollRectsInternal: Protocol.LayerTree.ScrollRect[];
-  private gpuMemoryUsageInternal: number;
+  #node: SDK.DOMModel.DOMNode|null;
+  #offsetX: number;
+  #offsetY: number;
+  #width: number;
+  #height: number;
+  #children: SDK.LayerTreeBase.Layer[];
+  #quad: number[];
+  #scrollRects: Protocol.LayerTree.ScrollRect[];
+  #gpuMemoryUsage: number;
   private paints: Trace.Types.Events.LegacyLayerPaintEvent[];
   private compositingReasons: string[];
   private compositingReasonIds: string[];
-  private drawsContentInternal: boolean;
+  #drawsContent: boolean;
   private paintProfilerModel: SDK.PaintProfiler.PaintProfilerModel|null;
   constructor(paintProfilerModel: SDK.PaintProfiler.PaintProfilerModel|null, payload: TracingLayerPayload) {
     this.parentLayerId = null;
     this.parentInternal = null;
     this.layerId = '';
-    this.nodeInternal = null;
-    this.offsetXInternal = -1;
-    this.offsetYInternal = -1;
-    this.widthInternal = -1;
-    this.heightInternal = -1;
-    this.childrenInternal = [];
-    this.quadInternal = [];
-    this.scrollRectsInternal = [];
-    this.gpuMemoryUsageInternal = -1;
+    this.#node = null;
+    this.#offsetX = -1;
+    this.#offsetY = -1;
+    this.#width = -1;
+    this.#height = -1;
+    this.#children = [];
+    this.#quad = [];
+    this.#scrollRects = [];
+    this.#gpuMemoryUsage = -1;
     this.paints = [];
     this.compositingReasons = [];
     this.compositingReasonIds = [];
-    this.drawsContentInternal = false;
+    this.#drawsContent = false;
 
     this.paintProfilerModel = paintProfilerModel;
     this.reset(payload);
   }
 
   reset(payload: TracingLayerPayload): void {
-    this.nodeInternal = null;
+    this.#node = null;
     this.layerId = String(payload.layer_id);
-    this.offsetXInternal = payload.position[0];
-    this.offsetYInternal = payload.position[1];
-    this.widthInternal = payload.bounds.width;
-    this.heightInternal = payload.bounds.height;
-    this.childrenInternal = [];
+    this.#offsetX = payload.position[0];
+    this.#offsetY = payload.position[1];
+    this.#width = payload.bounds.width;
+    this.#height = payload.bounds.height;
+    this.#children = [];
     this.parentLayerId = null;
     this.parentInternal = null;
-    this.quadInternal = payload.layer_quad || [];
+    this.#quad = payload.layer_quad || [];
     this.createScrollRects(payload);
 
     this.compositingReasons = payload.compositing_reasons || [];
     this.compositingReasonIds = payload.compositing_reason_ids || [];
-    this.drawsContentInternal = Boolean(payload.draws_content);
-    this.gpuMemoryUsageInternal = payload.gpu_memory_usage;
+    this.#drawsContent = Boolean(payload.draws_content);
+    this.#gpuMemoryUsage = payload.gpu_memory_usage;
     this.paints = [];
   }
 
@@ -224,7 +224,7 @@ export class TracingLayer implements SDK.LayerTreeBase.Layer {
   }
 
   children(): SDK.LayerTreeBase.Layer[] {
-    return this.childrenInternal;
+    return this.#children;
   }
 
   addChild(childParam: SDK.LayerTreeBase.Layer): void {
@@ -232,17 +232,17 @@ export class TracingLayer implements SDK.LayerTreeBase.Layer {
     if (child.parentInternal) {
       console.assert(false, 'Child already has a parent');
     }
-    this.childrenInternal.push(child);
+    this.#children.push(child);
     child.parentInternal = this;
     child.parentLayerId = this.layerId;
   }
 
   setNode(node: SDK.DOMModel.DOMNode|null): void {
-    this.nodeInternal = node;
+    this.#node = node;
   }
 
   node(): SDK.DOMModel.DOMNode|null {
-    return this.nodeInternal;
+    return this.#node;
   }
 
   nodeForSelfOrAncestor(): SDK.DOMModel.DOMNode|null {
@@ -256,19 +256,19 @@ export class TracingLayer implements SDK.LayerTreeBase.Layer {
   }
 
   offsetX(): number {
-    return this.offsetXInternal;
+    return this.#offsetX;
   }
 
   offsetY(): number {
-    return this.offsetYInternal;
+    return this.#offsetY;
   }
 
   width(): number {
-    return this.widthInternal;
+    return this.#width;
   }
 
   height(): number {
-    return this.heightInternal;
+    return this.#height;
   }
 
   transform(): number[]|null {
@@ -276,7 +276,7 @@ export class TracingLayer implements SDK.LayerTreeBase.Layer {
   }
 
   quad(): number[] {
-    return this.quadInternal;
+    return this.#quad;
   }
 
   anchorPoint(): number[] {
@@ -296,7 +296,7 @@ export class TracingLayer implements SDK.LayerTreeBase.Layer {
   }
 
   scrollRects(): Protocol.LayerTree.ScrollRect[] {
-    return this.scrollRectsInternal;
+    return this.#scrollRects;
   }
 
   stickyPositionConstraint(): SDK.LayerTreeBase.StickyPositionConstraint|null {
@@ -305,7 +305,7 @@ export class TracingLayer implements SDK.LayerTreeBase.Layer {
   }
 
   gpuMemoryUsage(): number {
-    return this.gpuMemoryUsageInternal;
+    return this.#gpuMemoryUsage;
   }
 
   snapshots(): Array<Promise<SDK.PaintProfiler.SnapshotWithRect|null>> {
@@ -385,7 +385,7 @@ export class TracingLayer implements SDK.LayerTreeBase.Layer {
     // SDK.LayerBaseTree.Layer.ScrollRectType and Protocol.LayerTree.ScrollRectType are the
     // same type, but we need to use the indirection of the nonPayloadScrollRects since
     // the ScrollRectType is defined as a string in SDK.LayerBaseTree.Layer.ScrollRectType.
-    this.scrollRectsInternal = nonPayloadScrollRects;
+    this.#scrollRects = nonPayloadScrollRects;
   }
 
   addPaintEvent(paint: Trace.Types.Events.LegacyLayerPaintEvent): void {
@@ -401,7 +401,7 @@ export class TracingLayer implements SDK.LayerTreeBase.Layer {
   }
 
   drawsContent(): boolean {
-    return this.drawsContentInternal;
+    return this.#drawsContent;
   }
 }
 

package/front_end/panels/timeline/TrackConfigBanner.ts

@@ -35,12 +35,12 @@ const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
  * is no entry for a trace in this map it is assumed to be a new trace and the
  * banner will be shown if the user has any hidden track config.
  */
-const hiddenTracksInfoBarPerTrace = new WeakMap<Trace.Handlers.Types.ParsedTrace, UI.Infobar.Infobar|'DISMISSED'>();
+const hiddenTracksInfoBarByParsedTrace = new WeakMap<Trace.TraceModel.ParsedTrace, UI.Infobar.Infobar|'DISMISSED'>();
 
 /**
  * Creates an overlay for the timeline that will show a banner informing the user that at least one track is hidden.
  *
- * @param trace The trace parsed data.
+ * @param parsedTrace The trace parsed data.
  * @param callbacks An object containing the callback functions to be executed
  * when the user interacts with the banner.
  *   - `onShowAllTracks`: called when the user clicks the "Unhide all" button.
@@ -49,12 +49,12 @@ const hiddenTracksInfoBarPerTrace = new WeakMap<Trace.Handlers.Types.ParsedTrace
  * @returns A `Trace.Types.Overlays.Overlay` object to be rendered, or `null` if
  * no banner should be shown (because the user has already seen the banner)
  */
-export function createHiddenTracksOverlay(trace: Trace.Handlers.Types.ParsedTrace, callbacks: {
+export function createHiddenTracksOverlay(parsedTrace: Trace.TraceModel.ParsedTrace, callbacks: {
   onShowAllTracks: () => void,
   onShowTrackConfigurationMode: () => void,
   onClose: () => void,
 }): Trace.Types.Overlays.BottomInfoBar|null {
-  const status = hiddenTracksInfoBarPerTrace.get(trace);
+  const status = hiddenTracksInfoBarByParsedTrace.get(parsedTrace);
   if (status === 'DISMISSED') {
     // The user has already seen the banner + dismissed it for this trace, so
     // we don't need to do anything.
@@ -89,9 +89,9 @@ export function createHiddenTracksOverlay(trace: Trace.Handlers.Types.ParsedTrac
   );
   infobarForTrace.setCloseCallback(() => {
     callbacks.onClose();
-    hiddenTracksInfoBarPerTrace.set(trace, 'DISMISSED');
+    hiddenTracksInfoBarByParsedTrace.set(parsedTrace, 'DISMISSED');
   });
 
-  hiddenTracksInfoBarPerTrace.set(trace, infobarForTrace);
+  hiddenTracksInfoBarByParsedTrace.set(parsedTrace, infobarForTrace);
   return {type: 'BOTTOM_INFO_BAR', infobar: infobarForTrace};
 }

package/front_end/panels/timeline/TrackConfiguration.ts

@@ -39,6 +39,6 @@ export function buildPersistedConfig(groups: readonly PerfUI.FlameChart.Group[],
  * trace with the exact same start time is very unlikely.
  * It's not impossible, but unlikely enough that we think the min trace bounds time is a good enough value to use as a uuid.
  */
-export function keyForTraceConfig(trace: Trace.Handlers.Types.ParsedTrace): Trace.Types.Timing.Micro {
+export function keyForTraceConfig(trace: Trace.Handlers.Types.HandlerData): Trace.Types.Timing.Micro {
   return trace.Meta.traceBounds.min;
 }

package/front_end/panels/timeline/components/DetailsView.ts

@@ -72,8 +72,8 @@ const str_ = i18n.i18n.registerUIStrings('panels/timeline/components/DetailsView
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 
 export function buildWarningElementsForEvent(
-    event: Trace.Types.Events.Event, parsedTrace: Trace.Handlers.Types.ParsedTrace): HTMLSpanElement[] {
-  const warnings = parsedTrace.Warnings.perEvent.get(event);
+    event: Trace.Types.Events.Event, parsedTrace: Trace.TraceModel.ParsedTrace): HTMLSpanElement[] {
+  const warnings = parsedTrace.data.Warnings.perEvent.get(event);
   const warningElements: HTMLSpanElement[] = [];
   if (!warnings) {
     return warningElements;
@@ -130,10 +130,10 @@ export interface DetailRow {
 }
 export function buildRowsForWebSocketEvent(
     event: Trace.Types.Events.WebSocketCreate|Trace.Types.Events.WebSocketInfo|Trace.Types.Events.WebSocketTransfer,
-    parsedTrace: Trace.Handlers.Types.ParsedTrace): readonly DetailRow[] {
+    parsedTrace: Trace.TraceModel.ParsedTrace): readonly DetailRow[] {
   const rows: DetailRow[] = [];
 
-  const initiator = parsedTrace.Initiators.eventToInitiator.get(event);
+  const initiator = parsedTrace.data.Initiators.eventToInitiator.get(event);
   if (initiator && Trace.Types.Events.isWebSocketCreate(initiator)) {
     // The initiator will be a WebSocketCreate, but this check helps TypeScript to understand.
     rows.push({key: i18n.i18n.lockedString('URL'), value: initiator.args.data.url});