[sdk] Pass PageResourceLoader to the source map loading helpers

In follow-up CLs we'll pass the PageResourceLoader to the
SourceMapManager and the TimelinePanel respectively.

[email protected]

Bug: 458180550
Change-Id: I41be693bc171a6d5d31134cf7b76b6d0dc5700a1
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7204004
Commit-Queue: Simon Zünd <[email protected]>
Reviewed-by: Nikolay Vitkov <[email protected]>
Auto-Submit: Simon Zünd <[email protected]>
Commit-Queue: Nikolay Vitkov <[email protected]>

Author: szuend

front_end/core/sdk/SourceMapManager.ts

@@ -113,7 +113,7 @@ export class SourceMapManager<T extends FrameAssociated> extends Common.ObjectWr
           this.#attachingClient = null;
           const initiator = client.createPageResourceLoadInitiator();
           clientData.sourceMapPromise =
-              loadSourceMap(sourceMapURL, client.debugId(), initiator)
+              loadSourceMap(PageResourceLoader.instance(), sourceMapURL, client.debugId(), initiator)
                   .then(
                       payload => {
                         const sourceMap = this.#factory(sourceURL, sourceMapURL, payload, client);
@@ -180,8 +180,8 @@ export class SourceMapManager<T extends FrameAssociated> extends Common.ObjectWr
   }
 }
 
-export async function loadSourceMap(
-    url: Platform.DevToolsPath.UrlString, debugId: DebugId|null,
+async function loadSourceMap(
+    pageResourceLoader: PageResourceLoader, url: Platform.DevToolsPath.UrlString, debugId: DebugId|null,
     initiator: PageResourceLoadInitiator): Promise<SourceMapV3> {
   try {
     if (debugId) {
@@ -191,7 +191,7 @@ export async function loadSourceMap(
       }
     }
 
-    const {content} = await PageResourceLoader.instance().loadResource(url, initiator);
+    const {content} = await pageResourceLoader.loadResource(url, initiator);
     const sourceMap = parseSourceMap(content);
     if ('debugId' in sourceMap && sourceMap.debugId) {
       // In case something goes wrong with updating the cache, we still want to use the source map.
@@ -204,9 +204,10 @@ export async function loadSourceMap(
 }
 
 export async function tryLoadSourceMap(
-    url: Platform.DevToolsPath.UrlString, initiator: PageResourceLoadInitiator): Promise<SourceMapV3|null> {
+    pageResourceLoader: PageResourceLoader, url: Platform.DevToolsPath.UrlString,
+    initiator: PageResourceLoadInitiator): Promise<SourceMapV3|null> {
   try {
-    return await loadSourceMap(url, null, initiator);
+    return await loadSourceMap(pageResourceLoader, url, null, initiator);
   } catch (cause) {
     console.error(cause);
     return null;

front_end/panels/timeline/TimelinePanel.ts

@@ -2643,6 +2643,7 @@ export class TimelinePanel extends Common.ObjectWrapper.eventMixin<EventTypes, t
           initiatorUrl: script.url as Platform.DevToolsPath.UrlString
         };
         rawSourceMap = await SDK.SourceMapManager.tryLoadSourceMap(
+            SDK.PageResourceLoader.PageResourceLoader.instance(),
             script.sourceMapUrl as Platform.DevToolsPath.UrlString, initiator);
       }
 
@@ -2745,7 +2746,8 @@ export class TimelinePanel extends Common.ObjectWrapper.eventMixin<EventTypes, t
         frameId: frame,
         initiatorUrl: sourceUrl
       };
-      const payload = await SDK.SourceMapManager.tryLoadSourceMap(sourceMapUrl, initiator);
+      const payload = await SDK.SourceMapManager.tryLoadSourceMap(
+          SDK.PageResourceLoader.PageResourceLoader.instance(), sourceMapUrl, initiator);
       return payload ? new SDK.SourceMap.SourceMap(sourceUrl, sourceMapUrl, payload) : null;
     };
   }