[RPP] Fix some issues in ScriptsHandlers wrt enhanced traces

1. Remove the check for old/broken enhanced traces not having valid
   source map urls. Just allow the source map resolver to error. We
   expect few if any of these traces exist.
2. Fix some wrong types related to enhanced trace events, which resulted
   in errors.

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

Author: Connor Clark

front_end/models/trace/handlers/ScriptsHandler.ts

@@ -33,7 +33,7 @@ export function handleEvent(event: Types.Events.Event): void {
   const getOrMakeScript = (scriptId: Protocol.Runtime.ScriptId): Script =>
       Platform.MapUtilities.getWithDefault(scriptById, scriptId, () => ({scriptId, frame: '', ts: 0} as Script));
 
-  if (Types.Events.isTargetRundownEvent(event)) {
+  if (Types.Events.isTargetRundownEvent(event) && event.args.data) {
     const {scriptId, frame} = event.args.data;
     const script = getOrMakeScript(scriptId);
     script.frame = frame;
@@ -46,14 +46,13 @@ export function handleEvent(event: Types.Events.Event): void {
     const {scriptId, url, sourceMapUrl} = event.args.data;
     const script = getOrMakeScript(scriptId);
     script.url = url;
-    // Ignore nonsense values, which is what this was when initially implemented.
-    // TODO(cjamcl): https://g-issues.chromium.org/issues/337909145#comment15
-    if (sourceMapUrl && sourceMapUrl !== url && sourceMapUrl.endsWith('.json')) {
+    if (sourceMapUrl) {
       script.sourceMapUrl = sourceMapUrl;
     }
     return;
   }
 
+  // TODO(cjamcl): handle `LargeScriptCatchup` variant.
   if (Types.Events.isScriptSourceRundownEvent(event)) {
     const {scriptId, sourceText} = event.args.data;
     const script = getOrMakeScript(scriptId);

front_end/models/trace/types/TraceEvents.ts

@@ -3073,9 +3073,10 @@ export interface LegacyLayerPaintEventPicture {
 }
 
 export interface TargetRundownEvent extends Event {
-  cat: 'disabled-by-default-devtools.v8-source-rundown';
+  cat: 'disabled-by-default-devtools.target-rundown';
+  name: 'ScriptCompiled';
   args: Args&{
-    data: {
+    data?: {
       frame: Protocol.Page.FrameId,
       frameType: string,
       url: string,
@@ -3090,11 +3091,12 @@ export interface TargetRundownEvent extends Event {
 }
 
 export function isTargetRundownEvent(event: Event): event is TargetRundownEvent {
-  return event.cat === 'disabled-by-default-devtools.target-rundown';
+  return event.cat === 'disabled-by-default-devtools.target-rundown' && event.name === 'ScriptCompiled';
 }
 
 export interface ScriptRundownEvent extends Event {
   cat: 'disabled-by-default-devtools.v8-source-rundown';
+  name: 'ScriptCatchup';
   args: Args&{
     data: {
       isolate: string,
@@ -3104,21 +3106,23 @@ export interface ScriptRundownEvent extends Event {
       startColumn: number,
       endLine: number,
       endColumn: number,
-      url: string,
       hash: string,
       isModule: boolean,
       hasSourceUrl: boolean,
+      url?: string,
+      sourceUrl?: string,
       sourceMapUrl?: string,
     },
   };
 }
 
 export function isScriptRundownEvent(event: Event): event is ScriptRundownEvent {
-  return event.cat === 'disabled-by-default-devtools.v8-source-rundown';
+  return event.cat === 'disabled-by-default-devtools.v8-source-rundown' && event.name === 'ScriptCatchup';
 }
 
 export interface ScriptSourceRundownEvent extends Event {
   cat: 'disabled-by-default-devtools.v8-source-rundown-sources';
+  name: 'ScriptCatchup';
   args: Args&{
     data: {
       isolate: string,
@@ -3130,5 +3134,5 @@ export interface ScriptSourceRundownEvent extends Event {
 }
 
 export function isScriptSourceRundownEvent(event: Event): event is ScriptSourceRundownEvent {
-  return event.cat === 'disabled-by-default-devtools.v8-source-rundown-sources';
+  return event.cat === 'disabled-by-default-devtools.v8-source-rundown-sources' && event.name === 'ScriptCatchup';
 }