chrome-devtools-frontend 1.0.1660788 → 1.0.1662289

package/front_end/models/extensions/RecorderExtensionEndpoint.ts

@@ -6,22 +6,24 @@ import type * as Platform from '../../core/platform/platform.js';
 
 import {PrivateAPI} from './ExtensionAPI.js';
 import {ExtensionEndpoint} from './ExtensionEndpoint.js';
-import {RecorderPluginManager} from './RecorderPluginManager.js';
+import type {RecorderPluginManager} from './RecorderPluginManager.js';
 
 export class RecorderExtensionEndpoint extends ExtensionEndpoint {
   private readonly name: string;
   private readonly mediaType?: string;
   private readonly capabilities: PrivateAPI.RecordingExtensionPluginCapability[];
   readonly #extensionOrigin: Platform.DevToolsPath.UrlString;
+  readonly #recorderPluginManager: RecorderPluginManager;
 
-  constructor(
-      name: string, port: MessagePort, capabilities: PrivateAPI.RecordingExtensionPluginCapability[],
-      extensionOrigin: Platform.DevToolsPath.UrlString, mediaType?: string) {
+  constructor(name: string, port: MessagePort, capabilities: PrivateAPI.RecordingExtensionPluginCapability[],
+              extensionOrigin: Platform.DevToolsPath.UrlString, recorderPluginManager: RecorderPluginManager,
+              mediaType?: string) {
     super(port);
     this.name = name;
     this.mediaType = mediaType;
     this.capabilities = capabilities;
     this.#extensionOrigin = extensionOrigin;
+    this.#recorderPluginManager = recorderPluginManager;
   }
 
   getName(): string {
@@ -44,7 +46,7 @@ export class RecorderExtensionEndpoint extends ExtensionEndpoint {
     switch (event) {
       case PrivateAPI.RecorderExtensionPluginEvents.UnregisteredRecorderExtensionPlugin: {
         this.disconnect();
-        RecorderPluginManager.instance().removePlugin(this);
+        this.#recorderPluginManager.removePlugin(this);
         break;
       }
       default:

package/front_end/models/formatter/ScriptFormatter.ts

@@ -2,7 +2,7 @@
 // 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 * as Platform from '../../core/platform/platform.js';
 import type * as FormatterActions from '../../entrypoints/formatter_worker/FormatterActions.js';
 
@@ -30,28 +30,25 @@ export interface FormattedContent {
   formattedMapping: FormatterSourceMapping;
 }
 
-export async function format(
-    contentType: Common.ResourceType.ResourceType, mimeType: string, content: string,
-    indent: string =
-        Common.Settings.Settings.instance().moduleSetting('text-editor-indent').get()): Promise<FormattedContent> {
+export async function format(settings: Common.Settings.Settings, contentType: Common.ResourceType.ResourceType,
+                             mimeType: string, content: string, indent?: string): Promise<FormattedContent> {
   if (contentType.isDocumentOrScriptOrStyleSheet()) {
-    return await formatScriptContent(mimeType, content, indent);
+    return await formatScriptContent(settings, mimeType, content, indent);
   }
 
   return {formattedContent: content, formattedMapping: new IdentityFormatterSourceMapping()};
 }
 
-export async function formatScriptContent(
-    mimeType: string, content: string,
-    indent: string =
-        Common.Settings.Settings.instance().moduleSetting('text-editor-indent').get()): Promise<FormattedContent> {
+export async function formatScriptContent(settings: Common.Settings.Settings, mimeType: string, content: string,
+                                          indent?: string): Promise<FormattedContent> {
+  const indentString = indent ?? settings.moduleSetting('text-editor-indent').get();
   const originalContent = content.replace(/\r\n?|[\n\u2028\u2029]/g, '\n').replace(/^\uFEFF/, '');
 
   const pool = formatterWorkerPool();
 
   let formatResult: FormatterActions.FormatResult = {content: originalContent, mapping: {original: [], formatted: []}};
   try {
-    formatResult = await pool.format(mimeType, originalContent, indent);
+    formatResult = await pool.format(mimeType, originalContent, indentString);
   } catch {
   }
   const originalContentLineEndings = Platform.StringUtilities.findLineEndingIndexes(originalContent);

package/front_end/models/heap_snapshot/HeapSnapshotProxy.ts

@@ -11,6 +11,7 @@ import type * as HeapSnapshotModel from './HeapSnapshotModel.js';
 
 export class HeapSnapshotWorkerProxy extends Common.ObjectWrapper.ObjectWrapper<HeapSnapshotWorkerProxy.EventTypes> {
   readonly eventHandler: (arg0: string, arg1: string) => void;
+  #console: Common.Console.Console;
   nextObjectId = 1;
   nextCallId = 1;
   callbacks = new Map<number, (...args: any[]) => void>();
@@ -19,9 +20,14 @@ export class HeapSnapshotWorkerProxy extends Common.ObjectWrapper.ObjectWrapper<
   interval?: number;
   readonly workerUrl?: string;
 
-  constructor(eventHandler: (arg0: string, arg1: string) => void, workerUrl?: string) {
+  constructor(
+      eventHandler: (arg0: string, arg1: string) => void,
+      console: Common.Console.Console,
+      workerUrl?: string,
+  ) {
     super();
     this.eventHandler = eventHandler;
+    this.#console = console;
     this.workerUrl = workerUrl;
     this.worker = Platform.HostRuntime.HOST_RUNTIME.createWorker(
         workerUrl ?? import.meta.resolve('../../entrypoints/heap_snapshot_worker/heap_snapshot_worker-entrypoint.js'),
@@ -29,6 +35,10 @@ export class HeapSnapshotWorkerProxy extends Common.ObjectWrapper.ObjectWrapper<
     this.worker.onmessage = this.messageReceived.bind(this);
   }
 
+  get console(): Common.Console.Console {
+    return this.#console;
+  }
+
   createLoader(profileUid: number, snapshotReceivedCallback: (arg0: HeapSnapshotProxy) => void):
       HeapSnapshotLoaderProxy {
     const objectId = this.nextObjectId++;
@@ -159,9 +169,8 @@ export class HeapSnapshotWorkerProxy extends Common.ObjectWrapper.ObjectWrapper<
       return;
     }
     if (data.error) {
-      Common.Console.Console.instance().error(
-          `An error occurred when a call to method '${data.errorMethodName}' was requested`);
-      Common.Console.Console.instance().error(data['errorCallStack']);
+      this.#console.error(`An error occurred when a call to method '${data.errorMethodName}' was requested`);
+      this.#console.error(data['errorCallStack']);
       this.callbacks.delete(data.callId);
       return;
     }
@@ -238,7 +247,7 @@ export class HeapSnapshotLoaderProxy extends HeapSnapshotProxyObject implements
 
   async close(): Promise<void> {
     await this.callMethodPromise('close');
-    const secondWorker = new HeapSnapshotWorkerProxy(() => {}, this.worker.workerUrl);
+    const secondWorker = new HeapSnapshotWorkerProxy(() => {}, this.worker.console, this.worker.workerUrl);
     const channel = new MessageChannel();
     await secondWorker.setupForSecondaryInit(channel.port2);
     const snapshotProxy = await this.callFactoryMethodPromise('buildSnapshot', HeapSnapshotProxy, [channel.port1]);

package/front_end/models/issues_manager/CheckFormsIssuesTrigger.ts

@@ -3,20 +3,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 import type * as Common from '../../core/common/common.js';
+import * as Root from '../../core/root/root.js';
 import * as SDK from '../../core/sdk/sdk.js';
 
 /**
  * Responsible for asking autofill for current form issues. This currently happens when devtools is first open.
  */
 // TODO(crbug.com/1399414): Trigger check form issues when an element with an associated issue is editted in the issues panel.
-let checkFormsIssuesTriggerInstance: CheckFormsIssuesTrigger|null = null;
 export class CheckFormsIssuesTrigger {
-  constructor() {
-    SDK.TargetManager.TargetManager.instance().addModelListener(
-        SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.Load, this.#pageLoaded, this,
-        {scoped: true});
+  constructor(targetManager: SDK.TargetManager.TargetManager = SDK.TargetManager.TargetManager.instance()) {
+    targetManager.addModelListener(SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.Load,
+                                   this.#pageLoaded, this, {scoped: true});
 
-    for (const model of SDK.TargetManager.TargetManager.instance().models(SDK.ResourceTreeModel.ResourceTreeModel)) {
+    for (const model of targetManager.models(SDK.ResourceTreeModel.ResourceTreeModel)) {
       if (model.target().outermostTarget() !== model.target()) {
         continue;
       }
@@ -26,10 +25,10 @@ export class CheckFormsIssuesTrigger {
   }
 
   static instance({forceNew}: {forceNew: boolean} = {forceNew: false}): CheckFormsIssuesTrigger {
-    if (!checkFormsIssuesTriggerInstance || forceNew) {
-      checkFormsIssuesTriggerInstance = new CheckFormsIssuesTrigger();
+    if (!Root.DevToolsContext.globalInstance().has(CheckFormsIssuesTrigger) || forceNew) {
+      Root.DevToolsContext.globalInstance().set(CheckFormsIssuesTrigger, new CheckFormsIssuesTrigger());
     }
-    return checkFormsIssuesTriggerInstance;
+    return Root.DevToolsContext.globalInstance().get(CheckFormsIssuesTrigger);
   }
 
   // TODO(crbug.com/1399414): Handle response by dropping current issues in favor of new ones.

package/front_end/models/issues_manager/CookieIssue.ts

@@ -53,6 +53,15 @@ export const enum CookieStatus {
 }
 
 export class CookieIssue extends Issue<Protocol.Audits.CookieIssueDetails> {
+  readonly #frameManager: SDK.FrameManager.FrameManager;
+
+  constructor(code: string, issueDetails: Protocol.Audits.CookieIssueDetails,
+              issuesModel: SDK.IssuesModel.IssuesModel|null, issueId: Protocol.Audits.IssueId|undefined,
+              frameManager: SDK.FrameManager.FrameManager) {
+    super(code, issueDetails, issuesModel, issueId);
+    this.#frameManager = frameManager;
+  }
+
   cookieId(): string {
     const details = this.details();
     if (details.cookie) {
@@ -72,9 +81,10 @@ export class CookieIssue extends Issue<Protocol.Audits.CookieIssueDetails> {
   /**
    * Returns an array of issues from a given CookieIssueDetails.
    */
-  static createIssuesFromCookieIssueDetails(
-      cookieIssueDetails: Protocol.Audits.CookieIssueDetails, issuesModel: SDK.IssuesModel.IssuesModel|null,
-      issueId: Protocol.Audits.IssueId|undefined): CookieIssue[] {
+  static createIssuesFromCookieIssueDetails(cookieIssueDetails: Protocol.Audits.CookieIssueDetails,
+                                            issuesModel: SDK.IssuesModel.IssuesModel|null,
+                                            issueId: Protocol.Audits.IssueId|undefined,
+                                            frameManager: SDK.FrameManager.FrameManager): CookieIssue[] {
     const issues: CookieIssue[] = [];
 
     // Exclusion reasons have priority. It means a cookie was blocked. Create an issue
@@ -86,7 +96,7 @@ export class CookieIssue extends Issue<Protocol.Audits.CookieIssueDetails> {
             exclusionReason, cookieIssueDetails.cookieWarningReasons, cookieIssueDetails.operation,
             cookieIssueDetails.cookieUrl as Platform.DevToolsPath.UrlString | undefined);
         if (code) {
-          issues.push(new CookieIssue(code, cookieIssueDetails, issuesModel, issueId));
+          issues.push(new CookieIssue(code, cookieIssueDetails, issuesModel, issueId, frameManager));
         }
       }
       return issues;
@@ -99,7 +109,7 @@ export class CookieIssue extends Issue<Protocol.Audits.CookieIssueDetails> {
             warningReason, [], cookieIssueDetails.operation,
             cookieIssueDetails.cookieUrl as Platform.DevToolsPath.UrlString | undefined);
         if (code) {
-          issues.push(new CookieIssue(code, cookieIssueDetails, issuesModel, issueId));
+          issues.push(new CookieIssue(code, cookieIssueDetails, issuesModel, issueId, frameManager));
         }
       }
     }
@@ -223,7 +233,7 @@ export class CookieIssue extends Issue<Protocol.Audits.CookieIssueDetails> {
   }
 
   override isCausedByThirdParty(): boolean {
-    const outermostFrame = SDK.FrameManager.FrameManager.instance().getOutermostFrame();
+    const outermostFrame = this.#frameManager.getOutermostFrame();
     return isCausedByThirdParty(outermostFrame, this.details().cookieUrl, this.details().siteForCookies);
   }
 
@@ -257,15 +267,17 @@ export class CookieIssue extends Issue<Protocol.Audits.CookieIssueDetails> {
     return;
   }
 
-  static fromInspectorIssue(
-      issuesModel: SDK.IssuesModel.IssuesModel|null, inspectorIssue: Protocol.Audits.InspectorIssue): CookieIssue[] {
+  static fromInspectorIssue(issuesModel: SDK.IssuesModel.IssuesModel|null,
+                            inspectorIssue: Protocol.Audits.InspectorIssue,
+                            frameManager: SDK.FrameManager.FrameManager): CookieIssue[] {
     const cookieIssueDetails = inspectorIssue.details.cookieIssueDetails;
     if (!cookieIssueDetails) {
       console.warn('Cookie issue without details received.');
       return [];
     }
 
-    return CookieIssue.createIssuesFromCookieIssueDetails(cookieIssueDetails, issuesModel, inspectorIssue.issueId);
+    return CookieIssue.createIssuesFromCookieIssueDetails(cookieIssueDetails, issuesModel, inspectorIssue.issueId,
+                                                          frameManager);
   }
 
   static getSubCategory(code: string): CookieIssueSubCategory {

package/front_end/models/issues_manager/Issue.ts

@@ -2,7 +2,7 @@
 // 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 * as Host from '../../core/host/host.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import type * as Platform from '../../core/platform/platform.js';
@@ -49,7 +49,6 @@ export const enum IssueCategory {
   CONTENT_SECURITY_POLICY = 'ContentSecurityPolicy',
   LOW_TEXT_CONTRAST = 'LowTextContrast',
   CORS = 'Cors',
-  ATTRIBUTION_REPORTING = 'AttributionReporting',
   QUIRKS_MODE = 'QuirksMode',
   PERMISSION_ELEMENT = 'PermissionElement',
   SELECTIVE_PERMISSIONS_INTERVENTION = 'SelectivePermissionsIntervention',
@@ -112,8 +111,8 @@ export function unionIssueKind(a: IssueKind, b: IssueKind): IssueKind {
   return IssueKind.IMPROVEMENT;
 }
 
-export function getShowThirdPartyIssuesSetting(): Common.Settings.Setting<boolean> {
-  return Common.Settings.Settings.instance().createSetting('show-third-party-issues', true);
+export function getShowThirdPartyIssuesSetting(settings: Common.Settings.Settings): Common.Settings.Setting<boolean> {
+  return settings.createSetting('show-third-party-issues', true);
 }
 
 export interface AffectedElement {

package/front_end/models/issues_manager/IssueAggregator.ts

@@ -5,7 +5,6 @@
 import * as Common from '../../core/common/common.js';
 import type * as Protocol from '../../generated/protocol.js';
 
-import {AttributionReportingIssue} from './AttributionReportingIssue.js';
 import {ContentSecurityPolicyIssue} from './ContentSecurityPolicyIssue.js';
 import {CookieDeprecationMetadataIssue} from './CookieDeprecationMetadataIssue.js';
 import {CookieIssue} from './CookieIssue.js';
@@ -71,7 +70,6 @@ export class AggregatedIssue extends Issue {
   #selectivePermissionsInterventionIssues = new Set<SelectivePermissionsInterventionIssue>();
   #sharedArrayBufferIssues = new Set<SharedArrayBufferIssue>();
   #quirksModeIssues = new Set<QuirksModeIssue>();
-  #attributionReportingIssues = new Set<AttributionReportingIssue>();
   #genericIssues = new Set<GenericIssue>();
   #elementAccessibilityIssues = new Set<ElementAccessibilityIssue>();
   #representative?: Issue;
@@ -158,10 +156,6 @@ export class AggregatedIssue extends Issue {
     return this.#quirksModeIssues;
   }
 
-  getAttributionReportingIssues(): ReadonlySet<AttributionReportingIssue> {
-    return this.#attributionReportingIssues;
-  }
-
   getGenericIssues(): ReadonlySet<GenericIssue> {
     return this.#genericIssues;
   }
@@ -273,9 +267,6 @@ export class AggregatedIssue extends Issue {
     if (issue instanceof QuirksModeIssue) {
       this.#quirksModeIssues.add(issue);
     }
-    if (issue instanceof AttributionReportingIssue) {
-      this.#attributionReportingIssues.add(issue);
-    }
     if (issue instanceof GenericIssue) {
       this.#genericIssues.add(issue);
     }

package/front_end/models/issues_manager/IssueResolver.ts

@@ -6,7 +6,7 @@ import * as Common from '../../core/common/common.js';
 import type * as Protocol from '../../generated/protocol.js';
 
 import type {Issue} from './Issue.js';
-import {Events as IssueManagerEvents, type IssueAddedEvent, IssuesManager} from './IssuesManager.js';
+import {Events as IssueManagerEvents, type IssueAddedEvent, type IssuesManager} from './IssuesManager.js';
 
 /**
  * A class that facilitates resolving an issueId to an issue. See `ResolverBase` for more info.
@@ -15,7 +15,7 @@ export class IssueResolver extends Common.ResolverBase.ResolverBase<Protocol.Aud
   #issuesListener: Common.EventTarget.EventDescriptor|null = null;
   #issuesManager: IssuesManager;
 
-  constructor(issuesManager: IssuesManager = IssuesManager.instance()) {
+  constructor(issuesManager: IssuesManager) {
     super();
     this.#issuesManager = issuesManager;
   }