chrome-devtools-frontend 1.0.1512147 → 1.0.1513662

package/front_end/panels/timeline/ThreadAppender.ts

@@ -144,7 +144,7 @@ export class ThreadAppender implements TrackAppender {
 
   #colorGenerator: Common.Color.Generator;
   #compatibilityBuilder: CompatibilityTracksAppender;
-  #parsedTrace: Trace.Handlers.Types.ParsedTrace;
+  #parsedTrace: Trace.TraceModel.ParsedTrace;
 
   #entries: readonly Trace.Types.Events.Event[] = [];
   #tree: Trace.Helpers.TreeHelpers.TraceEntryTree;
@@ -159,7 +159,7 @@ export class ThreadAppender implements TrackAppender {
   #url = '';
   #headerNestingLevel: number|null = null;
   constructor(
-      compatibilityBuilder: CompatibilityTracksAppender, parsedTrace: Trace.Handlers.Types.ParsedTrace,
+      compatibilityBuilder: CompatibilityTracksAppender, parsedTrace: Trace.TraceModel.ParsedTrace,
       processId: Trace.Types.Events.ProcessID, threadId: Trace.Types.Events.ThreadID, threadName: string|null,
       type: Trace.Handlers.Threads.ThreadType, entries: readonly Trace.Types.Events.Event[],
       tree: Trace.Helpers.TreeHelpers.TraceEntryTree) {
@@ -184,15 +184,15 @@ export class ThreadAppender implements TrackAppender {
     this.#entries = entries;
     this.#tree = tree;
     this.#threadDefaultName = threadName || i18nString(UIStrings.threadS, {PH1: threadId});
-    this.isOnMainFrame = Boolean(this.#parsedTrace.Renderer?.processes.get(processId)?.isOnMainFrame);
+    this.isOnMainFrame = Boolean(this.#parsedTrace.data.Renderer?.processes.get(processId)?.isOnMainFrame);
     this.threadType = type;
     // AuctionWorklets are threads, so we re-use this appender rather than
     // duplicate it, but we change the name because we want to render these
     // lower down than other threads.
-    if (this.#parsedTrace.AuctionWorklets.worklets.has(processId)) {
+    if (this.#parsedTrace.data.AuctionWorklets.worklets.has(processId)) {
       this.appenderName = 'Thread_AuctionWorklet';
     }
-    this.#url = this.#parsedTrace.Renderer?.processes.get(this.#processId)?.url || '';
+    this.#url = this.#parsedTrace.data.Renderer?.processes.get(this.#processId)?.url || '';
   }
 
   processId(): Trace.Types.Events.ProcessID {
@@ -353,7 +353,7 @@ export class ThreadAppender implements TrackAppender {
         return Platform.assertNever(this.threadType, `Unknown thread type: ${this.threadType}`);
     }
     let suffix = '';
-    if (this.#parsedTrace.Meta.traceIsGeneric) {
+    if (this.#parsedTrace.data.Meta.traceIsGeneric) {
       suffix = suffix + ` (${this.threadId()})`;
     }
     return (threadTypeLabel || this.#threadDefaultName) + suffix;
@@ -368,7 +368,7 @@ export class ThreadAppender implements TrackAppender {
   }
 
   #buildNameForAuctionWorklet(): string {
-    const workletMetadataEvent = this.#parsedTrace.AuctionWorklets.worklets.get(this.#processId);
+    const workletMetadataEvent = this.#parsedTrace.data.AuctionWorklets.worklets.get(this.#processId);
     // We should always have this event - if we do not, we were instantiated with invalid data.
     if (!workletMetadataEvent) {
       return i18nString(UIStrings.unknownWorklet);
@@ -422,9 +422,9 @@ export class ThreadAppender implements TrackAppender {
   }
 
   #buildNameForWorker(): string {
-    const url = this.#parsedTrace.Renderer?.processes.get(this.#processId)?.url || '';
-    const workerId = this.#parsedTrace.Workers.workerIdByThread.get(this.#threadId);
-    const workerURL = workerId ? this.#parsedTrace.Workers.workerURLById.get(workerId) : url;
+    const url = this.#parsedTrace.data.Renderer?.processes.get(this.#processId)?.url || '';
+    const workerId = this.#parsedTrace.data.Workers.workerIdByThread.get(this.#threadId);
+    const workerURL = workerId ? this.#parsedTrace.data.Workers.workerURLById.get(workerId) : url;
     // Try to create a name using the worker url if present. If not, use a generic label.
     let workerName =
         workerURL ? i18nString(UIStrings.workerS, {PH1: workerURL}) : i18nString(UIStrings.dedicatedWorker);
@@ -514,7 +514,7 @@ export class ThreadAppender implements TrackAppender {
       addDecorationToEvent(
           flameChartData, index, {type: PerfUI.FlameChart.FlameChartDecorationType.HIDDEN_DESCENDANTS_ARROW});
     }
-    const warnings = this.#parsedTrace.Warnings.perEvent.get(entry);
+    const warnings = this.#parsedTrace.data.Warnings.perEvent.get(entry);
     if (!warnings) {
       return;
     }
@@ -539,7 +539,7 @@ export class ThreadAppender implements TrackAppender {
    * Gets the color an event added by this appender should be rendered with.
    */
   colorForEvent(event: Trace.Types.Events.Event): string {
-    if (this.#parsedTrace.Meta.traceIsGeneric) {
+    if (this.#parsedTrace.data.Meta.traceIsGeneric) {
       return event.name ? `hsl(${Platform.StringUtilities.hashCode(event.name) % 300 + 30}, 40%, 70%)` : '#ccc';
     }
 
@@ -583,7 +583,7 @@ export class ThreadAppender implements TrackAppender {
       const range = (endLine !== -1 || endLine === startLine) ? `${startLine}...${endLine}` : startLine;
       info.title += ` - ${url} [${range}]`;
     }
-    const selfTime = this.#parsedTrace.Renderer.entryToNode.get(event)?.selfTime;
+    const selfTime = this.#parsedTrace.data.Renderer.entryToNode.get(event)?.selfTime;
     info.formattedTime = getDurationString(event.dur, selfTime);
   }
 }

package/front_end/panels/timeline/TimelineDetailsView.ts

@@ -86,8 +86,7 @@ export class TimelineDetailsPane extends
   private selection?: TimelineSelection|null;
   private updateContentsScheduled: boolean;
   private lazySelectorStatsView: TimelineSelectorStatsView|null;
-  #parsedTrace: Trace.Handlers.Types.ParsedTrace|null = null;
-  #traceInsightsSets: Trace.Insights.Types.TraceInsightSets|null = null;
+  #parsedTrace: Trace.TraceModel.ParsedTrace|null = null;
   #eventToRelatedInsightsMap: TimelineComponents.RelatedInsightChips.EventToRelatedInsightsMap|null = null;
   #onTraceBoundsChangeBound = this.#onTraceBoundsChange.bind(this);
   #thirdPartyTree = new ThirdPartyTreeViewWidget();
@@ -270,9 +269,8 @@ export class TimelineDetailsPane extends
   }
 
   async setModel(data: {
-    parsedTrace: Trace.Handlers.Types.ParsedTrace|null,
+    parsedTrace: Trace.TraceModel.ParsedTrace|null,
     selectedEvents: Trace.Types.Events.Event[]|null,
-    traceInsightsSets: Trace.Insights.Types.TraceInsightSets|null,
     eventToRelatedInsightsMap: TimelineComponents.RelatedInsightChips.EventToRelatedInsightsMap|null,
     entityMapper: Utils.EntityMapper.EntityMapper|null,
   }): Promise<void> {
@@ -284,14 +282,12 @@ export class TimelineDetailsPane extends
       this.#parsedTrace = data.parsedTrace;
     }
     if (data.parsedTrace) {
-      this.#summaryContent.filmStrip = Trace.Extras.FilmStrip.fromParsedTrace(data.parsedTrace);
+      this.#summaryContent.filmStrip = Trace.Extras.FilmStrip.fromHandlerData(data.parsedTrace.data);
       this.#entityMapper = new Utils.EntityMapper.EntityMapper(data.parsedTrace);
     }
     this.#selectedEvents = data.selectedEvents;
-    this.#traceInsightsSets = data.traceInsightsSets;
     this.#eventToRelatedInsightsMap = data.eventToRelatedInsightsMap;
     this.#summaryContent.eventToRelatedInsightsMap = this.#eventToRelatedInsightsMap;
-    this.#summaryContent.traceInsightsSets = this.#traceInsightsSets;
     this.#summaryContent.parsedTrace = this.#parsedTrace;
     this.#summaryContent.entityMapper = this.#entityMapper;
     this.tabbedPane.closeTabs([Tab.PaintProfiler, Tab.LayerViewer], false);
@@ -600,8 +596,7 @@ interface SelectedRange {
 interface SummaryViewInput {
   selectedEvent: Trace.Types.Events.Event|null;
   eventToRelatedInsightsMap: TimelineComponents.RelatedInsightChips.EventToRelatedInsightsMap|null;
-  parsedTrace: Trace.Handlers.Types.ParsedTrace|null;
-  traceInsightsSets: Trace.Insights.Types.TraceInsightSets|null;
+  parsedTrace: Trace.TraceModel.ParsedTrace|null;
   entityMapper: Utils.EntityMapper.EntityMapper|null;
   target: SDK.Target.Target|null;
   linkifier: Components.Linkifier.Linkifier|null;
@@ -631,8 +626,7 @@ class SummaryView extends UI.Widget.Widget {
   #view: View;
   selectedEvent: Trace.Types.Events.Event|null = null;
   eventToRelatedInsightsMap: TimelineComponents.RelatedInsightChips.EventToRelatedInsightsMap|null = null;
-  parsedTrace: Trace.Handlers.Types.ParsedTrace|null = null;
-  traceInsightsSets: Trace.Insights.Types.TraceInsightSets|null = null;
+  parsedTrace: Trace.TraceModel.ParsedTrace|null = null;
   entityMapper: Utils.EntityMapper.EntityMapper|null = null;
   target: SDK.Target.Target|null = null;
   linkifier: Components.Linkifier.Linkifier|null = null;
@@ -650,7 +644,6 @@ class SummaryView extends UI.Widget.Widget {
           selectedEvent: this.selectedEvent,
           eventToRelatedInsightsMap: this.eventToRelatedInsightsMap,
           parsedTrace: this.parsedTrace,
-          traceInsightsSets: this.traceInsightsSets,
           entityMapper: this.entityMapper,
           target: this.target,
           linkifier: this.linkifier,
@@ -668,7 +661,7 @@ function generateRangeSummaryDetails(input: SummaryViewInput): LitTemplate {
     return nothing;
   }
 
-  const minBoundsMilli = Trace.Helpers.Timing.microToMilli(parsedTrace.Meta.traceBounds.min);
+  const minBoundsMilli = Trace.Helpers.Timing.microToMilli(parsedTrace.data.Meta.traceBounds.min);
   const {events, startTime, endTime, thirdPartyTree} = selectedRange;
   const aggregatedStats = TimelineUIUtils.statsForTimeRange(events, startTime, endTime);
   const startOffset = startTime - minBoundsMilli;
@@ -695,7 +688,6 @@ async function renderSelectedEventDetails(
       <devtools-widget data-layout-shift-details .widgetConfig=${
         UI.Widget.widgetConfig(TimelineComponents.LayoutShiftDetails.LayoutShiftDetails, {
           event: selectedEvent,
-          traceInsightsSets: input.traceInsightsSets,
           parsedTrace: input.parsedTrace,
           isFreshRecording: traceRecordingIsFresh,
         })}

package/front_end/panels/timeline/TimelineEventOverview.ts

@@ -81,8 +81,8 @@ export abstract class TimelineEventOverview extends PerfUI.TimelineOverviewPane.
 }
 
 export class TimelineEventOverviewNetwork extends TimelineEventOverview {
-  #parsedTrace: Trace.Handlers.Types.ParsedTrace;
-  constructor(parsedTrace: Trace.Handlers.Types.ParsedTrace) {
+  #parsedTrace: Trace.TraceModel.ParsedTrace;
+  constructor(parsedTrace: Trace.TraceModel.ParsedTrace) {
     super('network', i18nString(UIStrings.net));
     this.#parsedTrace = parsedTrace;
   }
@@ -105,7 +105,7 @@ export class TimelineEventOverviewNetwork extends TimelineEventOverview {
           max: end,
           range: end - start,
         } :
-        Trace.Helpers.Timing.traceWindowMilliSeconds(this.#parsedTrace.Meta.traceBounds);
+        Trace.Helpers.Timing.traceWindowMilliSeconds(this.#parsedTrace.data.Meta.traceBounds);
 
     // We draw two paths, so each can take up half the height
     const pathHeight = this.height() / 2;
@@ -119,7 +119,7 @@ export class TimelineEventOverviewNetwork extends TimelineEventOverview {
     const highPath = new Path2D();
     const lowPath = new Path2D();
 
-    for (const request of this.#parsedTrace.NetworkRequests.byTime) {
+    for (const request of this.#parsedTrace.data.NetworkRequests.byTime) {
       const path = Trace.Helpers.Network.isSyntheticNetworkRequestHighPriority(request) ? highPath : lowPath;
       const {startTime, endTime} = Trace.Helpers.Timing.eventTimingsMilliSeconds(request);
       const rectStart = Math.max(Math.floor((startTime - traceBoundsMilli.min) * scale), 0);
@@ -145,12 +145,12 @@ const categoryToIndex = new WeakMap<Utils.EntryStyles.TimelineCategory, number>(
 
 export class TimelineEventOverviewCPUActivity extends TimelineEventOverview {
   private backgroundCanvas: HTMLCanvasElement;
-  #parsedTrace: Trace.Handlers.Types.ParsedTrace;
+  #parsedTrace: Trace.TraceModel.ParsedTrace;
   #drawn = false;
   #start: Trace.Types.Timing.Milli;
   #end: Trace.Types.Timing.Milli;
 
-  constructor(parsedTrace: Trace.Handlers.Types.ParsedTrace) {
+  constructor(parsedTrace: Trace.TraceModel.ParsedTrace) {
     // During the sync tracks migration this component can use either legacy
     // Performance Model data or the new engine's data. Once the migration is
     // complete this will be updated to only use the new engine and mentions of
@@ -158,8 +158,8 @@ export class TimelineEventOverviewCPUActivity extends TimelineEventOverview {
     super('cpu-activity', i18nString(UIStrings.cpu));
     this.#parsedTrace = parsedTrace;
     this.backgroundCanvas = this.element.createChild('canvas', 'fill background');
-    this.#start = Trace.Helpers.Timing.traceWindowMilliSeconds(parsedTrace.Meta.traceBounds).min;
-    this.#end = Trace.Helpers.Timing.traceWindowMilliSeconds(parsedTrace.Meta.traceBounds).max;
+    this.#start = Trace.Helpers.Timing.traceWindowMilliSeconds(parsedTrace.data.Meta.traceBounds).min;
+    this.#end = Trace.Helpers.Timing.traceWindowMilliSeconds(parsedTrace.data.Meta.traceBounds).max;
   }
 
   #entryCategory(entry: Trace.Types.Events.Event): Utils.EntryStyles.EventCategory|undefined {
@@ -186,7 +186,7 @@ export class TimelineEventOverviewCPUActivity extends TimelineEventOverview {
     this.backgroundCanvas.height = this.element.clientHeight * window.devicePixelRatio;
   }
 
-  #draw(parsedTrace: Trace.Handlers.Types.ParsedTrace): void {
+  #draw(parsedTrace: Trace.TraceModel.ParsedTrace): void {
     const quantSizePx = 4 * window.devicePixelRatio;
     const width = this.width();
     const height = this.height();
@@ -281,7 +281,7 @@ export class TimelineEventOverviewCPUActivity extends TimelineEventOverview {
       throw new Error('Could not find 2d canvas');
     }
 
-    const threads = Trace.Handlers.Threads.threadsInTrace(parsedTrace);
+    const threads = Trace.Handlers.Threads.threadsInTrace(parsedTrace.data);
     const mainThreadContext = this.context();
     for (const thread of threads) {
       // We treat CPU_PROFILE as main thread because in a CPU Profile trace there is only ever one thread.
@@ -329,14 +329,14 @@ export class TimelineEventOverviewCPUActivity extends TimelineEventOverview {
 }
 
 export class TimelineEventOverviewResponsiveness extends TimelineEventOverview {
-  #parsedTrace: Trace.Handlers.Types.ParsedTrace;
-  constructor(parsedTrace: Trace.Handlers.Types.ParsedTrace) {
+  #parsedTrace: Trace.TraceModel.ParsedTrace;
+  constructor(parsedTrace: Trace.TraceModel.ParsedTrace) {
     super('responsiveness', null);
     this.#parsedTrace = parsedTrace;
   }
 
   #gatherEventsWithRelevantWarnings(): Set<Trace.Types.Events.Event> {
-    const {topLevelRendererIds} = this.#parsedTrace.Meta;
+    const {topLevelRendererIds} = this.#parsedTrace.data.Meta;
 
     // All the warnings that we care about regarding responsiveness and want to represent on the overview.
     const warningsForResponsiveness = new Set<Trace.Handlers.ModelHandlers.Warnings.Warning>([
@@ -347,7 +347,7 @@ export class TimelineEventOverviewResponsiveness extends TimelineEventOverview {
 
     const allWarningEvents = new Set<Trace.Types.Events.Event>();
     for (const warning of warningsForResponsiveness) {
-      const eventsForWarning = this.#parsedTrace.Warnings.perWarning.get(warning);
+      const eventsForWarning = this.#parsedTrace.data.Warnings.perWarning.get(warning);
       if (!eventsForWarning) {
         continue;
       }
@@ -368,7 +368,7 @@ export class TimelineEventOverviewResponsiveness extends TimelineEventOverview {
     this.resetCanvas();
 
     const height = this.height();
-    const visibleTimeWindow = !(start && end) ? this.#parsedTrace.Meta.traceBounds : {
+    const visibleTimeWindow = !(start && end) ? this.#parsedTrace.data.Meta.traceBounds : {
       min: Trace.Helpers.Timing.milliToMicro(start),
       max: Trace.Helpers.Timing.milliToMicro(end),
       range: Trace.Helpers.Timing.milliToMicro(Trace.Types.Timing.Milli(end - start)),
@@ -544,9 +544,9 @@ export class TimelineFilmStripOverview extends TimelineEventOverview {
 
 export class TimelineEventOverviewMemory extends TimelineEventOverview {
   private heapSizeLabel: HTMLElement;
-  #parsedTrace: Trace.Handlers.Types.ParsedTrace;
+  #parsedTrace: Trace.TraceModel.ParsedTrace;
 
-  constructor(parsedTrace: Trace.Handlers.Types.ParsedTrace) {
+  constructor(parsedTrace: Trace.TraceModel.ParsedTrace) {
     super('memory', i18nString(UIStrings.heap));
     this.heapSizeLabel = this.element.createChild('div', 'memory-graph-label');
     this.#parsedTrace = parsedTrace;
@@ -560,26 +560,27 @@ export class TimelineEventOverviewMemory extends TimelineEventOverview {
     this.resetCanvas();
     const ratio = window.devicePixelRatio;
 
-    if (this.#parsedTrace.Memory.updateCountersByProcess.size === 0) {
+    if (this.#parsedTrace.data.Memory.updateCountersByProcess.size === 0) {
       this.resetHeapSizeLabels();
       return;
     }
 
-    const mainRendererIds = Array.from(this.#parsedTrace.Meta.topLevelRendererIds);
+    const mainRendererIds = Array.from(this.#parsedTrace.data.Meta.topLevelRendererIds);
     const counterEventsPerTrack =
-        mainRendererIds.map(pid => this.#parsedTrace.Memory.updateCountersByProcess.get(pid) || [])
+        mainRendererIds.map(pid => this.#parsedTrace.data.Memory.updateCountersByProcess.get(pid) || [])
             .filter(eventsPerRenderer => eventsPerRenderer.length > 0);
 
     const lowerOffset = 3 * ratio;
     let maxUsedHeapSize = 0;
     let minUsedHeapSize = 100000000000;
 
-    const boundsMs = (start && end) ? {
-      min: start,
-      max: end,
-      range: end - start,
-    } :
-                                      Trace.Helpers.Timing.traceWindowMilliSeconds(this.#parsedTrace.Meta.traceBounds);
+    const boundsMs = (start && end) ?
+        {
+          min: start,
+          max: end,
+          range: end - start,
+        } :
+        Trace.Helpers.Timing.traceWindowMilliSeconds(this.#parsedTrace.data.Meta.traceBounds);
     const minTime = boundsMs.min;
     const maxTime = boundsMs.max;
 

package/front_end/panels/timeline/TimelineFilters.ts

@@ -26,21 +26,21 @@ export class Category extends Trace.Extras.TraceFilter.TraceFilter {
 }
 
 export class TimelineRegExp extends Trace.Extras.TraceFilter.TraceFilter {
-  private regExpInternal!: RegExp|null;
+  #regExp!: RegExp|null;
   constructor(regExp?: RegExp) {
     super();
     this.setRegExp(regExp || null);
   }
 
   setRegExp(regExp: RegExp|null): void {
-    this.regExpInternal = regExp;
+    this.#regExp = regExp;
   }
 
   regExp(): RegExp|null {
-    return this.regExpInternal;
+    return this.#regExp;
   }
 
-  accept(event: Trace.Types.Events.Event, parsedTrace?: Trace.Handlers.Types.ParsedTrace): boolean {
-    return !this.regExpInternal || TimelineUIUtils.testContentMatching(event, this.regExpInternal, parsedTrace);
+  accept(event: Trace.Types.Events.Event, handlerData?: Trace.Handlers.Types.HandlerData): boolean {
+    return !this.#regExp || TimelineUIUtils.testContentMatching(event, this.#regExp, handlerData);
   }
 }