[RPP] Simplify source map resolver cache

We don't need to cache by process and thread id since the key created
based on a call frame contains the data to identify a code location
(URL, line, column, etc.)

Bug: none
Change-Id: Ia11bca73ce510b9bd48ef1a22985ee4793ddb08d
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6080383
Commit-Queue: Andres Olivares <[email protected]>
Reviewed-by: Jack Franklin <[email protected]>
Commit-Queue: Jack Franklin <[email protected]>
Auto-Submit: Andres Olivares <[email protected]>

Author: and-oli

front_end/panels/timeline/TimelineUIUtils.test.ts

@@ -1225,9 +1225,8 @@ describeWithMockConnection('TimelineUIUtils', function() {
       }
 
       // Fake that we resolved the entry's name from a sourcemap.
-      Timeline.Utils.SourceMapsResolver.SourceMapsResolver.storeResolvedNodeDataForEntry(
-          profileEntry.pid, profileEntry.tid, profileEntry.callFrame,
-          {name: 'resolved-function-test', devtoolsLocation: null, script: null});
+      Timeline.Utils.SourceMapsResolver.SourceMapsResolver.storeResolvedCodeDataForCallFrame(
+          profileEntry.callFrame, {name: 'resolved-function-test', devtoolsLocation: null, script: null});
 
       const title = Timeline.TimelineUIUtils.TimelineUIUtils.eventTitle(profileEntry);
       assert.strictEqual(title, 'resolved-function-test');

front_end/panels/timeline/utils/SourceMapsResolver.ts

@@ -26,12 +26,8 @@ export class SourceMappingsUpdated extends Event {
   }
 }
 
-// Resolved code location data is keyed based on
-// ProcessID=>ThreadID=> Call frame key.
 // The code location key is created as a concatenation of its fields.
-export const resolvedCodeLocationDataNames:
-    Map<Trace.Types.Events.ProcessID, Map<Trace.Types.Events.ThreadID, Map<string, ResolvedCodeLocationData|null>>> =
-        new Map();
+export const resolvedCodeLocationDataNames: Map<string, ResolvedCodeLocationData|null> = new Map();
 
 export class SourceMapsResolver extends EventTarget {
   #parsedTrace: Trace.Handlers.Types.ParsedTrace;
@@ -71,6 +67,11 @@ export class SourceMapsResolver extends EventTarget {
    *
    * TODO(andoli): This can return incorrect scripts if the target page has been reloaded since the trace.
    */
+  static resolvedCodeLocationForCallFrame(callFrame: Protocol.Runtime.CallFrame): ResolvedCodeLocationData|null {
+    const codeLocationKey = this.keyForCodeLocation(callFrame as Protocol.Runtime.CallFrame);
+    return resolvedCodeLocationDataNames.get(codeLocationKey) ?? null;
+  }
+
   static resolvedCodeLocationForEntry(entry: Trace.Types.Events.Event): ResolvedCodeLocationData|null {
     let callFrame = null;
     if (Trace.Types.Events.isProfileCall(entry)) {
@@ -82,8 +83,7 @@ export class SourceMapsResolver extends EventTarget {
       }
       callFrame = stackTrace[0];
     }
-    const codeLocationKey = this.keyForCodeLocation(callFrame as Protocol.Runtime.CallFrame);
-    return resolvedCodeLocationDataNames.get(entry.pid)?.get(entry.tid)?.get(codeLocationKey) ?? null;
+    return SourceMapsResolver.resolvedCodeLocationForCallFrame(callFrame as Protocol.Runtime.CallFrame);
   }
 
   static resolvedURLForEntry(parsedTrace: Trace.Handlers.Types.ParsedTrace, entry: Trace.Types.Events.Event):
@@ -102,16 +102,10 @@ export class SourceMapsResolver extends EventTarget {
     return null;
   }
 
-  static storeResolvedNodeDataForEntry(
-      pid: Trace.Types.Events.ProcessID, tid: Trace.Types.Events.ThreadID, callFrame: Protocol.Runtime.CallFrame,
-      resolvedCodeLocationData: ResolvedCodeLocationData): void {
-    const resolvedForPid = resolvedCodeLocationDataNames.get(pid) ||
-        new Map<Trace.Types.Events.ThreadID, Map<string, ResolvedCodeLocationData|null>>();
-    const resolvedForTid = resolvedForPid.get(tid) || new Map<string, ResolvedCodeLocationData|null>();
+  static storeResolvedCodeDataForCallFrame(
+      callFrame: Protocol.Runtime.CallFrame, resolvedCodeLocationData: ResolvedCodeLocationData): void {
     const keyForCallFrame = this.keyForCodeLocation(callFrame);
-    resolvedForTid.set(keyForCallFrame, resolvedCodeLocationData);
-    resolvedForPid.set(tid, resolvedForTid);
-    resolvedCodeLocationDataNames.set(pid, resolvedForPid);
+    resolvedCodeLocationDataNames.set(keyForCallFrame, resolvedCodeLocationData);
   }
 
   async install(): Promise<void> {
@@ -167,7 +161,7 @@ export class SourceMapsResolver extends EventTarget {
     // is attach. If not, we do not notify the flamechart that mappings
     // were updated, since that would trigger a rerender.
     let updatedMappings = false;
-    for (const [pid, threadsInProcess] of this.#parsedTrace.Samples.profilesInProcess) {
+    for (const [, threadsInProcess] of this.#parsedTrace.Samples.profilesInProcess) {
       for (const [tid, threadProfile] of threadsInProcess) {
         const nodes = threadProfile.parsedProfile.nodes() ?? [];
         const target = this.#targetForThread(tid);
@@ -190,8 +184,8 @@ export class SourceMapsResolver extends EventTarget {
                   location);
           updatedMappings ||= Boolean(uiLocation);
 
-          SourceMapsResolver.storeResolvedNodeDataForEntry(
-              pid, tid, node.callFrame, {name: resolvedFunctionName, devtoolsLocation: uiLocation, script});
+          SourceMapsResolver.storeResolvedCodeDataForCallFrame(
+              node.callFrame, {name: resolvedFunctionName, devtoolsLocation: uiLocation, script});
         }
       }
     }