[RPP] Remove ExtensionDataGatherer

It serves as an intermediary layer between the parsedTrace data and the
UI, and it adds some overhead to be properly managed because of our lack
of proper support for this type of utils in the RPP architecture.

The reason it exists at all is in preparation to support extending the
RPP with Chrome extensions, as that was the inital plan. But at the
moment, we are focusing on extending the panel with web APIs
(performance.measure, console.timeStamp, etc.), which makes the data available via trace events, so right now and for the foreseable future, this extra layer doesn't bring any value to outweight its maintenance cost. Thus this CL.

Bug: 381861194
Change-Id: I24a1bc3f7405dc5c8155e7f554007fa48c33583c
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6088062
Reviewed-by: Alina Varkki <[email protected]>
Commit-Queue: Andres Olivares <[email protected]>

Author: and-oli

config/gni/devtools_grd_files.gni

@@ -1784,7 +1784,6 @@ grd_files_debug_sources = [
   "front_end/panels/timeline/EntriesFilter.js",
   "front_end/panels/timeline/EventsSerializer.js",
   "front_end/panels/timeline/EventsTimelineTreeView.js",
-  "front_end/panels/timeline/ExtensionDataGatherer.js",
   "front_end/panels/timeline/ExtensionTrackAppender.js",
   "front_end/panels/timeline/FreshRecording.js",
   "front_end/panels/timeline/GPUTrackAppender.js",

front_end/panels/timeline/BUILD.gn

@@ -63,7 +63,6 @@ devtools_module("timeline") {
     "EntriesFilter.ts",
     "EventsSerializer.ts",
     "EventsTimelineTreeView.ts",
-    "ExtensionDataGatherer.ts",
     "ExtensionTrackAppender.ts",
     "FreshRecording.ts",
     "GPUTrackAppender.ts",

front_end/panels/timeline/CompatibilityTracksAppender.ts

@@ -12,7 +12,6 @@ import * as ThemeSupport from '../../ui/legacy/theme_support/theme_support.js';
 import {AnimationsTrackAppender} from './AnimationsTrackAppender.js';
 import {getEventLevel, getFormattedTime, type LastTimestampByLevel} from './AppenderUtils.js';
 import * as TimelineComponents from './components/components.js';
-import {ExtensionDataGatherer} from './ExtensionDataGatherer.js';
 import {ExtensionTrackAppender} from './ExtensionTrackAppender.js';
 import {GPUTrackAppender} from './GPUTrackAppender.js';
 import {InteractionsTrackAppender} from './InteractionsTrackAppender.js';
@@ -23,6 +22,7 @@ import {
   EntryType,
   InstantEventVisibleDurationMs,
 } from './TimelineFlameChartDataProvider.js';
+import {TimelinePanel} from './TimelinePanel.js';
 import {TimingsTrackAppender} from './TimingsTrackAppender.js';
 import * as TimelineUtils from './utils/utils.js';
 
@@ -280,7 +280,10 @@ export class CompatibilityTracksAppender {
   }
 
   #addExtensionAppenders(): void {
-    const tracks = ExtensionDataGatherer.instance().getExtensionData().extensionTrackData;
+    if (!TimelinePanel.extensionDataVisibilitySetting().get()) {
+      return;
+    }
+    const tracks = this.#parsedTrace.ExtensionTraceData.extensionTrackData;
     for (const trackData of tracks) {
       this.#allTrackAppenders.push(new ExtensionTrackAppender(this, trackData));
     }

front_end/panels/timeline/ExtensionDataGatherer.ts

@@ -38,7 +38,6 @@ import * as UI from '../../ui/legacy/legacy.js';
 import * as ThemeSupport from '../../ui/legacy/theme_support/theme_support.js';
 
 import {CompatibilityTracksAppender, type DrawOverride, type TrackAppenderName} from './CompatibilityTracksAppender.js';
-import {ExtensionDataGatherer} from './ExtensionDataGatherer.js';
 import {initiatorsDataToDraw} from './Initiators.js';
 import {ModificationsManager} from './ModificationsManager.js';
 import {ThreadAppender} from './ThreadAppender.js';
@@ -404,8 +403,6 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
   setModel(parsedTrace: Trace.Handlers.Types.ParsedTrace|null, isCpuProfile = false): void {
     this.reset();
     this.parsedTrace = parsedTrace;
-    ExtensionDataGatherer.instance().modelChanged(parsedTrace);
-
     this.isCpuProfile = isCpuProfile;
     if (parsedTrace) {
       const {traceBounds} = parsedTrace.Meta;
@@ -524,8 +521,6 @@ export class TimelineFlameChartDataProvider extends Common.ObjectWrapper.ObjectW
       this.compatibilityTracksAppender?.threadAppenders().forEach(
           threadAppender => threadAppender.setHeaderAppended(false));
     }
-
-    ExtensionDataGatherer.removeInstance();
   }
 
   maxStackDepth(): number {

front_end/panels/timeline/TimelineFlameChartDataProvider.ts

@@ -13,9 +13,9 @@ import {
   type TrackAppenderName,
   VisualLoggingTrackName,
 } from './CompatibilityTracksAppender.js';
-import {ExtensionDataGatherer} from './ExtensionDataGatherer.js';
 import * as Extensions from './extensions/extensions.js';
 import {TimelineFlameChartMarker} from './TimelineFlameChartView.js';
+import {TimelinePanel} from './TimelinePanel.js';
 import type {TimelineMarkerStyle} from './TimelineUIUtils.js';
 
 const UIStrings = {
@@ -49,13 +49,15 @@ export class TimingsTrackAppender implements TrackAppender {
   #colorGenerator: Common.Color.Generator;
   #compatibilityBuilder: CompatibilityTracksAppender;
   #parsedTrace: Readonly<Trace.Handlers.Types.ParsedTrace>;
-
+  #extensionMarkers: readonly Trace.Types.Extensions.SyntheticExtensionMarker[];
   constructor(
       compatibilityBuilder: CompatibilityTracksAppender, parsedTrace: Trace.Handlers.Types.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 : [];
   }
 
   /**
@@ -68,8 +70,7 @@ export class TimingsTrackAppender implements TrackAppender {
    * appended the track's events.
    */
   appendTrackAtLevel(trackStartLevel: number, expanded?: boolean): number {
-    const extensionMarkers = ExtensionDataGatherer.instance().getExtensionData().extensionMarkers;
-    const extensionMarkersAreEmpty = extensionMarkers.length === 0;
+    const extensionMarkersAreEmpty = this.#extensionMarkers.length === 0;
     const performanceMarks = this.#parsedTrace.UserTimings.performanceMarks.filter(
         m => !Trace.Handlers.ModelHandlers.ExtensionTraceData.extensionDataInTiming(m));
     const performanceMeasures = this.#parsedTrace.UserTimings.performanceMeasures.filter(
@@ -115,8 +116,7 @@ export class TimingsTrackAppender implements TrackAppender {
    */
   #appendExtensionsAtLevel(currentLevel: number): number {
     let markers: Trace.Types.Extensions.SyntheticExtensionMarker[] = [];
-    markers = markers.concat(ExtensionDataGatherer.instance().getExtensionData().extensionMarkers)
-                  .sort((m1, m2) => m1.ts - m2.ts);
+    markers = markers.concat(this.#extensionMarkers).sort((m1, m2) => m1.ts - m2.ts);
     if (markers.length === 0) {
       return currentLevel;
     }

front_end/panels/timeline/TimingsTrackAppender.ts

@@ -12,7 +12,6 @@ import * as CountersGraph from './CountersGraph.js';
 import * as EntriesFilter from './EntriesFilter.js';
 import * as EventsSerializer from './EventsSerializer.js';
 import * as EventsTimelineTreeView from './EventsTimelineTreeView.js';
-import * as ExtensionDataGatherer from './ExtensionDataGatherer.js';
 import * as ExtensionTrackAppender from './ExtensionTrackAppender.js';
 import * as FreshRecording from './FreshRecording.js';
 import * as GPUTrackAppender from './GPUTrackAppender.js';
@@ -57,7 +56,6 @@ export {
   EntriesFilter,
   EventsSerializer,
   EventsTimelineTreeView,
-  ExtensionDataGatherer,
   ExtensionTrackAppender,
   FreshRecording,
   GPUTrackAppender,

front_end/panels/timeline/timeline.ts

@@ -18,7 +18,6 @@ function initTrackAppender(
     flameChartData: PerfUI.FlameChart.FlameChartTimelineData, parsedTrace: Trace.Handlers.Types.ParsedTrace,
     entryData: Trace.Types.Events.Event[], entryTypeByLevel: Timeline.TimelineFlameChartDataProvider.EntryType[]):
     Timeline.ExtensionTrackAppender.ExtensionTrackAppender[] {
-  Timeline.ExtensionDataGatherer.ExtensionDataGatherer.instance().modelChanged(parsedTrace);
   const compatibilityTracksAppender = new Timeline.CompatibilityTracksAppender.CompatibilityTracksAppender(
       flameChartData, parsedTrace, entryData, entryTypeByLevel);
 
@@ -34,7 +33,6 @@ describeWithEnvironment('ExtensionTrackAppender', function() {
   let entryTypeByLevel: Timeline.TimelineFlameChartDataProvider.EntryType[] = [];
 
   beforeEach(async function() {
-    Timeline.ExtensionDataGatherer.ExtensionDataGatherer.removeInstance();
     ({parsedTrace} = await TraceLoader.traceEngine(this, 'extension-tracks-and-marks.json.gz'));
     extensionTrackAppenders = initTrackAppender(flameChartData, parsedTrace, entryData, entryTypeByLevel);
     let level = 0;
@@ -117,7 +115,6 @@ describeWithEnvironment('ExtensionTrackAppender', function() {
          ] as ExtensionTestData[];
          const traceExtensionData = await createTraceExtensionDataFromTestInput(extensionData);
          const testParsedTrace = getBaseTraceParseModelData({ExtensionTraceData: traceExtensionData});
-         Timeline.ExtensionDataGatherer.ExtensionDataGatherer.removeInstance();
          entryData = [];
          flameChartData = PerfUI.FlameChart.FlameChartTimelineData.createEmpty();
          entryTypeByLevel = [];
@@ -205,7 +202,6 @@ describeWithEnvironment('ExtensionTrackAppender', function() {
 
   describe('toggling', function() {
     it('Does not append extension data when the configuration is set to disabled', async function() {
-      Timeline.ExtensionDataGatherer.ExtensionDataGatherer.removeInstance();
       entryData = [];
       flameChartData = PerfUI.FlameChart.FlameChartTimelineData.createEmpty();
       entryTypeByLevel = [];

front_end/panels/timeline/track_appenders/ExtensionTrackAppender.test.ts

@@ -464,7 +464,8 @@ describeWithEnvironment('ThreadAppender', function() {
         Meta: {
           traceIsGeneric: false,
         },
-      } as Trace.Handlers.Types.ParsedTrace;
+        ExtensionTraceData: {entryToNode: new Map(), extensionMarkers: [], extensionTrackData: []},
+      } as unknown as Trace.Handlers.Types.ParsedTrace;
 
       // Add the script to ignore list and then append the flamechart data
       ignoreListManager.ignoreListURL(SCRIPT_TO_IGNORE);

front_end/panels/timeline/track_appenders/ThreadAppender.test.ts

@@ -15,7 +15,6 @@ function initTrackAppender(
     entryData: Trace.Types.Events.Event[],
     entryTypeByLevel: Timeline.TimelineFlameChartDataProvider.EntryType[],
     ): Timeline.TimingsTrackAppender.TimingsTrackAppender {
-  Timeline.ExtensionDataGatherer.ExtensionDataGatherer.instance().modelChanged(parsedTrace);
   const compatibilityTracksAppender = new Timeline.CompatibilityTracksAppender.CompatibilityTracksAppender(
       flameChartData, parsedTrace, entryData, entryTypeByLevel);
   return compatibilityTracksAppender.timingsTrackAppender();
@@ -327,7 +326,6 @@ describeWithEnvironment('TimingTrackAppender', function() {
     });
     describe('toggling', function() {
       it('Does not append extension data when the configuration is set to disabled', async function() {
-        Timeline.ExtensionDataGatherer.ExtensionDataGatherer.removeInstance();
         entryData = [];
         flameChartData = PerfUI.FlameChart.FlameChartTimelineData.createEmpty();
         entryTypeByLevel = [];