chrome-devtools-frontend 1.0.1548870 → 1.0.1549484

package/front_end/core/sdk/CSSModel.ts

@@ -37,7 +37,7 @@ export interface LayoutProperties {
   isFlex: boolean;
   isGrid: boolean;
   isSubgrid: boolean;
-  isMasonry: boolean;
+  isGridLanes: boolean;
   isContainer: boolean;
   hasScroll: boolean;
 }
@@ -52,8 +52,8 @@ export class CSSModel extends SDKModel<EventTypes> {
   readonly #styleLoader: ComputedStyleLoader;
   readonly #stylePollingThrottler = new Common.Throttler.Throttler(StylePollingInterval);
   readonly #styleSheetIdsForURL =
-      new Map<Platform.DevToolsPath.UrlString, Map<string, Set<Protocol.CSS.StyleSheetId>>>();
-  readonly #styleSheetIdToHeader = new Map<Protocol.CSS.StyleSheetId, CSSStyleSheetHeader>();
+      new Map<Platform.DevToolsPath.UrlString, Map<string, Set<Protocol.DOM.StyleSheetId>>>();
+  readonly #styleSheetIdToHeader = new Map<Protocol.DOM.StyleSheetId, CSSStyleSheetHeader>();
   #cachedMatchedCascadeNode: DOMNode|null = null;
   #cachedMatchedCascadePromise: Promise<CSSMatchedStyles|null>|null = null;
   #cssPropertyTracker: CSSPropertyTracker|null = null;
@@ -183,7 +183,7 @@ export class CSSModel extends SDKModel<EventTypes> {
   }
 
   async setStyleText(
-      styleSheetId: Protocol.CSS.StyleSheetId, range: TextUtils.TextRange.TextRange, text: string,
+      styleSheetId: Protocol.DOM.StyleSheetId, range: TextUtils.TextRange.TextRange, text: string,
       majorChange: boolean): Promise<boolean> {
     try {
       await this.ensureOriginalStyleSheetText(styleSheetId);
@@ -204,7 +204,7 @@ export class CSSModel extends SDKModel<EventTypes> {
     }
   }
 
-  async setSelectorText(styleSheetId: Protocol.CSS.StyleSheetId, range: TextUtils.TextRange.TextRange, text: string):
+  async setSelectorText(styleSheetId: Protocol.DOM.StyleSheetId, range: TextUtils.TextRange.TextRange, text: string):
       Promise<boolean> {
     Host.userMetrics.actionTaken(Host.UserMetrics.Action.StyleRuleEdited);
 
@@ -226,7 +226,7 @@ export class CSSModel extends SDKModel<EventTypes> {
   }
 
   async setPropertyRulePropertyName(
-      styleSheetId: Protocol.CSS.StyleSheetId, range: TextUtils.TextRange.TextRange, text: string): Promise<boolean> {
+      styleSheetId: Protocol.DOM.StyleSheetId, range: TextUtils.TextRange.TextRange, text: string): Promise<boolean> {
     Host.userMetrics.actionTaken(Host.UserMetrics.Action.StyleRuleEdited);
 
     try {
@@ -247,7 +247,7 @@ export class CSSModel extends SDKModel<EventTypes> {
     }
   }
 
-  async setKeyframeKey(styleSheetId: Protocol.CSS.StyleSheetId, range: TextUtils.TextRange.TextRange, text: string):
+  async setKeyframeKey(styleSheetId: Protocol.DOM.StyleSheetId, range: TextUtils.TextRange.TextRange, text: string):
       Promise<boolean> {
     Host.userMetrics.actionTaken(Host.UserMetrics.Action.StyleRuleEdited);
 
@@ -367,7 +367,7 @@ export class CSSModel extends SDKModel<EventTypes> {
     return await CSSMatchedStyles.create(payload);
   }
 
-  async getClassNames(styleSheetId: Protocol.CSS.StyleSheetId): Promise<string[]> {
+  async getClassNames(styleSheetId: Protocol.DOM.StyleSheetId): Promise<string[]> {
     const {classNames} = await this.agent.invoke_collectClassNames({styleSheetId});
     return classNames || [];
   }
@@ -392,7 +392,7 @@ export class CSSModel extends SDKModel<EventTypes> {
                        (styles.get('grid-template-columns')?.startsWith('subgrid') ||
                         styles.get('grid-template-rows')?.startsWith('subgrid'))) ??
         false;
-    const isMasonry = display === 'masonry' || display === 'inline-masonry';
+    const isGridLanes = display === 'grid-lanes' || display === 'inline-grid-lanes';
     const containerType = styles.get('container-type');
     const isContainer = Boolean(containerType) && containerType !== '' && containerType !== 'normal';
     const hasScroll = Boolean(styles.get('scroll-snap-type')) && styles.get('scroll-snap-type') !== 'none';
@@ -401,7 +401,7 @@ export class CSSModel extends SDKModel<EventTypes> {
       isFlex,
       isGrid,
       isSubgrid,
-      isMasonry,
+      isGridLanes,
       isContainer,
       hasScroll,
     };
@@ -502,7 +502,7 @@ export class CSSModel extends SDKModel<EventTypes> {
   }
 
   async setMediaText(
-      styleSheetId: Protocol.CSS.StyleSheetId, range: TextUtils.TextRange.TextRange,
+      styleSheetId: Protocol.DOM.StyleSheetId, range: TextUtils.TextRange.TextRange,
       newMediaText: string): Promise<boolean> {
     Host.userMetrics.actionTaken(Host.UserMetrics.Action.StyleRuleEdited);
 
@@ -524,7 +524,7 @@ export class CSSModel extends SDKModel<EventTypes> {
   }
 
   async setContainerQueryText(
-      styleSheetId: Protocol.CSS.StyleSheetId, range: TextUtils.TextRange.TextRange,
+      styleSheetId: Protocol.DOM.StyleSheetId, range: TextUtils.TextRange.TextRange,
       newContainerQueryText: string): Promise<boolean> {
     Host.userMetrics.actionTaken(Host.UserMetrics.Action.StyleRuleEdited);
 
@@ -547,7 +547,7 @@ export class CSSModel extends SDKModel<EventTypes> {
   }
 
   async setSupportsText(
-      styleSheetId: Protocol.CSS.StyleSheetId, range: TextUtils.TextRange.TextRange,
+      styleSheetId: Protocol.DOM.StyleSheetId, range: TextUtils.TextRange.TextRange,
       newSupportsText: string): Promise<boolean> {
     Host.userMetrics.actionTaken(Host.UserMetrics.Action.StyleRuleEdited);
 
@@ -569,7 +569,7 @@ export class CSSModel extends SDKModel<EventTypes> {
   }
 
   async setScopeText(
-      styleSheetId: Protocol.CSS.StyleSheetId, range: TextUtils.TextRange.TextRange,
+      styleSheetId: Protocol.DOM.StyleSheetId, range: TextUtils.TextRange.TextRange,
       newScopeText: string): Promise<boolean> {
     Host.userMetrics.actionTaken(Host.UserMetrics.Action.StyleRuleEdited);
 
@@ -590,7 +590,7 @@ export class CSSModel extends SDKModel<EventTypes> {
     }
   }
 
-  async addRule(styleSheetId: Protocol.CSS.StyleSheetId, ruleText: string, ruleLocation: TextUtils.TextRange.TextRange):
+  async addRule(styleSheetId: Protocol.DOM.StyleSheetId, ruleText: string, ruleLocation: TextUtils.TextRange.TextRange):
       Promise<CSSStyleRule|null> {
     try {
       await this.ensureOriginalStyleSheetText(styleSheetId);
@@ -657,7 +657,7 @@ export class CSSModel extends SDKModel<EventTypes> {
     return this.#fontFaces.get(src);
   }
 
-  styleSheetHeaderForId(id: Protocol.CSS.StyleSheetId): CSSStyleSheetHeader|null {
+  styleSheetHeaderForId(id: Protocol.DOM.StyleSheetId): CSSStyleSheetHeader|null {
     return this.#styleSheetIdToHeader.get(id) || null;
   }
 
@@ -665,11 +665,11 @@ export class CSSModel extends SDKModel<EventTypes> {
     return [...this.#styleSheetIdToHeader.values()];
   }
 
-  fireStyleSheetChanged(styleSheetId: Protocol.CSS.StyleSheetId, edit?: Edit): void {
+  fireStyleSheetChanged(styleSheetId: Protocol.DOM.StyleSheetId, edit?: Edit): void {
     this.dispatchEventToListeners(Events.StyleSheetChanged, {styleSheetId, edit});
   }
 
-  private ensureOriginalStyleSheetText(styleSheetId: Protocol.CSS.StyleSheetId): Promise<string|null> {
+  private ensureOriginalStyleSheetText(styleSheetId: Protocol.DOM.StyleSheetId): Promise<string|null> {
     const header = this.styleSheetHeaderForId(styleSheetId);
     if (!header) {
       return Promise.resolve(null);
@@ -732,7 +732,7 @@ export class CSSModel extends SDKModel<EventTypes> {
     this.dispatchEventToListeners(Events.StyleSheetAdded, styleSheetHeader);
   }
 
-  styleSheetRemoved(id: Protocol.CSS.StyleSheetId): void {
+  styleSheetRemoved(id: Protocol.DOM.StyleSheetId): void {
     const header = this.#styleSheetIdToHeader.get(id);
     console.assert(Boolean(header));
     if (!header) {
@@ -760,7 +760,7 @@ export class CSSModel extends SDKModel<EventTypes> {
     this.dispatchEventToListeners(Events.StyleSheetRemoved, header);
   }
 
-  getStyleSheetIdsForURL(url: Platform.DevToolsPath.UrlString): Protocol.CSS.StyleSheetId[] {
+  getStyleSheetIdsForURL(url: Platform.DevToolsPath.UrlString): Protocol.DOM.StyleSheetId[] {
     const frameIdToStyleSheetIds = this.#styleSheetIdsForURL.get(url);
     if (!frameIdToStyleSheetIds) {
       return [];
@@ -773,7 +773,7 @@ export class CSSModel extends SDKModel<EventTypes> {
     return result;
   }
 
-  async setStyleSheetText(styleSheetId: Protocol.CSS.StyleSheetId, newText: string, majorChange: boolean):
+  async setStyleSheetText(styleSheetId: Protocol.DOM.StyleSheetId, newText: string, majorChange: boolean):
       Promise<string|null> {
     const header = this.#styleSheetIdToHeader.get(styleSheetId);
     if (!header) {
@@ -799,7 +799,7 @@ export class CSSModel extends SDKModel<EventTypes> {
     return null;
   }
 
-  async getStyleSheetText(styleSheetId: Protocol.CSS.StyleSheetId): Promise<string|null> {
+  async getStyleSheetText(styleSheetId: Protocol.DOM.StyleSheetId): Promise<string|null> {
     const response = await this.agent.invoke_getStyleSheetText({styleSheetId});
     if (response.getError()) {
       return null;
@@ -953,7 +953,7 @@ export enum Events {
 }
 
 export interface StyleSheetChangedEvent {
-  styleSheetId: Protocol.CSS.StyleSheetId;
+  styleSheetId: Protocol.DOM.StyleSheetId;
   edit?: Edit;
 }
 
@@ -999,7 +999,7 @@ export class Edit {
 
 export class CSSLocation {
   readonly #cssModel: CSSModel;
-  styleSheetId: Protocol.CSS.StyleSheetId;
+  styleSheetId: Protocol.DOM.StyleSheetId;
   url: Platform.DevToolsPath.UrlString;
   lineNumber: number;
   columnNumber: number;

package/front_end/core/sdk/CSSPropertyParserMatchers.ts

@@ -1075,25 +1075,25 @@ export class CustomFunctionMatcher extends matcherBase(CustomFunctionMatch) {
 export const enum LayoutType {
   FLEX = 'flex',
   GRID = 'grid',
-  MASONRY = 'masonry'
+  GRID_LANES = 'grid-lanes',
 }
 
-export class FlexGridMasonryMatch implements Match {
+export class FlexGridGridLanesMatch implements Match {
   constructor(readonly text: string, readonly node: CodeMirror.SyntaxNode, readonly layoutType: LayoutType) {
   }
 }
 
 // clang-format off
-export class FlexGridMasonryMatcher extends matcherBase(FlexGridMasonryMatch) {
+export class FlexGridGridLanesMatcher extends matcherBase(FlexGridGridLanesMatch) {
   // clang-format on
   static readonly FLEX = ['flex', 'inline-flex', 'block flex', 'inline flex'];
   static readonly GRID = ['grid', 'inline-grid', 'block grid', 'inline grid'];
-  static readonly MASONRY = ['masonry', 'inline-masonry', 'block masonry', 'inline masonry'];
+  static readonly GRID_LANES = ['grid-lanes', 'inline-grid-lanes', 'block grid-lanes', 'inline grid-lanes'];
   override accepts(propertyName: string): boolean {
     return propertyName === 'display';
   }
 
-  override matches(node: CodeMirror.SyntaxNode, matching: BottomUpTreeMatching): FlexGridMasonryMatch|null {
+  override matches(node: CodeMirror.SyntaxNode, matching: BottomUpTreeMatching): FlexGridGridLanesMatch|null {
     if (node.name !== 'Declaration') {
       return null;
     }
@@ -1105,14 +1105,14 @@ export class FlexGridMasonryMatcher extends matcherBase(FlexGridMasonryMatch) {
                        .map(node => matching.getComputedText(node).trim())
                        .filter(value => value);
     const text = values.join(' ');
-    if (FlexGridMasonryMatcher.FLEX.includes(text)) {
-      return new FlexGridMasonryMatch(matching.ast.text(node), node, LayoutType.FLEX);
+    if (FlexGridGridLanesMatcher.FLEX.includes(text)) {
+      return new FlexGridGridLanesMatch(matching.ast.text(node), node, LayoutType.FLEX);
     }
-    if (FlexGridMasonryMatcher.GRID.includes(text)) {
-      return new FlexGridMasonryMatch(matching.ast.text(node), node, LayoutType.GRID);
+    if (FlexGridGridLanesMatcher.GRID.includes(text)) {
+      return new FlexGridGridLanesMatch(matching.ast.text(node), node, LayoutType.GRID);
     }
-    if (FlexGridMasonryMatcher.MASONRY.includes(text)) {
-      return new FlexGridMasonryMatch(matching.ast.text(node), node, LayoutType.MASONRY);
+    if (FlexGridGridLanesMatcher.GRID_LANES.includes(text)) {
+      return new FlexGridGridLanesMatch(matching.ast.text(node), node, LayoutType.GRID_LANES);
     }
     return null;
   }

package/front_end/core/sdk/CSSQuery.ts

@@ -14,7 +14,7 @@ type CSSQueryPayload =
 export abstract class CSSQuery {
   text = '';
   range?: TextUtils.TextRange.TextRange|null;
-  styleSheetId?: Protocol.CSS.StyleSheetId;
+  styleSheetId?: Protocol.DOM.StyleSheetId;
   protected cssModel: CSSModel;
 
   constructor(cssModel: CSSModel) {

package/front_end/core/sdk/CSSRule.ts

@@ -17,7 +17,7 @@ import type {CSSStyleSheetHeader} from './CSSStyleSheetHeader.js';
 import {CSSSupports} from './CSSSupports.js';
 
 function styleSheetHeaderForRule(
-    cssModel: CSSModel, {styleSheetId}: {styleSheetId?: Protocol.CSS.StyleSheetId}): CSSStyleSheetHeader|null {
+    cssModel: CSSModel, {styleSheetId}: {styleSheetId?: Protocol.DOM.StyleSheetId}): CSSStyleSheetHeader|null {
   return styleSheetId && cssModel.styleSheetHeaderForId(styleSheetId) || null;
 }
 
@@ -143,7 +143,7 @@ export class CSSStyleRule extends CSSRule {
         selectors: [{text: selectorText, value: undefined}],
       },
       style: {
-        styleSheetId: '0' as Protocol.CSS.StyleSheetId,
+        styleSheetId: '0' as Protocol.DOM.StyleSheetId,
         range: new TextUtils.TextRange.TextRange(0, 0, 0, 0),
         shorthandEntries: [],
         cssProperties: [],

package/front_end/core/sdk/CSSStyleDeclaration.ts

@@ -15,7 +15,7 @@ export class CSSStyleDeclaration {
   readonly #cssModel: CSSModel;
   parentRule: CSSRule|null;
   #allProperties: CSSProperty[] = [];
-  styleSheetId?: Protocol.CSS.StyleSheetId;
+  styleSheetId?: Protocol.DOM.StyleSheetId;
   range: TextUtils.TextRange.TextRange|null = null;
   cssText?: string;
   #shorthandValues = new Map<string, string>();

package/front_end/core/sdk/CSSStyleSheetHeader.ts

@@ -30,7 +30,7 @@ const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 
 export class CSSStyleSheetHeader implements TextUtils.ContentProvider.ContentProvider, FrameAssociated {
   #cssModel: CSSModel;
-  id: Protocol.CSS.StyleSheetId;
+  id: Protocol.DOM.StyleSheetId;
   frameId: Protocol.Page.FrameId;
   sourceURL: Platform.DevToolsPath.UrlString;
   hasSourceURL: boolean;

package/front_end/core/sdk/DOMModel.ts

@@ -1800,6 +1800,9 @@ class DOMDispatcher implements ProtocolProxyApi.DOMDispatcher {
   constructor(domModel: DOMModel) {
     this.#domModel = domModel;
   }
+  adoptedStyleSheetsModified(_params: Protocol.DOM.AdoptedStyleSheetsModifiedEvent): void {
+    // TODO: implementation
+  }
 
   documentUpdated(): void {
     this.#domModel.documentUpdated();

package/front_end/core/sdk/NetworkManager.ts

@@ -6,7 +6,6 @@ import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
 import * as Protocol from '../../generated/protocol.js';
 import * as TextUtils from '../../models/text_utils/text_utils.js';
 import * as Common from '../common/common.js';
-import * as Host from '../host/host.js';
 import * as i18n from '../i18n/i18n.js';
 import * as Platform from '../platform/platform.js';
 import * as Root from '../root/root.js';
@@ -1404,7 +1403,11 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
         sendBufferSize: event.options.sendBufferSize,
         receiveBufferSize: event.options.receiveBufferSize,
         dnsQueryType: event.options.dnsQueryType,
-      }
+        multicastLoopback: event.options.multicastLoopback,
+        multicastTimeToLive: event.options.multicastTimeToLive,
+        multicastAllowAddressSharing: event.options.multicastAllowAddressSharing,
+      },
+      joinedMulticastGroups: new Set(),
     };
     networkRequest.setResourceType(Common.ResourceType.resourceTypes.DirectSocket);
     networkRequest.setIssueTime(event.timestamp, event.timestamp);
@@ -1502,10 +1505,28 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     this.updateNetworkRequest(networkRequest);
   }
 
-  directUDPSocketJoinedMulticastGroup(_event: Protocol.Network.DirectUDPSocketJoinedMulticastGroupEvent): void {
+  directUDPSocketJoinedMulticastGroup(event: Protocol.Network.DirectUDPSocketJoinedMulticastGroupEvent): void {
+    const networkRequest = this.#requestsById.get(event.identifier);
+    if (!networkRequest?.directSocketInfo) {
+      return;
+    }
+    if (!networkRequest.directSocketInfo.joinedMulticastGroups) {
+      networkRequest.directSocketInfo.joinedMulticastGroups = new Set();
+    }
+    if (!networkRequest.directSocketInfo.joinedMulticastGroups.has(event.IPAddress)) {
+      networkRequest.directSocketInfo.joinedMulticastGroups.add(event.IPAddress);
+      this.updateNetworkRequest(networkRequest);
+    }
   }
 
-  directUDPSocketLeftMulticastGroup(_event: Protocol.Network.DirectUDPSocketLeftMulticastGroupEvent): void {
+  directUDPSocketLeftMulticastGroup(event: Protocol.Network.DirectUDPSocketLeftMulticastGroupEvent): void {
+    const networkRequest = this.#requestsById.get(event.identifier);
+    if (!networkRequest?.directSocketInfo?.joinedMulticastGroups) {
+      return;
+    }
+    if (networkRequest.directSocketInfo.joinedMulticastGroups.delete(event.IPAddress)) {
+      this.updateNetworkRequest(networkRequest);
+    }
   }
 
   trustTokenOperationDone(event: Protocol.Network.TrustTokenOperationDoneEvent): void {
@@ -1912,8 +1933,10 @@ export class RequestConditions extends Common.ObjectWrapper.ObjectWrapper<Reques
         promises.push(agent.invoke_overrideNetworkState({
           offline,
           latency: globalConditions?.latency ?? 0,
-          downloadThroughput: !globalConditions || globalConditions.download < 0 ? 0 : globalConditions.download,
-          uploadThroughput: !globalConditions || globalConditions.upload < 0 ? 0 : globalConditions.upload,
+          downloadThroughput: globalConditions?.download ?? -1,
+          uploadThroughput: globalConditions?.upload ?? -1,
+          connectionType: globalConditions ? NetworkManager.connectionType(globalConditions) :
+                                             Protocol.Network.ConnectionType.None,
         }));
       }
 
@@ -2307,31 +2330,6 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
     return certificate.tableNames;
   }
 
-  async loadResource(url: Platform.DevToolsPath.UrlString): Promise<{
-    success: boolean,
-    content: string,
-    errorDescription: Host.ResourceLoader.LoadErrorDescription,
-  }> {
-    const headers: Record<string, string> = {};
-
-    const currentUserAgent = this.currentUserAgent();
-    if (currentUserAgent) {
-      headers['User-Agent'] = currentUserAgent;
-    }
-
-    if (Common.Settings.Settings.instance().moduleSetting('cache-disabled').get()) {
-      headers['Cache-Control'] = 'no-cache';
-    }
-
-    const allowRemoteFilePaths =
-        Common.Settings.Settings.instance().moduleSetting('network.enable-remote-file-loading').get();
-
-    return await new Promise(
-        resolve => Host.ResourceLoader.load(url, headers, (success, _responseHeaders, content, errorDescription) => {
-          resolve({success, content, errorDescription});
-        }, allowRemoteFilePaths));
-  }
-
   appliedRequestConditions(requestInternal: NetworkRequest): AppliedNetworkConditions|undefined {
     if (!requestInternal.appliedNetworkConditionsId) {
       return undefined;

package/front_end/core/sdk/NetworkRequest.ts

@@ -2215,6 +2215,9 @@ export interface DirectSocketCreateOptions {
   sendBufferSize?: number;
   receiveBufferSize?: number;
   dnsQueryType?: Protocol.Network.DirectSocketDnsQueryType;
+  multicastLoopback?: boolean;
+  multicastTimeToLive?: number;
+  multicastAllowAddressSharing?: boolean;
 }
 
 export interface DirectSocketOpenInfo {
@@ -2230,6 +2233,7 @@ export interface DirectSocketInfo {
   errorMessage?: string;
   createOptions: DirectSocketCreateOptions;
   openInfo?: DirectSocketOpenInfo;
+  joinedMulticastGroups?: Set<string>;
 }
 
 export interface DirectSocketChunk {

package/front_end/core/sdk/OverlayModel.ts

@@ -784,7 +784,7 @@ export class OverlayModel extends SDKModel<EventTypes> implements ProtocolProxyA
 export class WindowControls {
   readonly #cssModel: CSSModel;
   #originalStylesheetText: string|undefined;
-  #stylesheetId?: Protocol.CSS.StyleSheetId;
+  #stylesheetId?: Protocol.DOM.StyleSheetId;
   #currentUrl: Platform.DevToolsPath.UrlString|undefined;
 
   #config: Protocol.Overlay.WindowControlsOverlayConfig = {
@@ -874,7 +874,7 @@ export class WindowControls {
     return header?.sourceURL;
   }
 
-  #fetchCurrentStyleSheet(cssSourceUrl: Platform.DevToolsPath.UrlString): Protocol.CSS.StyleSheetId|undefined {
+  #fetchCurrentStyleSheet(cssSourceUrl: Platform.DevToolsPath.UrlString): Protocol.DOM.StyleSheetId|undefined {
     const stylesheetIds = this.#cssModel.getStyleSheetIdsForURL(cssSourceUrl);
     return stylesheetIds.length > 0 ? stylesheetIds[0] : undefined;
   }

package/front_end/core/sdk/PageResourceLoader.ts

@@ -7,8 +7,8 @@ import * as Common from '../common/common.js';
 import * as Host from '../host/host.js';
 import * as i18n from '../i18n/i18n.js';
 import type * as Platform from '../platform/platform.js';
+import * as Root from '../root/root.js';
 
-import {FrameManager} from './FrameManager.js';
 import {IOModel} from './IOModel.js';
 import {MultitargetNetworkManager, NetworkManager} from './NetworkManager.js';
 import {
@@ -68,7 +68,7 @@ export class ResourceKey {
   }
 }
 
-let pageResourceLoader: PageResourceLoader|null = null;
+export type UserAgentProvider = Pick<MultitargetNetworkManager, 'currentUserAgent'>;
 
 interface LoadQueueEntry {
   resolve: () => void;
@@ -81,6 +81,9 @@ interface LoadQueueEntry {
  * resources were loaded, and whether there was a load error.
  */
 export class PageResourceLoader extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
+  readonly #targetManager: TargetManager;
+  readonly #settings: Common.Settings.Settings;
+  readonly #userAgentProvider: UserAgentProvider;
   #currentlyLoading = 0;
   #currentlyLoadingPerTarget = new Map<Protocol.Target.TargetID|'main', number>();
   readonly #maxConcurrentLoads: number;
@@ -92,41 +95,51 @@ export class PageResourceLoader extends Common.ObjectWrapper.ObjectWrapper<Event
                              errorDescription: Host.ResourceLoader.LoadErrorDescription,
                            }>)|null;
   constructor(
+      targetManager: TargetManager, settings: Common.Settings.Settings, userAgentProvider: UserAgentProvider,
       loadOverride: ((arg0: string) => Promise<{
                        success: boolean,
                        content: string,
                        errorDescription: Host.ResourceLoader.LoadErrorDescription,
                      }>)|null,
-      maxConcurrentLoads: number) {
+      maxConcurrentLoads = 500) {
     super();
+    this.#targetManager = targetManager;
+    this.#settings = settings;
+    this.#userAgentProvider = userAgentProvider;
     this.#maxConcurrentLoads = maxConcurrentLoads;
-    TargetManager.instance().addModelListener(
+    this.#targetManager.addModelListener(
         ResourceTreeModel, ResourceTreeModelEvents.PrimaryPageChanged, this.onPrimaryPageChanged, this);
     this.#loadOverride = loadOverride;
   }
 
-  static instance({forceNew, loadOverride, maxConcurrentLoads}: {
+  static instance({forceNew, targetManager, settings, userAgentProvider, loadOverride, maxConcurrentLoads}: {
     forceNew: boolean,
     loadOverride: (null|((arg0: string) => Promise<{
                            success: boolean,
                            content: string,
                            errorDescription: Host.ResourceLoader.LoadErrorDescription,
                          }>)),
-    maxConcurrentLoads: number,
+    targetManager?: TargetManager,
+    settings?: Common.Settings.Settings,
+    userAgentProvider?: UserAgentProvider,
+    maxConcurrentLoads?: number,
   } = {
     forceNew: false,
     loadOverride: null,
-    maxConcurrentLoads: 500,
   }): PageResourceLoader {
-    if (!pageResourceLoader || forceNew) {
-      pageResourceLoader = new PageResourceLoader(loadOverride, maxConcurrentLoads);
+    if (forceNew) {
+      Root.DevToolsContext.globalInstance().set(
+          PageResourceLoader,
+          new PageResourceLoader(
+              targetManager ?? TargetManager.instance(), settings ?? Common.Settings.Settings.instance(),
+              userAgentProvider ?? MultitargetNetworkManager.instance(), loadOverride, maxConcurrentLoads));
     }
 
-    return pageResourceLoader;
+    return Root.DevToolsContext.globalInstance().get(PageResourceLoader);
   }
 
   static removeInstance(): void {
-    pageResourceLoader = null;
+    Root.DevToolsContext.globalInstance().delete(PageResourceLoader);
   }
 
   onPrimaryPageChanged(
@@ -159,7 +172,7 @@ export class PageResourceLoader extends Common.ObjectWrapper.ObjectWrapper<Event
 
   getScopedResourcesLoaded(): Map<string, PageResource> {
     return new Map([...this.#pageResources].filter(
-        ([_, pageResource]) => TargetManager.instance().isInScope(pageResource.initiator.target) ||
+        ([_, pageResource]) => this.#targetManager.isInScope(pageResource.initiator.target) ||
             isExtensionInitiator(pageResource.initiator)));
   }
 
@@ -180,11 +193,10 @@ export class PageResourceLoader extends Common.ObjectWrapper.ObjectWrapper<Event
     loading: number,
     resources: number,
   } {
-    const targetManager = TargetManager.instance();
     let loadingCount = 0;
     for (const [targetId, count] of this.#currentlyLoadingPerTarget) {
-      const target = targetManager.targetById(targetId);
-      if (targetManager.isInScope(target)) {
+      const target = this.#targetManager.targetById(targetId);
+      if (this.#targetManager.isInScope(target)) {
         loadingCount += count;
       }
     }
@@ -305,25 +317,15 @@ export class PageResourceLoader extends Common.ObjectWrapper.ObjectWrapper<Event
       return await this.#loadOverride(url);
     }
     const parsedURL = new Common.ParsedURL.ParsedURL(url);
-    const eligibleForLoadFromTarget = getLoadThroughTargetSetting().get() && parsedURL && parsedURL.scheme !== 'file' &&
-        parsedURL.scheme !== 'data' && parsedURL.scheme !== 'devtools';
+    const eligibleForLoadFromTarget = this.getLoadThroughTargetSetting().get() && parsedURL &&
+        parsedURL.scheme !== 'file' && parsedURL.scheme !== 'data' && parsedURL.scheme !== 'devtools' &&
+        initiator.target;
     Host.userMetrics.developerResourceScheme(this.getDeveloperResourceScheme(parsedURL));
     if (eligibleForLoadFromTarget) {
       try {
-        if (initiator.target) {
-          Host.userMetrics.developerResourceLoaded(
-              Host.UserMetrics.DeveloperResourceLoaded.LOAD_THROUGH_PAGE_VIA_TARGET);
-          const result = await this.loadFromTarget(initiator.target, initiator.frameId, url, isBinary);
-          return result;
-        }
-        const frame = FrameManager.instance().getFrame(initiator.frameId);
-        if (frame) {
-          Host.userMetrics.developerResourceLoaded(
-              Host.UserMetrics.DeveloperResourceLoaded.LOAD_THROUGH_PAGE_VIA_FRAME);
-          const result =
-              await this.loadFromTarget(frame.resourceTreeModel().target(), initiator.frameId, url, isBinary);
-          return result;
-        }
+        Host.userMetrics.developerResourceLoaded(Host.UserMetrics.DeveloperResourceLoaded.LOAD_THROUGH_PAGE_VIA_TARGET);
+        const result = await this.loadFromTarget(initiator.target, initiator.frameId, url, isBinary);
+        return result;
       } catch (e) {
         if (e instanceof Error) {
           Host.userMetrics.developerResourceLoaded(Host.UserMetrics.DeveloperResourceLoaded.LOAD_THROUGH_PAGE_FAILURE);
@@ -339,13 +341,13 @@ export class PageResourceLoader extends Common.ObjectWrapper.ObjectWrapper<Event
       }
       Host.userMetrics.developerResourceLoaded(Host.UserMetrics.DeveloperResourceLoaded.LOAD_THROUGH_PAGE_FALLBACK);
     } else {
-      const code = getLoadThroughTargetSetting().get() ?
+      const code = this.getLoadThroughTargetSetting().get() ?
           Host.UserMetrics.DeveloperResourceLoaded.FALLBACK_PER_PROTOCOL :
           Host.UserMetrics.DeveloperResourceLoaded.FALLBACK_PER_OVERRIDE;
       Host.userMetrics.developerResourceLoaded(code);
     }
 
-    const result = await MultitargetNetworkManager.instance().loadResource(url);
+    const result = await this.loadFromHostBindings(url);
     if (eligibleForLoadFromTarget && !result.success) {
       Host.userMetrics.developerResourceLoaded(Host.UserMetrics.DeveloperResourceLoaded.FALLBACK_FAILURE);
     }
@@ -395,7 +397,7 @@ export class PageResourceLoader extends Common.ObjectWrapper.ObjectWrapper<Event
   }> {
     const networkManager = (target.model(NetworkManager) as NetworkManager);
     const ioModel = (target.model(IOModel) as IOModel);
-    const disableCache = Common.Settings.Settings.instance().moduleSetting('cache-disabled').get();
+    const disableCache = this.#settings.moduleSetting('cache-disabled').get();
     const resource = await networkManager.loadNetworkResource(frameId, url, {disableCache, includeCredentials: true});
     try {
       const content = resource.stream ?
@@ -420,10 +422,34 @@ export class PageResourceLoader extends Common.ObjectWrapper.ObjectWrapper<Event
       }
     }
   }
-}
 
-export function getLoadThroughTargetSetting(): Common.Settings.Setting<boolean> {
-  return Common.Settings.Settings.instance().createSetting('load-through-target', true);
+  private async loadFromHostBindings(url: Platform.DevToolsPath.UrlString): Promise<{
+    success: boolean,
+    content: string,
+    errorDescription: Host.ResourceLoader.LoadErrorDescription,
+  }> {
+    const headers: Record<string, string> = {};
+
+    const currentUserAgent = this.#userAgentProvider.currentUserAgent();
+    if (currentUserAgent) {
+      headers['User-Agent'] = currentUserAgent;
+    }
+
+    if (this.#settings.moduleSetting('cache-disabled').get()) {
+      headers['Cache-Control'] = 'no-cache';
+    }
+
+    const allowRemoteFilePaths = this.#settings.moduleSetting('network.enable-remote-file-loading').get();
+
+    return await new Promise(
+        resolve => Host.ResourceLoader.load(url, headers, (success, _responseHeaders, content, errorDescription) => {
+          resolve({success, content, errorDescription});
+        }, allowRemoteFilePaths));
+  }
+
+  getLoadThroughTargetSetting(): Common.Settings.Setting<boolean> {
+    return this.#settings.createSetting('load-through-target', true);
+  }
 }
 
 export const enum Events {

package/front_end/core/sdk/SourceMap.ts

@@ -779,6 +779,12 @@ export class SourceMap {
     return this.#scopesInfo?.findOriginalFunctionName(position) ?? null;
   }
 
+  findOriginalFunctionScope(position: ScopesCodec.Position):
+      {scope: ScopesCodec.OriginalScope, url?: Platform.DevToolsPath.UrlString}|null {
+    this.#ensureSourceMapProcessed();
+    return this.#scopesInfo?.findOriginalFunctionScope(position) ?? null;
+  }
+
   isOutlinedFrame(generatedLine: number, generatedColumn: number): boolean {
     this.#ensureSourceMapProcessed();
     return this.#scopesInfo?.isOutlinedFrame(generatedLine, generatedColumn) ?? false;