[tracing] Prepare Devtools for moving ChromeFrameReporter definition

Chrome Devtools are preventing https://crrev.com/c/6243825 from being
submitted because they have a dependency on
ChromeTrackEvent.chrome_frame_reporter, which is being replaced with
ChromeTrackEvent.frame_reporter. This CL modifies Devtools to support
both fields.

Bug: 409484302
Change-Id: Ibe0fe799e45af57002b2f2e12377be543bc26205
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6441450
Commit-Queue: Nikolay Vitkov <[email protected]>
Commit-Queue: Paul Irish <[email protected]>
Commit-Queue: Petr Cermak <[email protected]>
Reviewed-by: Jack Franklin <[email protected]>
Reviewed-by: Nikolay Vitkov <[email protected]>
Auto-Submit: Petr Cermak <[email protected]>
Reviewed-by: Paul Irish <[email protected]>

Author: petrcermak

front_end/models/trace/handlers/ScreenshotsHandler.ts

@@ -38,7 +38,9 @@ export async function finalize(): Promise<void> {
   const pipelineReporterEvents = Helpers.Trace.createMatchedSortedSyntheticEvents(unpairedAsyncEvents);
 
   frameSequenceToTs = Object.fromEntries(pipelineReporterEvents.map(evt => {
-    const frameSequenceId = evt.args.data.beginEvent.args.chrome_frame_reporter.frame_sequence;
+    const args = evt.args.data.beginEvent.args;
+    const frameReporter = 'frame_reporter' in args ? args.frame_reporter : args.chrome_frame_reporter;
+    const frameSequenceId = frameReporter.frame_sequence;
     const presentationTs = Types.Timing.Micro(evt.ts + evt.dur);
     return [frameSequenceId, presentationTs];
   }));

front_end/models/trace/types/TraceEvents.ts

@@ -1540,14 +1540,22 @@ const enum FrameType {
   BACKFILL = 'BACKFILL',
 }
 
+// TODO(crbug.com/409484302): Remove once Chrome migrates from
+// ChromeTrackEvent.chrome_frame_reporter to ChromeTrackEvent.frame_reporter.
+export interface OldChromeFrameReporterArgs {
+  chrome_frame_reporter: ChromeFrameReporter;
+}
+
+export interface NewChromeFrameReporterArgs {
+  frame_reporter: ChromeFrameReporter;
+}
+
 export interface PipelineReporter extends Event {
   id2?: {
     local?: string,
   };
   ph: Phase.ASYNC_NESTABLE_START|Phase.ASYNC_NESTABLE_END;
-  args: Args&{
-    chrome_frame_reporter: ChromeFrameReporter,
-  };
+  args: Args&(OldChromeFrameReporterArgs|NewChromeFrameReporterArgs);
 }
 
 export function isPipelineReporter(event: Event): event is PipelineReporter {