[RPP] Move EventsSerializer to timeline/utils

Likely will need to use this from AICallTree which requires this move.
But even ignoring that, utils is the proper place for this.

Bug: 425270067
Change-Id: If1bbcfa6afa8f7a535ed17c404413ee5d0a1a532
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6799842
Reviewed-by: Paul Irish <[email protected]>
Commit-Queue: Connor Clark <[email protected]>
Auto-Submit: Connor Clark <[email protected]>
Commit-Queue: Paul Irish <[email protected]>

Author: Connor Clark

config/gni/devtools_grd_files.gni

@@ -1876,7 +1876,6 @@ grd_files_unbundled_sources = [
   "front_end/panels/timeline/CountersGraph.js",
   "front_end/panels/timeline/EasterEgg.js",
   "front_end/panels/timeline/EntriesFilter.js",
-  "front_end/panels/timeline/EventsSerializer.js",
   "front_end/panels/timeline/EventsTimelineTreeView.js",
   "front_end/panels/timeline/ExtensionTrackAppender.js",
   "front_end/panels/timeline/ExternalRequests.js",
@@ -2014,6 +2013,7 @@ grd_files_unbundled_sources = [
   "front_end/panels/timeline/utils/EntryName.js",
   "front_end/panels/timeline/utils/EntryNodes.js",
   "front_end/panels/timeline/utils/EntryStyles.js",
+  "front_end/panels/timeline/utils/EventsSerializer.js",
   "front_end/panels/timeline/utils/Helpers.js",
   "front_end/panels/timeline/utils/IgnoreList.js",
   "front_end/panels/timeline/utils/ImageCache.js",

front_end/panels/timeline/BUILD.gn

@@ -65,7 +65,6 @@ devtools_module("timeline") {
     "CompatibilityTracksAppender.ts",
     "CountersGraph.ts",
     "EntriesFilter.ts",
-    "EventsSerializer.ts",
     "EventsTimelineTreeView.ts",
     "ExtensionTrackAppender.ts",
     "ExternalRequests.ts",
@@ -198,7 +197,6 @@ ts_library("unittests") {
     "Breadcrumbs.test.ts",
     "CountersGraph.test.ts",
     "EntriesFilter.test.ts",
-    "EventsSerializer.test.ts",
     "ExternalRequests.test.ts",
     "FreshRecording.test.ts",
     "Initiators.test.ts",

front_end/panels/timeline/ModificationsManager.ts

@@ -9,7 +9,7 @@ import * as TimelineComponents from '../../panels/timeline/components/components
 
 import * as AnnotationHelpers from './AnnotationHelpers.js';
 import {EntriesFilter} from './EntriesFilter.js';
-import {EventsSerializer} from './EventsSerializer.js';
+import * as Utils from './utils/utils.js';
 
 const modificationsManagerByTraceIndex: ModificationsManager[] = [];
 let activeManager: ModificationsManager|null;
@@ -41,7 +41,7 @@ export class ModificationsManager extends EventTarget {
   #timelineBreadcrumbs: TimelineComponents.Breadcrumbs.Breadcrumbs;
   #modifications: Trace.Types.File.Modifications|null = null;
   #parsedTrace: Trace.Handlers.Types.ParsedTrace;
-  #eventsSerializer: EventsSerializer;
+  #eventsSerializer: Utils.EventsSerializer.EventsSerializer;
   #overlayForAnnotation: Map<Trace.Types.File.Annotation, Trace.Types.Overlays.Overlay>;
   readonly #annotationsHiddenSetting: Common.Settings.Setting<boolean>;
 
@@ -109,7 +109,7 @@ export class ModificationsManager extends EventTarget {
     this.#timelineBreadcrumbs = new TimelineComponents.Breadcrumbs.Breadcrumbs(traceBounds);
     this.#modifications = modifications || null;
     this.#parsedTrace = parsedTrace;
-    this.#eventsSerializer = new EventsSerializer();
+    this.#eventsSerializer = new Utils.EventsSerializer.EventsSerializer();
     // This method is also called in SidebarAnnotationsTab, but calling this multiple times doesn't recreate the setting.
     // Instead, after the second call, the cached setting is returned.
     this.#annotationsHiddenSetting = Common.Settings.Settings.instance().moduleSetting('annotations-hidden');

front_end/panels/timeline/timeline.ts

@@ -10,7 +10,6 @@ import * as CLSLinkifier from './CLSLinkifier.js';
 import * as CompatibilityTracksAppender from './CompatibilityTracksAppender.js';
 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 ExtensionTrackAppender from './ExtensionTrackAppender.js';
 import * as ExternalRequests from './ExternalRequests.js';
@@ -57,7 +56,6 @@ export {
   CompatibilityTracksAppender,
   CountersGraph,
   EntriesFilter,
-  EventsSerializer,
   EventsTimelineTreeView,
   ExtensionTrackAppender,
   ExternalRequests,

front_end/panels/timeline/utils/BUILD.gn

@@ -13,6 +13,7 @@ devtools_module("utils") {
     "EntryName.ts",
     "EntryNodes.ts",
     "EntryStyles.ts",
+    "EventsSerializer.ts",
     "Helpers.ts",
     "IgnoreList.ts",
     "ImageCache.ts",
@@ -66,6 +67,7 @@ ts_library("unittests") {
     "EntityMapper.test.ts",
     "EntryName.test.ts",
     "EntryNodes.test.ts",
+    "EventsSerializer.test.ts",
     "Helpers.test.ts",
     "IgnoreList.test.ts",
     "ImageCache.test.ts",

front_end/panels/timeline/EventsSerializer.test.ts renamed to front_end/panels/timeline/utils/EventsSerializer.test.ts

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import * as Trace from '../../models/trace/trace.js';
-import {describeWithEnvironment} from '../../testing/EnvironmentHelpers.js';
-import {getMainThread} from '../../testing/TraceHelpers.js';
-import {TraceLoader} from '../../testing/TraceLoader.js';
+import * as Trace from '../../../models/trace/trace.js';
+import {describeWithEnvironment} from '../../../testing/EnvironmentHelpers.js';
+import {getMainThread} from '../../../testing/TraceHelpers.js';
+import {TraceLoader} from '../../../testing/TraceLoader.js';
 
-import * as Timeline from './timeline.js';
+import * as Utils from './utils.js';
 
 function findFirstEntry(
     allEntries: readonly Trace.Types.Events.Event[],
@@ -22,7 +22,7 @@ function findFirstEntry(
 describeWithEnvironment('EventsSerializer', () => {
   it('correctly implements a bidirectional key <-> event mapping', async function() {
     const {parsedTrace} = await TraceLoader.traceEngine(this, 'basic-stack.json.gz');
-    const eventsSerializer = new Timeline.EventsSerializer.EventsSerializer();
+    const eventsSerializer = new Utils.EventsSerializer.EventsSerializer();
     const mainThread = getMainThread(parsedTrace.Renderer);
     // Find first 'Timer Fired' entry in the trace
     const rawEntry = findFirstEntry(mainThread.entries, entry => {
@@ -56,7 +56,7 @@ describeWithEnvironment('EventsSerializer', () => {
 
   it('correctly maps to and from legacy timeline frames', async function() {
     const {parsedTrace} = await TraceLoader.traceEngine(this, 'web-dev-with-commit.json.gz');
-    const eventsSerializer = new Timeline.EventsSerializer.EventsSerializer();
+    const eventsSerializer = new Utils.EventsSerializer.EventsSerializer();
 
     const frame = parsedTrace.Frames.frames.at(0);
     assert.isOk(frame);

front_end/panels/timeline/EventsSerializer.ts renamed to front_end/panels/timeline/utils/EventsSerializer.ts

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import * as Trace from '../../models/trace/trace.js';
+import * as Trace from '../../../models/trace/trace.js';
 
 export class EventsSerializer {
   #modifiedProfileCallByKey = new Map<Trace.Types.File.ProfileCallKeyValues, Trace.Types.Events.SyntheticProfileCall>();

front_end/panels/timeline/utils/utils.ts

@@ -8,6 +8,7 @@ import * as EntityMapper from './EntityMapper.js';
 import * as EntryName from './EntryName.js';
 import * as EntryNodes from './EntryNodes.js';
 import * as EntryStyles from './EntryStyles.js';
+import * as EventsSerializer from './EventsSerializer.js';
 import * as Helpers from './Helpers.js';
 import * as IgnoreList from './IgnoreList.js';
 import * as ImageCache from './ImageCache.js';
@@ -22,6 +23,7 @@ export {
   EntryName,
   EntryNodes,
   EntryStyles,
+  EventsSerializer,
   Helpers,
   IgnoreList,
   ImageCache,