chrome-devtools-frontend 1.0.1657855 → 1.0.1661063

package/front_end/models/ai_assistance/data_formatters/UnitFormatters.ts

@@ -53,6 +53,18 @@ const byteFormatters = {
     ...defaultByteFormatterOptions,
     unit: 'kilobyte',
   }),
+  kilobytesDecimal: new Intl.NumberFormat('en-US', {
+    ...defaultByteFormatterOptions,
+    minimumFractionDigits: 1,
+    maximumFractionDigits: 1,
+    unit: 'kilobyte',
+  }),
+  kilobytesInteger: new Intl.NumberFormat('en-US', {
+    ...defaultByteFormatterOptions,
+    minimumFractionDigits: 0,
+    maximumFractionDigits: 0,
+    unit: 'kilobyte',
+  }),
   megabytes: new Intl.NumberFormat('en-US', {
     ...defaultByteFormatterOptions,
     unit: 'megabyte',
@@ -119,6 +131,14 @@ export function bytes(x: number): string {
   return formatAndEnsureSpace(byteFormatters.megabytes, megabytes);
 }
 
+export function formatBytesToKb(x: number): string {
+  const kilobytes = x / 1_000;
+  if (kilobytes < 100) {
+    return formatAndEnsureSpace(byteFormatters.kilobytesDecimal, kilobytes);
+  }
+  return formatAndEnsureSpace(byteFormatters.kilobytesInteger, kilobytes);
+}
+
 /**
  * When using 'narrow' unitDisplay, many locales exclude the space between the literal and the unit.
  * We don't like that, so when there is no space literal we inject the provided separator manually.

package/front_end/models/ai_assistance/performance/AICallTree.ts

@@ -5,6 +5,7 @@
 import type * as Protocol from '../../../generated/protocol.js';
 import * as Trace from '../../../models/trace/trace.js';
 import * as SourceMapsResolver from '../../../models/trace_source_maps_resolver/trace_source_maps_resolver.js';
+import * as Workspace from '../../../models/workspace/workspace.js';
 
 /** Iterates from a node down through its descendents. If the callback returns true, the loop stops. */
 function depthFirstWalk(
@@ -335,7 +336,8 @@ export class AICallTree {
     const selfTimeStr = roundToTenths(node.selfTime);
 
     // 6. URL Index
-    const location = SourceMapsResolver.SourceMapsResolver.codeLocationForEntry(parsedTrace, event);
+    const location = SourceMapsResolver.SourceMapsResolver.codeLocationForEntry(
+        parsedTrace, event, Workspace.Workspace.WorkspaceImpl.instance());
     const url = location?.url;
     let urlIndexStr = '';
     if (url) {

package/front_end/models/ai_assistance/tools/ListNetworkRequests.ts

@@ -9,6 +9,7 @@ import * as Logs from '../../logs/logs.js';
 import type {FunctionCallHandlerResult} from '../agents/AiAgent.js';
 import {isOpaqueOrigin} from '../AiOrigins.js';
 import {getRequestContextOrigin} from '../contexts/RequestContext.js';
+import {formatBytesToKb, seconds} from '../data_formatters/UnitFormatters.js';
 
 import {
   type BaseToolCapability,
@@ -96,8 +97,8 @@ export class ListNetworkRequestsTool implements
         id: request.requestId(),
         url: request.url(),
         statusCode: request.statusCode,
-        duration: i18n.TimeUtilities.secondsToString(request.duration),
-        transferSize: i18n.ByteUtilities.formatBytesToKb(request.transferSize),
+        duration: seconds(request.duration),
+        transferSize: formatBytesToKb(request.transferSize),
       });
       requestsToShow.push(request);
     }

package/front_end/models/autofill_manager/AutofillManager.ts

@@ -8,6 +8,7 @@ import * as SDK from '../../core/sdk/sdk.js';
 import type * as Protocol from '../../generated/protocol.js';
 
 export class AutofillManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
+  #targetManager: SDK.TargetManager.TargetManager;
   #address = '';
   #filledFields: Protocol.Autofill.FilledField[] = [];
   #matches: Match[] = [];
@@ -16,6 +17,7 @@ export class AutofillManager extends Common.ObjectWrapper.ObjectWrapper<EventTyp
 
   constructor(targetManager: SDK.TargetManager.TargetManager, frameManager: SDK.FrameManager.FrameManager) {
     super();
+    this.#targetManager = targetManager;
     this.#frameManager = frameManager;
     targetManager.addModelListener(SDK.AutofillModel.AutofillModel, SDK.AutofillModel.Events.ADDRESS_FORM_FILLED,
                                    this.#addressFormFilled, this, {scoped: true});
@@ -58,7 +60,7 @@ export class AutofillManager extends Common.ObjectWrapper.ObjectWrapper<EventTyp
   }
 
   clearHighlightedFilledFields(): void {
-    SDK.OverlayModel.OverlayModel.hideDOMNodeHighlight();
+    SDK.OverlayModel.OverlayModel.hideDOMNodeHighlight(this.#targetManager);
   }
 
   #processAddressFormFilledData({addressUi, filledFields}: Protocol.Autofill.AddressFormFilledEvent): void {

package/front_end/models/bindings/CompilerScriptMapping.ts

@@ -55,9 +55,9 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
     this.#debuggerModel = debuggerModel;
     this.#ignoreListManager = debuggerWorkspaceBinding.ignoreListManager;
 
-    this.#stubProject = new ContentProviderBasedProject(
-        workspace, 'jsSourceMaps:stub:' + debuggerModel.target().id(), Workspace.Workspace.projectTypes.Service, '',
-        true /* isServiceProject */);
+    this.#stubProject = new ContentProviderBasedProject(workspace, 'jsSourceMaps:stub:' + debuggerModel.target().id(),
+                                                        Workspace.Workspace.projectTypes.Service, '',
+                                                        true /* isServiceProject */, debuggerModel.target());
     this.#eventListeners = [
       this.#sourceMapManager.addEventListener(
           SDK.SourceMapManager.Events.SourceMapWillAttach, this.sourceMapWillAttach, this),
@@ -463,9 +463,8 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
     if (!project) {
       const projectType = script.isContentScript() ? Workspace.Workspace.projectTypes.ContentScripts :
                                                      Workspace.Workspace.projectTypes.Network;
-      project = new ContentProviderBasedProject(
-          this.#stubProject.workspace(), projectId, projectType, /* displayName */ '', /* isServiceProject */ false);
-      NetworkProject.setTargetForProject(project, target);
+      project = new ContentProviderBasedProject(this.#stubProject.workspace(), projectId, projectType,
+                                                /* displayName */ '', /* isServiceProject */ false, target);
       this.#projects.set(projectId, project);
     }
     this.#sourceMapToProject.set(sourceMap, project);
@@ -480,7 +479,8 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
       const contentProvider = content !== null ?
           TextUtils.StaticContentProvider.StaticContentProvider.fromString(url, contentType, content) :
           new SDK.CompilerSourceMappingContentProvider.CompilerSourceMappingContentProvider(
-              url, contentType, script.createPageResourceLoadInitiator());
+              url, contentType, script.createPageResourceLoadInitiator(),
+              target.targetManager().getPageResourceLoader());
       let metadata: Workspace.UISourceCode.UISourceCodeMetadata|null = null;
       if (content !== null) {
         const encoder = new TextEncoder();

package/front_end/models/bindings/ContentProviderBasedProject.ts

@@ -5,6 +5,7 @@
 import type * as Common from '../../core/common/common.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as Platform from '../../core/platform/platform.js';
+import type * as SDK from '../../core/sdk/sdk.js';
 import * as TextUtils from '../text_utils/text_utils.js';
 import * as Workspace from '../workspace/workspace.js';
 
@@ -26,10 +27,9 @@ interface UISourceCodeData {
 export class ContentProviderBasedProject extends Workspace.Workspace.ProjectStore {
   readonly #isServiceProject: boolean;
   readonly #uiSourceCodeToData = new WeakMap<Workspace.UISourceCode.UISourceCode, UISourceCodeData>();
-  constructor(
-      workspace: Workspace.Workspace.WorkspaceImpl, id: string, type: Workspace.Workspace.projectTypes,
-      displayName: string, isServiceProject: boolean) {
-    super(workspace, id, type, displayName);
+  constructor(workspace: Workspace.Workspace.WorkspaceImpl, id: string, type: Workspace.Workspace.projectTypes,
+              displayName: string, isServiceProject: boolean, target: SDK.Target.Target|null = null) {
+    super(workspace, id, type, displayName, target);
     this.#isServiceProject = isServiceProject;
     workspace.addProject(this);
   }

package/front_end/models/bindings/DebuggerLanguagePlugins.ts

@@ -1100,10 +1100,9 @@ class ModelData {
   project: ContentProviderBasedProject;
   readonly uiSourceCodeToScripts: Map<Workspace.UISourceCode.UISourceCode, SDK.Script.Script[]>;
   constructor(debuggerModel: SDK.DebuggerModel.DebuggerModel, workspace: Workspace.Workspace.WorkspaceImpl) {
-    this.project = new ContentProviderBasedProject(
-        workspace, 'language_plugins::' + debuggerModel.target().id(), Workspace.Workspace.projectTypes.Network, '',
-        false /* isServiceProject */);
-    NetworkProject.setTargetForProject(this.project, debuggerModel.target());
+    this.project = new ContentProviderBasedProject(workspace, 'language_plugins::' + debuggerModel.target().id(),
+                                                   Workspace.Workspace.projectTypes.Network, '',
+                                                   false /* isServiceProject */, debuggerModel.target());
 
     this.uiSourceCodeToScripts = new Map();
   }
@@ -1126,7 +1125,8 @@ class ModelData {
         this.uiSourceCodeToScripts.set(uiSourceCode, [script]);
 
         const contentProvider = new SDK.CompilerSourceMappingContentProvider.CompilerSourceMappingContentProvider(
-            url, Common.ResourceType.resourceTypes.SourceMapScript, initiator);
+            url, Common.ResourceType.resourceTypes.SourceMapScript, initiator,
+            script.target().targetManager().getPageResourceLoader());
         const mimeType = Common.ResourceType.ResourceType.mimeFromURL(url) || 'text/javascript';
         this.project.addUISourceCodeWithProvider(uiSourceCode, contentProvider, null, mimeType);
       } else {

package/front_end/models/bindings/DefaultScriptMapping.ts

@@ -23,9 +23,9 @@ export class DefaultScriptMapping implements DebuggerSourceMapping {
       debuggerWorkspaceBinding: DebuggerWorkspaceBinding) {
     defaultScriptMappings.add(this);
     this.#debuggerWorkspaceBinding = debuggerWorkspaceBinding;
-    this.#project = new ContentProviderBasedProject(
-        workspace, 'debugger:' + debuggerModel.target().id(), Workspace.Workspace.projectTypes.Debugger, '',
-        true /* isServiceProject */);
+    this.#project = new ContentProviderBasedProject(workspace, 'debugger:' + debuggerModel.target().id(),
+                                                    Workspace.Workspace.projectTypes.Debugger, '',
+                                                    true /* isServiceProject */, debuggerModel.target());
     this.#eventListeners = [
       debuggerModel.addEventListener(SDK.DebuggerModel.Events.GlobalObjectCleared, this.globalObjectCleared, this),
       debuggerModel.addEventListener(SDK.DebuggerModel.Events.ParsedScriptSource, this.parsedScriptSource, this),

package/front_end/models/bindings/NetworkProject.ts

@@ -12,7 +12,6 @@ const uiSourceCodeToAttributionMap = new WeakMap<Workspace.UISourceCode.UISource
                                                    frame: SDK.ResourceTreeModel.ResourceTreeFrame,
                                                    count: number,
                                                  }>>();
-const projectToTargetMap = new WeakMap<Workspace.Workspace.Project, SDK.Target.Target>();
 
 export class NetworkProjectManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
 
@@ -25,6 +24,10 @@ export class NetworkProjectManager extends Common.ObjectWrapper.ObjectWrapper<Ev
 
     return Root.DevToolsContext.globalInstance().get(NetworkProjectManager);
   }
+
+  static removeInstance(): void {
+    Root.DevToolsContext.globalInstance().delete(NetworkProjectManager);
+  }
 }
 
 export const enum Events {
@@ -128,15 +131,7 @@ export class NetworkProject {
   }
 
   static targetForUISourceCode(uiSourceCode: Workspace.UISourceCode.UISourceCode): SDK.Target.Target|null {
-    return projectToTargetMap.get(uiSourceCode.project()) || null;
-  }
-
-  static setTargetForProject(project: Workspace.Workspace.Project, target: SDK.Target.Target): void {
-    projectToTargetMap.set(project, target);
-  }
-
-  static getTargetForProject(project: Workspace.Workspace.Project): SDK.Target.Target|null {
-    return projectToTargetMap.get(project) || null;
+    return uiSourceCode.project().target();
   }
 
   static framesForUISourceCode(uiSourceCode: Workspace.UISourceCode.UISourceCode):

package/front_end/models/bindings/PresentationConsoleMessageHelper.ts

@@ -67,7 +67,8 @@ export class PresentationConsoleMessageManager {
     SDK.TargetManager.TargetManager.instance().addModelListener(
         SDK.ConsoleModel.ConsoleModel, SDK.ConsoleModel.Events.MessageAdded,
         event => this.consoleMessageAdded(event.data));
-    SDK.ConsoleModel.ConsoleModel.allMessagesUnordered().forEach(this.consoleMessageAdded, this);
+    SDK.ConsoleModel.ConsoleModel.allMessagesUnordered(SDK.TargetManager.TargetManager.instance())
+        .forEach(this.consoleMessageAdded, this);
     SDK.TargetManager.TargetManager.instance().addModelListener(
         SDK.ConsoleModel.ConsoleModel, SDK.ConsoleModel.Events.ConsoleCleared,
         () => this.#sourceFrameMessageManager.clear());

package/front_end/models/bindings/ResourceMapping.ts

@@ -361,10 +361,9 @@ class ModelInfo {
   constructor(resourceMapping: ResourceMapping, resourceTreeModel: SDK.ResourceTreeModel.ResourceTreeModel) {
     const target = resourceTreeModel.target();
     this.resourceMapping = resourceMapping;
-    this.project = new ContentProviderBasedProject(
-        resourceMapping.workspace, 'resources:' + target.id(), Workspace.Workspace.projectTypes.Network, '',
-        false /* isServiceProject */);
-    NetworkProject.setTargetForProject(this.project, target);
+    this.project = new ContentProviderBasedProject(resourceMapping.workspace, 'resources:' + target.id(),
+                                                   Workspace.Workspace.projectTypes.Network, '',
+                                                   false /* isServiceProject */, target);
 
     const cssModel = target.model(SDK.CSSModel.CSSModel);
     console.assert(Boolean(cssModel));

package/front_end/models/bindings/ResourceScriptMapping.ts

@@ -73,9 +73,8 @@ export class ResourceScriptMapping implements DebuggerSourceMapping {
     if (!project) {
       const projectType = script.isContentScript() ? Workspace.Workspace.projectTypes.ContentScripts :
                                                      Workspace.Workspace.projectTypes.Network;
-      project = new ContentProviderBasedProject(
-          this.#workspace, projectId, projectType, '' /* displayName */, false /* isServiceProject */);
-      NetworkProject.setTargetForProject(project, this.debuggerModel.target());
+      project = new ContentProviderBasedProject(this.#workspace, projectId, projectType, '' /* displayName */,
+                                                false /* isServiceProject */, this.debuggerModel.target());
       this.#projects.set(projectId, project);
     }
     return project;

package/front_end/models/bindings/ResourceUtils.ts

@@ -39,7 +39,7 @@ import type * as Protocol from '../../generated/protocol.js';
 import * as Workspace from '../workspace/workspace.js';
 
 export function resourceForURL(url: Platform.DevToolsPath.UrlString): SDK.Resource.Resource|null {
-  return SDK.ResourceTreeModel.ResourceTreeModel.resourceForURL(url);
+  return SDK.ResourceTreeModel.ResourceTreeModel.resourceForURL(SDK.TargetManager.TargetManager.instance(), url);
 }
 
 export function displayNameForURL(url: Platform.DevToolsPath.UrlString): string {

package/front_end/models/bindings/SASSSourceMapping.ts

@@ -26,10 +26,9 @@ export class SASSSourceMapping implements SourceMapping {
       workspace: Workspace.Workspace.WorkspaceImpl, cssWorkspaceBinding: CSSWorkspaceBinding) {
     this.#sourceMapManager = sourceMapManager;
     this.#cssWorkspaceBinding = cssWorkspaceBinding;
-    this.#project = new ContentProviderBasedProject(
-        workspace, 'cssSourceMaps:' + target.id(), Workspace.Workspace.projectTypes.Network, '',
-        false /* isServiceProject */);
-    NetworkProject.setTargetForProject(this.#project, target);
+    this.#project = new ContentProviderBasedProject(workspace, 'cssSourceMaps:' + target.id(),
+                                                    Workspace.Workspace.projectTypes.Network, '',
+                                                    false /* isServiceProject */, target);
 
     this.#bindings = new Map();
 
@@ -55,7 +54,8 @@ export class SASSSourceMapping implements SourceMapping {
     for (const sourceURL of sourceMap.sourceURLs()) {
       let binding = bindings.get(sourceURL);
       if (!binding) {
-        binding = new Binding(project, sourceURL, header.createPageResourceLoadInitiator());
+        binding = new Binding(project, sourceURL, header.createPageResourceLoadInitiator(),
+                              header.cssModel().target().targetManager().getPageResourceLoader());
         bindings.set(sourceURL, binding);
       }
       binding.addSourceMap(sourceMap, header.frameId);
@@ -151,15 +151,17 @@ class Binding {
   readonly #project: ContentProviderBasedProject;
   readonly #url: Platform.DevToolsPath.UrlString;
   readonly #initiator: SDK.PageResourceLoader.PageResourceLoadInitiator;
+  readonly #pageResourceLoader: SDK.PageResourceLoader.PageResourceLoader;
   referringSourceMaps: SDK.SourceMap.SourceMap[];
   uiSourceCode: Workspace.UISourceCode.UISourceCode|null;
 
-  constructor(
-      project: ContentProviderBasedProject, url: Platform.DevToolsPath.UrlString,
-      initiator: SDK.PageResourceLoader.PageResourceLoadInitiator) {
+  constructor(project: ContentProviderBasedProject, url: Platform.DevToolsPath.UrlString,
+              initiator: SDK.PageResourceLoader.PageResourceLoadInitiator,
+              pageResourceLoader: SDK.PageResourceLoader.PageResourceLoader) {
     this.#project = project;
     this.#url = url;
     this.#initiator = initiator;
+    this.#pageResourceLoader = pageResourceLoader;
 
     this.referringSourceMaps = [];
     this.uiSourceCode = null;
@@ -173,7 +175,7 @@ class Binding {
     const contentProvider = embeddedContent !== null ?
         TextUtils.StaticContentProvider.StaticContentProvider.fromString(this.#url, contentType, embeddedContent) :
         new SDK.CompilerSourceMappingContentProvider.CompilerSourceMappingContentProvider(
-            this.#url, contentType, this.#initiator);
+            this.#url, contentType, this.#initiator, this.#pageResourceLoader);
     const newUISourceCode = this.#project.createUISourceCode(this.#url, contentType);
     uiSourceCodeToBinding.set(newUISourceCode, this);
     const mimeType = Common.ResourceType.ResourceType.mimeFromURL(this.#url) || contentType.canonicalMimeType();

package/front_end/models/bindings/StylesSourceMapping.ts

@@ -24,9 +24,9 @@ export class StylesSourceMapping implements SourceMapping {
   constructor(cssModel: SDK.CSSModel.CSSModel, workspace: Workspace.Workspace.WorkspaceImpl) {
     this.#cssModel = cssModel;
     const target = this.#cssModel.target();
-    this.#project = new ContentProviderBasedProject(
-        workspace, 'css:' + target.id(), Workspace.Workspace.projectTypes.Network, '', false /* isServiceProject */);
-    NetworkProject.setTargetForProject(this.#project, target);
+    this.#project =
+        new ContentProviderBasedProject(workspace, 'css:' + target.id(), Workspace.Workspace.projectTypes.Network, '',
+                                        false /* isServiceProject */, target);
 
     this.#eventListeners = [
       this.#cssModel.addEventListener(SDK.CSSModel.Events.StyleSheetAdded, this.styleSheetAdded, this),

package/front_end/models/bindings/TempFile.ts

@@ -2,12 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import * as Common from '../../core/common/common.js';
+import type * as Common from '../../core/common/common.js';
 
 import {ChunkedFileReader, type ChunkedReader} from './FileUtils.js';
 
 export class TempFile {
   #lastBlob: Blob|null = null;
+  readonly #console: Common.Console.Console;
+
+  constructor(console: Common.Console.Console) {
+    this.#console = console;
+  }
 
   write(pieces: Array<string|Blob>): void {
     if (this.#lastBlob) {
@@ -26,7 +31,7 @@ export class TempFile {
 
   async readRange(startOffset?: number, endOffset?: number): Promise<string|null> {
     if (!this.#lastBlob) {
-      Common.Console.Console.instance().error('Attempt to read a temp file that was never written');
+      this.#console.error('Attempt to read a temp file that was never written');
       return '';
     }
     const blob = typeof startOffset === 'number' || typeof endOffset === 'number' ?
@@ -41,7 +46,7 @@ export class TempFile {
         reader.readAsText(blob);
       });
     } catch (error) {
-      Common.Console.Console.instance().error('Failed to read from temp file: ' + error.message);
+      this.#console.error('Failed to read from temp file: ' + error.message);
     }
 
     return reader.result as string | null;