[RPP] In trace_app, ignore frames not in the primary main frame

Sometimes, these irrelevant frames are listed first in the frame tree,
resulting in them being the primary frame (the first
`Target.attachedToTarget` event emitted by RehydratingConnection). That
broke source map resolution in the Performance panel.

Instead, ignore such frames in EnhancedTraceParser.

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

Author: Connor Clark

front_end/core/sdk/EnhancedTracesParser.test.ts

@@ -225,7 +225,7 @@ describe('EnhancedTracesParser', () => {
   };
 
   beforeEach(async function() {
-    const events = await TraceLoader.rawEvents(this, 'enhanced-traces.json.gz');
+    const events = await TraceLoader.rawEvents(this, 'enhanced-traces.json');
     enhancedTracesParser =
         new SDK.EnhancedTracesParser.EnhancedTracesParser({traceEvents: events as object[], metadata: {}});
   });

front_end/core/sdk/EnhancedTracesParser.ts

@@ -164,6 +164,10 @@ export class EnhancedTracesParser {
           if (frame.url === 'about:blank') {
             continue;
           }
+          if (!frame.isInPrimaryMainFrame) {
+            continue;
+          }
+
           const frameId = frame.frame as string as Protocol.Target.TargetID;
           if (!this.#targets.find(target => target.targetId === frameId)) {
             const frameType = frame.isOutermostMainFrame ? 'page' : 'iframe';

front_end/models/trace/handlers/ScriptsHandler.test.ts

@@ -11,7 +11,7 @@ describe('ScriptsHandler', () => {
     Trace.Handlers.ModelHandlers.Meta.reset();
     Trace.Handlers.ModelHandlers.NetworkRequests.reset();
     Trace.Handlers.ModelHandlers.Scripts.reset();
-    const events = await TraceLoader.rawEvents(this, 'enhanced-traces.json.gz');
+    const events = await TraceLoader.rawEvents(this, 'enhanced-traces.json');
     for (const event of events) {
       Trace.Handlers.ModelHandlers.Meta.handleEvent(event);
       Trace.Handlers.ModelHandlers.NetworkRequests.handleEvent(event);

front_end/panels/timeline/TimelinePanel.test.ts

@@ -360,7 +360,7 @@ describeWithEnvironment('TimelinePanel', function() {
       });
 
       it('saves an enhanced trace file without sourcemaps', async function() {
-        const {traceEvents, metadata} = await TraceLoader.traceFile(this, 'enhanced-traces.json.gz');
+        const {traceEvents, metadata} = await TraceLoader.traceFile(this, 'enhanced-traces.json');
         await timeline.innerSaveToFile(traceEvents, metadata, {
           includeScriptContent: true,
           includeSourceMaps: false,

front_end/panels/timeline/fixtures/traces/BUILD.gn

@@ -33,7 +33,7 @@ copy_to_gen("traces") {
     "dupe-js-inline-maps.json.gz",
     "dupe-js.json.gz",
     "enhanced-paul.json.gz",
-    "enhanced-traces.json.gz",
+    "enhanced-traces.json",
     "example-dot-com.json.gz",
     "extension-tracks-and-marks.json.gz",
     "fenced-frame-fledge.json.gz",

front_end/panels/timeline/fixtures/traces/README.md

@@ -91,11 +91,13 @@ A bunch of bundles with the exact same content: https://dupe-modules-lh-2.surge.
 
 Like above, but the source maps are inline data urls. https://dupe-modules-lh-inline-data.surge.sh/smaller.html
 
-### enhanced-traces.json.gz
+### enhanced-traces.json
 
 a) Contains traces with metadata needed to power a rehydrated session for enhanced tracing.
 b) (faked) script contents and source map urls, from the new "enhanced traces" feature. See http://crbug.com/337909145
 
+Not compressed because this is small and often modified.
+
 ### forced-layouts-and-no-gpu.json.gz
 
 A trace that contains a button that, when clicked, will iterate over 30 paragraphs and increment their width to the width of a div. This causes a forced layout event for each one. Additionally this trace contains no GPU thread.