chrome-devtools-frontend 1.0.1657855 → 1.0.1661063

package/front_end/core/sdk/DOMModel.ts

@@ -1127,27 +1127,33 @@ export class DOMNode extends Common.ObjectWrapper.ObjectWrapper<DOMNodeEventType
     return model;
   }
 
-  async setAsInspectedNode(): Promise<void> {
-    let node: DOMNode|null = this;
-    if (node?.pseudoType()) {
-      node = node.parentNode;
+  canInspectNode(): boolean {
+    if (this.ancestorUserAgentShadowRoot()) {
+      return false;
     }
-    while (node) {
-      let ancestor = node.ancestorUserAgentShadowRoot();
-      if (!ancestor) {
-        break;
-      }
-      ancestor = node.ancestorShadowHost();
-      if (!ancestor) {
-        break;
-      }
-      // User #agent shadow root, keep climbing up.
-      node = ancestor;
+
+    if (this.#pseudoType) {
+      return [
+        Protocol.DOM.PseudoType.Before,
+        Protocol.DOM.PseudoType.After,
+        Protocol.DOM.PseudoType.Marker,
+        Protocol.DOM.PseudoType.ScrollMarker,
+        Protocol.DOM.PseudoType.Backdrop,
+        Protocol.DOM.PseudoType.ViewTransition,
+        Protocol.DOM.PseudoType.ViewTransitionGroup,
+        Protocol.DOM.PseudoType.ViewTransitionImagePair,
+        Protocol.DOM.PseudoType.ViewTransitionOld,
+        Protocol.DOM.PseudoType.ViewTransitionNew,
+      ].includes(this.#pseudoType);
     }
-    if (!node) {
-      throw new Error('In DOMNode.setAsInspectedNode: node is expected to not be null.');
+    return true;
+  }
+
+  async setAsInspectedNode(): Promise<void> {
+    if (!this.canInspectNode()) {
+      return;
     }
-    await this.#agent.invoke_setInspectedNode({nodeId: node.id});
+    await this.#agent.invoke_setInspectedNode({nodeId: this.id});
   }
 
   enclosingElementOrSelf(): DOMNode|null {
@@ -2102,6 +2108,7 @@ export class DOMModel extends SDKModel<EventTypes> {
     if ('has' in context && typeof context.has === 'function' && context.has(DOMModelUndoStack)) {
       return context.get(DOMModelUndoStack);
     }
+    // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
     return DOMModelUndoStack.instance();
   }
 
@@ -2365,6 +2372,10 @@ export class DOMNodeSnapshot extends DOMNode {
       _callback?: ((arg0: string|null, arg1: DOMNode|null) => void)|undefined): void {
   }
 
+  override canInspectNode(): boolean {
+    return false;
+  }
+
   override setAsInspectedNode(): Promise<void> {
     return Promise.resolve();
   }
@@ -2410,6 +2421,10 @@ export class DOMDocumentSnapshot extends DOMDocument {
       _callback?: ((arg0: string|null, arg1: DOMNode|null) => void)|undefined): void {
   }
 
+  override canInspectNode(): boolean {
+    return false;
+  }
+
   override setAsInspectedNode(): Promise<void> {
     return Promise.resolve();
   }

package/front_end/core/sdk/DebuggerModel.ts

@@ -168,10 +168,10 @@ export class DebuggerModel extends SDKModel<EventTypes> {
     this.agent = target.debuggerAgent();
     this.#runtimeModel = (target.model(RuntimeModel) as RuntimeModel);
 
-    this.#sourceMapManager = new SourceMapManager(
-        target,
-        (compiledURL, sourceMappingURL, payload, script) =>
-            new SourceMap(compiledURL, sourceMappingURL, payload, script));
+    this.#sourceMapManager =
+        new SourceMapManager(target,
+                             (compiledURL, sourceMappingURL, payload, script) => new SourceMap(
+                                 compiledURL, sourceMappingURL, payload, target.targetManager().getConsole(), script));
 
     const settings = this.target().targetManager().settings;
     settings.moduleSetting('pause-on-exception-enabled').addChangeListener(this.pauseOnExceptionStateChanged, this);

package/front_end/core/sdk/EventBreakpointsModel.ts

@@ -88,6 +88,7 @@ export class EventBreakpointsManager implements SDKModelObserver<EventBreakpoint
   readonly #eventListenerBreakpoints: EventListenerBreakpoint[] = [];
   readonly #targetManager: TargetManager;
 
+  // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
   constructor(targetManager: TargetManager = TargetManager.instance()) {
     this.#targetManager = targetManager;
     this.createInstrumentationBreakpoints(Category.AUCTION_WORKLET, [
@@ -152,6 +153,7 @@ export class EventBreakpointsManager implements SDKModelObserver<EventBreakpoint
     const {forceNew, targetManager} = opts;
     if (!Root.DevToolsContext.globalInstance().has(EventBreakpointsManager) || forceNew) {
       Root.DevToolsContext.globalInstance().set(EventBreakpointsManager,
+                                                // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
                                                 new EventBreakpointsManager(targetManager ?? TargetManager.instance()));
     }
 

package/front_end/core/sdk/FrameManager.ts

@@ -45,6 +45,7 @@ export class FrameManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     forceNew: boolean,
   } = {forceNew: false}): FrameManager {
     if (!Root.DevToolsContext.globalInstance().has(FrameManager) || forceNew) {
+      // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
       Root.DevToolsContext.globalInstance().set(FrameManager, new FrameManager(TargetManager.instance()));
     }
     return Root.DevToolsContext.globalInstance().get(FrameManager);

package/front_end/core/sdk/IsolateManager.ts

@@ -20,6 +20,7 @@ export class IsolateManager extends Common.ObjectWrapper.ObjectWrapper<EventType
   #pollId = 0;
   readonly #targetManager: TargetManager;
 
+  // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
   constructor(targetManager: TargetManager = TargetManager.instance()) {
     super();
     this.#targetManager = targetManager;

package/front_end/core/sdk/NetworkManager.ts

@@ -323,6 +323,45 @@ export class NetworkManager extends SDKModel<EventTypes> {
     }
   }
 
+  /**
+   * Returns the request post data as a ContentData suitable for binary
+   * viewers (hex, base64, utf-8) in the Payload tab.  When the backend
+   * provides base64-encoded (possibly compressed) data, the body is
+   * decompressed first so viewers show the actual payload bytes rather
+   * than gzip/deflate framing.
+   */
+  static async requestPostDataContentData(request: NetworkRequest): Promise<TextUtils.ContentData.ContentDataOrError> {
+    const manager = NetworkManager.forRequest(request);
+    if (!manager) {
+      return {error: 'No network manager for request'};
+    }
+    const requestId = request.backendRequestId();
+    if (!requestId) {
+      return {error: 'No backend request id for request'};
+    }
+    try {
+      const response = await manager.#networkAgent.invoke_getRequestPostData({requestId});
+      const error = response.getError();
+      if (error) {
+        return {error};
+      }
+      const {postData, base64Encoded} = response;
+      if (!postData) {
+        return {error: 'No post data'};
+      }
+      const requestContentType = request.requestContentType() ?? 'application/octet-stream';
+      const {charset} = Platform.MimeType.parseContentType(requestContentType);
+
+      if (base64Encoded && postData) {
+        return await TextUtils.ContentData.ContentData.fromCompressedBase64(
+            postData, requestContentType, charset ?? undefined, request.requestContentEncoding());
+      }
+      return new TextUtils.ContentData.ContentData(postData, false, requestContentType, charset ?? undefined);
+    } catch (e) {
+      return {error: e.message};
+    }
+  }
+
   /**
    * Attempts to decompress a compressed request body.
    * Returns the decompressed string, or null if decompression is not applicable.
@@ -658,6 +697,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     networkRequest.setReferrerPolicy(request.referrerPolicy);
     networkRequest.setIsSameSite(request.isSameSite || false);
     networkRequest.setIsAdRelated(request.isAdRelated || false);
+    networkRequest.setIsLinkPreload(request.isLinkPreload || false);
   }
 
   private updateNetworkRequestWithResponse(networkRequest: NetworkRequest, response: Protocol.Network.Response): void {
@@ -847,7 +887,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     } else {
       networkRequest = NetworkRequest.create(
           requestId, request.url as Platform.DevToolsPath.UrlString, documentURL as Platform.DevToolsPath.UrlString,
-          frameId ?? null, loaderId, initiator, hasUserGesture);
+          frameId ?? null, loaderId, initiator, hasUserGesture, this.#manager.target().targetManager().getConsole());
       if (renderBlockingBehavior) {
         networkRequest.setRenderBlockingBehavior(renderBlockingBehavior);
       }
@@ -969,7 +1009,8 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
 
   webSocketCreated({requestId, url: requestURL, initiator}: Protocol.Network.WebSocketCreatedEvent): void {
     const networkRequest =
-        NetworkRequest.createForSocket(requestId, requestURL as Platform.DevToolsPath.UrlString, initiator);
+        NetworkRequest.createForSocket(requestId, requestURL as Platform.DevToolsPath.UrlString, initiator,
+                                       this.#manager.target().targetManager().getConsole());
     requestToManagerMap.set(networkRequest, this.#manager);
     networkRequest.setResourceType(Common.ResourceType.resourceTypes.WebSocket);
     this.startNetworkRequest(networkRequest, null);
@@ -1174,7 +1215,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     const newNetworkRequest = NetworkRequest.create(
         requestId, redirectURL, originalNetworkRequest.documentURL, originalNetworkRequest.frameId,
         originalNetworkRequest.loaderId, originalNetworkRequest.initiator(),
-        originalNetworkRequest.hasUserGesture() ?? undefined);
+        originalNetworkRequest.hasUserGesture() ?? undefined, this.#manager.target().targetManager().getConsole());
     requestToManagerMap.set(newNetworkRequest, this.#manager);
     newNetworkRequest.setRedirectSource(originalNetworkRequest);
     originalNetworkRequest.setRedirectDestination(newNetworkRequest);
@@ -1296,7 +1337,8 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
   webTransportCreated({transportId, url: requestURL, timestamp: time, initiator}:
                           Protocol.Network.WebTransportCreatedEvent): void {
     const networkRequest =
-        NetworkRequest.createForSocket(transportId, requestURL as Platform.DevToolsPath.UrlString, initiator);
+        NetworkRequest.createForSocket(transportId, requestURL as Platform.DevToolsPath.UrlString, initiator,
+                                       this.#manager.target().targetManager().getConsole());
     networkRequest.hasNetworkData = true;
     requestToManagerMap.set(networkRequest, this.#manager);
     networkRequest.setResourceType(Common.ResourceType.resourceTypes.WebTransport);
@@ -1333,8 +1375,9 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
 
   directTCPSocketCreated(event: Protocol.Network.DirectTCPSocketCreatedEvent): void {
     const requestURL = this.concatHostPort(event.remoteAddr, event.remotePort);
-    const networkRequest = NetworkRequest.createForSocket(
-        event.identifier, requestURL as Platform.DevToolsPath.UrlString, event.initiator);
+    const networkRequest =
+        NetworkRequest.createForSocket(event.identifier, requestURL as Platform.DevToolsPath.UrlString, event.initiator,
+                                       this.#manager.target().targetManager().getConsole());
     networkRequest.hasNetworkData = true;
     networkRequest.setRemoteAddress(event.remoteAddr, event.remotePort);
     networkRequest.protocol = i18n.i18n.lockedString('tcp');
@@ -1448,8 +1491,9 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
       // is not specified.
       return;
     }
-    const networkRequest = NetworkRequest.createForSocket(
-        event.identifier, requestURL as Platform.DevToolsPath.UrlString, event.initiator);
+    const networkRequest =
+        NetworkRequest.createForSocket(event.identifier, requestURL as Platform.DevToolsPath.UrlString, event.initiator,
+                                       this.#manager.target().targetManager().getConsole());
     networkRequest.hasNetworkData = true;
     if (event.options.remoteAddr && event.options.remotePort) {
       networkRequest.setRemoteAddress(event.options.remoteAddr, event.options.remotePort);
@@ -1633,9 +1677,9 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
   protected createNetworkRequest(
       requestId: Protocol.Network.RequestId, frameId: Protocol.Page.FrameId, loaderId: Protocol.Network.LoaderId,
       url: string, documentURL: string, initiator: Protocol.Network.Initiator|null): NetworkRequest {
-    const request = NetworkRequest.create(
-        requestId, url as Platform.DevToolsPath.UrlString, documentURL as Platform.DevToolsPath.UrlString, frameId,
-        loaderId, initiator);
+    const request = NetworkRequest.create(requestId, url as Platform.DevToolsPath.UrlString,
+                                          documentURL as Platform.DevToolsPath.UrlString, frameId, loaderId, initiator,
+                                          undefined, this.#manager.target().targetManager().getConsole());
     requestToManagerMap.set(request, this.#manager);
     return request;
   }
@@ -1964,6 +2008,7 @@ export class RequestConditions extends Common.ObjectWrapper.ObjectWrapper<Reques
       promises.push(agent
                         .invoke_emulateNetworkConditionsByRule({
                           offline,
+                          emulateOfflineServiceWorker: offline,
                           matchedNetworkConditions: matchedNetworkConditions.map(
                               ({urlPattern, conditions}) => ({
                                 urlPattern: urlPattern ?? '',
@@ -1974,6 +2019,7 @@ export class RequestConditions extends Common.ObjectWrapper.ObjectWrapper<Reques
                                 packetQueueLength: conditions.packetQueueLength,
                                 packetReordering: conditions.packetReordering,
                                 connectionType: NetworkManager.connectionType(conditions),
+                                offline,
                               }))
                         })
                         .then(response => {
@@ -2074,8 +2120,10 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
   } = {forceNew: null}): MultitargetNetworkManager {
     const {forceNew, targetManager} = opts;
     if (!Root.DevToolsContext.globalInstance().has(MultitargetNetworkManager) || forceNew) {
+      /* eslint-disable @devtools/no-instance-of-migrated-singletons */
       Root.DevToolsContext.globalInstance().set(
           MultitargetNetworkManager, new MultitargetNetworkManager(targetManager ?? TargetManager.instance()));
+      /* eslint-enable @devtools/no-instance-of-migrated-singletons */
     }
 
     return Root.DevToolsContext.globalInstance().get(MultitargetNetworkManager);

package/front_end/core/sdk/NetworkRequest.ts

@@ -296,7 +296,9 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
   directSocketInfo?: DirectSocketInfo;
   readonly #directSocketChunks: DirectSocketChunk[] = [];
   #isAdRelated: boolean;
+  #isLinkPreload: boolean;
   #appliedNetworkConditionsId?: string;
+  readonly #console: Common.Console.Console;
 
   constructor(
       requestId: string,
@@ -307,6 +309,8 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
       loaderId: Protocol.Network.LoaderId|null,
       initiator: Protocol.Network.Initiator|null,
       hasUserGesture?: boolean,
+      // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
+      console: Common.Console.Console = Common.Console.Console.instance(),
   ) {
     super();
 
@@ -319,6 +323,8 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
     this.#initiator = initiator;
     this.#hasUserGesture = hasUserGesture;
     this.#isAdRelated = false;
+    this.#isLinkPreload = false;
+    this.#console = console;
   }
 
   static create(
@@ -329,6 +335,7 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
       loaderId: Protocol.Network.LoaderId|null,
       initiator: Protocol.Network.Initiator|null,
       hasUserGesture?: boolean,
+      console?: Common.Console.Console,
       ): NetworkRequest {
     return new NetworkRequest(
         backendRequestId,
@@ -339,6 +346,7 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
         loaderId,
         initiator,
         hasUserGesture,
+        console,
     );
   }
 
@@ -346,6 +354,7 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
       backendRequestId: Protocol.Network.RequestId,
       requestURL: Platform.DevToolsPath.UrlString,
       initiator?: Protocol.Network.Initiator,
+      console?: Common.Console.Console,
       ): NetworkRequest {
     return new NetworkRequest(
         backendRequestId,
@@ -355,6 +364,8 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
         null,
         null,
         initiator || null,
+        undefined,
+        console,
     );
   }
 
@@ -363,6 +374,7 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
       url: Platform.DevToolsPath.UrlString,
       documentURL: Platform.DevToolsPath.UrlString,
       initiator: Protocol.Network.Initiator|null,
+      console?: Common.Console.Console,
       ): NetworkRequest {
     return new NetworkRequest(
         requestId,
@@ -372,6 +384,8 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
         null,
         null,
         initiator,
+        undefined,
+        console,
     );
   }
 
@@ -909,6 +923,11 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
         this.#initiator.type === Protocol.Network.InitiatorType.Preflight);
   }
 
+  isPreloadRequest(): boolean {
+    return (this.#initiator !== null && this.#initiator !== undefined &&
+            this.#initiator.type === Protocol.Network.InitiatorType.Preload);
+  }
+
   redirectDestination(): NetworkRequest|null {
     return this.#redirectDestination;
   }
@@ -960,6 +979,15 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
     this.#formParametersPromise = null;
   }
 
+  /**
+   * Returns the raw request body as ContentData, preserving base64 encoding
+   * for binary payloads. This enables binary viewers (hex, base64, utf-8)
+   * in the Payload tab.
+   */
+  requestFormDataContentData(): Promise<TextUtils.ContentData.ContentDataOrError> {
+    return NetworkManager.requestPostDataContentData(this);
+  }
+
   private filteredProtocolName(): string {
     const protocol = this.protocol.toLowerCase();
     if (protocol === 'h2') {
@@ -1201,7 +1229,8 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
   get serverTimings(): ServerTiming[]|null {
     if (typeof this.#serverTimings === 'undefined') {
       this.#serverTimings = ServerTiming.parseHeaders(
-          this.responseHeaders,
+          this.responseHeaders.map(x => ({name: x.name, value: x.value})),
+          this.#console,
       );
     }
     return this.#serverTimings;
@@ -1837,6 +1866,14 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
     return this.#isAdRelated;
   }
 
+  setIsLinkPreload(isLinkPreload: boolean): void {
+    this.#isLinkPreload = isLinkPreload;
+  }
+
+  isLinkPreload(): boolean {
+    return this.#isLinkPreload;
+  }
+
   getAssociatedData(key: string): object|null {
     return this.#associatedData.get(key) || null;
   }

package/front_end/core/sdk/OverlayModel.ts

@@ -15,7 +15,7 @@ import {OverlayPersistentHighlighter} from './OverlayPersistentHighlighter.js';
 import type {RemoteObject} from './RemoteObject.js';
 import {SDKModel} from './SDKModel.js';
 import {Capability, type Target} from './Target.js';
-import {TargetManager} from './TargetManager.js';
+import type {TargetManager} from './TargetManager.js';
 
 const UIStrings = {
   /**
@@ -49,6 +49,19 @@ export interface Hinge {
   contentColor: HighlightColor;
   outlineColor: HighlightColor;
 }
+export interface BaseDisplayCutout {
+  width: number;
+  height: number;
+  x: number;
+  y: number;
+  shape: Protocol.Overlay.DisplayCutoutShape;
+  contentColor?: HighlightColor;
+}
+export type DisplayCutout =
+    BaseDisplayCutout&({shape: Protocol.Overlay.DisplayCutoutShape.Rectangle}|
+                       {shape: Protocol.Overlay.DisplayCutoutShape.Pill, borderRadius: number}|
+                       {shape: Protocol.Overlay.DisplayCutoutShape.Notch, upperRadius: number, lowerRadius: number}|
+                       {shape: Protocol.Overlay.DisplayCutoutShape.Circle, cx: number, cy: number, radius: number});
 
 export const enum EmulatedOSType {
   WINDOWS = 'Windows',
@@ -178,27 +191,27 @@ export class OverlayModel extends SDKModel<EventTypes> implements ProtocolProxyA
     }
   }
 
-  static hideDOMNodeHighlight(targetManager: TargetManager = TargetManager.instance()): void {
+  static hideDOMNodeHighlight(targetManager: TargetManager): void {
     for (const overlayModel of targetManager.models(OverlayModel)) {
       overlayModel.delayedHideHighlight(0);
     }
   }
 
-  static async muteHighlight(targetManager: TargetManager = TargetManager.instance()): Promise<void[]> {
+  static async muteHighlight(targetManager: TargetManager): Promise<void[]> {
     return await Promise.all(targetManager.models(OverlayModel).map(model => model.suspendModel()));
   }
 
-  static async unmuteHighlight(targetManager: TargetManager = TargetManager.instance()): Promise<void[]> {
+  static async unmuteHighlight(targetManager: TargetManager): Promise<void[]> {
     return await Promise.all(targetManager.models(OverlayModel).map(model => model.resumeModel()));
   }
 
-  static highlightRect(rect: HighlightRect, targetManager: TargetManager = TargetManager.instance()): void {
+  static highlightRect(rect: HighlightRect, targetManager: TargetManager): void {
     for (const overlayModel of targetManager.models(OverlayModel)) {
       void overlayModel.highlightRect(rect);
     }
   }
 
-  static clearHighlight(targetManager: TargetManager = TargetManager.instance()): void {
+  static clearHighlight(targetManager: TargetManager): void {
     for (const overlayModel of targetManager.models(OverlayModel)) {
       void overlayModel.clearHighlight();
     }
@@ -497,6 +510,32 @@ export class OverlayModel extends SDKModel<EventTypes> implements ProtocolProxyA
     }
   }
 
+  showDisplayCutout(cutout: DisplayCutout|null): void {
+    if (cutout) {
+      const {x, y, width, height, shape, contentColor} = cutout;
+      const displayCutoutConfig: Protocol.Overlay.DisplayCutoutConfig = {
+        rect: {x, y, width, height},
+        shape,
+        contentColor,
+      };
+      if (shape === Protocol.Overlay.DisplayCutoutShape.Pill) {
+        displayCutoutConfig.borderRadius = cutout.borderRadius;
+      } else if (shape === Protocol.Overlay.DisplayCutoutShape.Notch) {
+        displayCutoutConfig.upperRadius = cutout.upperRadius;
+        displayCutoutConfig.lowerRadius = cutout.lowerRadius;
+      } else if (shape === Protocol.Overlay.DisplayCutoutShape.Circle) {
+        displayCutoutConfig.cx = cutout.cx;
+        displayCutoutConfig.cy = cutout.cy;
+        displayCutoutConfig.radius = cutout.radius;
+      }
+      void this.overlayAgent.invoke_setShowDisplayCutout({
+        displayCutoutConfig,
+      });
+    } else {
+      void this.overlayAgent.invoke_setShowDisplayCutout({});
+    }
+  }
+
   setWindowControlsPlatform(selectedPlatform: EmulatedOSType): void {
     this.#windowControls.selectedPlatform = selectedPlatform;
   }

package/front_end/core/sdk/PageResourceLoader.ts

@@ -135,11 +135,13 @@ export class PageResourceLoader extends Common.ObjectWrapper.ObjectWrapper<Event
     loadOverride: null,
   }): PageResourceLoader {
     if (forceNew) {
+      /* eslint-disable @devtools/no-instance-of-migrated-singletons */
       Root.DevToolsContext.globalInstance().set(
           PageResourceLoader,
           new PageResourceLoader(
               targetManager ?? TargetManager.instance(), settings ?? Common.Settings.Settings.instance(),
               userAgentProvider ?? MultitargetNetworkManager.instance(), loadOverride, maxConcurrentLoads));
+      /* eslint-enable @devtools/no-instance-of-migrated-singletons */
     }
 
     return Root.DevToolsContext.globalInstance().get(PageResourceLoader);

package/front_end/core/sdk/ResourceTreeModel.ts

@@ -18,7 +18,7 @@ import {SDKModel} from './SDKModel.js';
 import {SecurityOriginManager} from './SecurityOriginManager.js';
 import {StorageKeyManager} from './StorageKeyManager.js';
 import {Capability, type Target, Type} from './Target.js';
-import {TargetManager} from './TargetManager.js';
+import type {TargetManager} from './TargetManager.js';
 
 export class ResourceTreeModel extends SDKModel<EventTypes> {
   readonly agent: ProtocolProxyApi.PageApi;
@@ -74,16 +74,16 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
     return request.frameId ? resourceTreeModel.frameForId(request.frameId) : null;
   }
 
-  static frames(): ResourceTreeFrame[] {
+  static frames(targetManager: TargetManager): ResourceTreeFrame[] {
     const result = [];
-    for (const resourceTreeModel of TargetManager.instance().models(ResourceTreeModel)) {
+    for (const resourceTreeModel of targetManager.models(ResourceTreeModel)) {
       result.push(...resourceTreeModel.frames());
     }
     return result;
   }
 
-  static resourceForURL(url: Platform.DevToolsPath.UrlString): Resource|null {
-    for (const resourceTreeModel of TargetManager.instance().models(ResourceTreeModel)) {
+  static resourceForURL(targetManager: TargetManager, url: Platform.DevToolsPath.UrlString): Resource|null {
+    for (const resourceTreeModel of targetManager.models(ResourceTreeModel)) {
       const mainFrame = resourceTreeModel.mainFrame;
       // Workers call into this with no #frames available.
       const result = mainFrame ? mainFrame.resourceForURL(url) : null;
@@ -94,8 +94,7 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
     return null;
   }
 
-  static reloadAllPages(bypassCache?: boolean, scriptToEvaluateOnLoad?: string,
-                        targetManager: TargetManager = TargetManager.instance()): void {
+  static reloadAllPages(targetManager: TargetManager, bypassCache?: boolean, scriptToEvaluateOnLoad?: string): void {
     for (const resourceTreeModel of targetManager.models(ResourceTreeModel)) {
       if (resourceTreeModel.target().parentTarget()?.type() !== Type.FRAME) {
         resourceTreeModel.reloadPage(bypassCache, scriptToEvaluateOnLoad);

package/front_end/core/sdk/ScreenCaptureModel.ts

@@ -145,9 +145,9 @@ export class ScreenCaptureModel extends SDKModel<void> implements ProtocolProxyA
         throw new Error('Unexpected or unspecified screnshotMode');
     }
 
-    await OverlayModel.muteHighlight();
+    await OverlayModel.muteHighlight(this.target().targetManager());
     const result = await this.#agent.invoke_captureScreenshot(properties);
-    await OverlayModel.unmuteHighlight();
+    await OverlayModel.unmuteHighlight(this.target().targetManager());
     return result.data;
   }