chrome-devtools-frontend 1.0.1660788 → 1.0.1662289

package/front_end/models/issues_manager/IssuesManager.ts

@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 import * as Common from '../../core/common/common.js';
+import * as Root from '../../core/root/root.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import * as Protocol from '../../generated/protocol.js';
 
-import {AttributionReportingIssue} from './AttributionReportingIssue.js';
 import {BounceTrackingIssue} from './BounceTrackingIssue.js';
 import {ClientHintIssue} from './ClientHintIssue.js';
 import {ConnectionAllowlistIssue} from './ConnectionAllowlistIssue.js';
@@ -38,8 +38,6 @@ import {UnencodedDigestIssue} from './UnencodedDigestIssue.js';
 
 export {Events} from './IssuesManagerEvents.js';
 
-let issuesManagerInstance: IssuesManager|null = null;
-
 function createIssuesForBlockedByResponseIssue(
     issuesModel: SDK.IssuesModel.IssuesModel|null,
     inspectorIssue: Protocol.Audits.InspectorIssue): CrossOriginEmbedderPolicyIssue[] {
@@ -54,111 +52,109 @@ function createIssuesForBlockedByResponseIssue(
   return [];
 }
 
-const issueCodeHandlers = new Map<
-    Protocol.Audits.InspectorIssueCode,
-    (model: SDK.IssuesModel.IssuesModel|null, inspectorIssue: Protocol.Audits.InspectorIssue) => Issue[]>([
-  [
-    Protocol.Audits.InspectorIssueCode.CookieIssue,
-    CookieIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.MixedContentIssue,
-    MixedContentIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.HeavyAdIssue,
-    HeavyAdIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.ContentSecurityPolicyIssue,
-    ContentSecurityPolicyIssue.fromInspectorIssue,
-  ],
-  [Protocol.Audits.InspectorIssueCode.BlockedByResponseIssue, createIssuesForBlockedByResponseIssue],
-  [
-    Protocol.Audits.InspectorIssueCode.SharedArrayBufferIssue,
-    SharedArrayBufferIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.SharedDictionaryIssue,
-    SharedDictionaryIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.CorsIssue,
-    CorsIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.QuirksModeIssue,
-    QuirksModeIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.AttributionReportingIssue,
-    AttributionReportingIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.GenericIssue,
-    GenericIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.DeprecationIssue,
-    DeprecationIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.ClientHintIssue,
-    ClientHintIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.EmailVerificationRequestIssue,
-    EmailVerificationRequestIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.FederatedAuthRequestIssue,
-    FederatedAuthRequestIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.BounceTrackingIssue,
-    BounceTrackingIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.StylesheetLoadingIssue,
-    StylesheetLoadingIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.PartitioningBlobURLIssue,
-    PartitioningBlobURLIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.PropertyRuleIssue,
-    PropertyRuleIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.CookieDeprecationMetadataIssue,
-    CookieDeprecationMetadataIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.ElementAccessibilityIssue,
-    ElementAccessibilityIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.SRIMessageSignatureIssue,
-    SRIMessageSignatureIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.UnencodedDigestIssue,
-    UnencodedDigestIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.ConnectionAllowlistIssue,
-    ConnectionAllowlistIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.PermissionElementIssue,
-    PermissionElementIssue.fromInspectorIssue,
-  ],
-  [
-    Protocol.Audits.InspectorIssueCode.SelectivePermissionsInterventionIssue,
-    SelectivePermissionsInterventionIssue.fromInspectorIssue,
-  ],
-]);
+const issueCodeHandlers =
+    new Map<Protocol.Audits.InspectorIssueCode,
+            (model: SDK.IssuesModel.IssuesModel|null, inspectorIssue: Protocol.Audits.InspectorIssue,
+             frameManager: SDK.FrameManager.FrameManager) => Issue[]>(
+        [
+          [
+            Protocol.Audits.InspectorIssueCode.CookieIssue,
+            CookieIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.MixedContentIssue,
+            MixedContentIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.HeavyAdIssue,
+            HeavyAdIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.ContentSecurityPolicyIssue,
+            ContentSecurityPolicyIssue.fromInspectorIssue,
+          ],
+          [Protocol.Audits.InspectorIssueCode.BlockedByResponseIssue, createIssuesForBlockedByResponseIssue],
+          [
+            Protocol.Audits.InspectorIssueCode.SharedArrayBufferIssue,
+            SharedArrayBufferIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.SharedDictionaryIssue,
+            SharedDictionaryIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.CorsIssue,
+            CorsIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.QuirksModeIssue,
+            QuirksModeIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.GenericIssue,
+            GenericIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.DeprecationIssue,
+            DeprecationIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.ClientHintIssue,
+            ClientHintIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.EmailVerificationRequestIssue,
+            EmailVerificationRequestIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.FederatedAuthRequestIssue,
+            FederatedAuthRequestIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.BounceTrackingIssue,
+            BounceTrackingIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.StylesheetLoadingIssue,
+            StylesheetLoadingIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.PartitioningBlobURLIssue,
+            PartitioningBlobURLIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.PropertyRuleIssue,
+            PropertyRuleIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.CookieDeprecationMetadataIssue,
+            CookieDeprecationMetadataIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.ElementAccessibilityIssue,
+            ElementAccessibilityIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.SRIMessageSignatureIssue,
+            SRIMessageSignatureIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.UnencodedDigestIssue,
+            UnencodedDigestIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.ConnectionAllowlistIssue,
+            ConnectionAllowlistIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.PermissionElementIssue,
+            PermissionElementIssue.fromInspectorIssue,
+          ],
+          [
+            Protocol.Audits.InspectorIssueCode.SelectivePermissionsInterventionIssue,
+            SelectivePermissionsInterventionIssue.fromInspectorIssue,
+          ],
+        ]);
 
 export function isIssueCodeSupported(code: Protocol.Audits.InspectorIssueCode): boolean {
   return issueCodeHandlers.has(code);
@@ -169,10 +165,11 @@ export function isIssueCodeSupported(code: Protocol.Audits.InspectorIssueCode):
  * Handlers are simple functions hard-coded into a map.
  */
 export function createIssuesFromProtocolIssue(
-    issuesModel: SDK.IssuesModel.IssuesModel|null, inspectorIssue: Protocol.Audits.InspectorIssue): Issue[] {
+    issuesModel: SDK.IssuesModel.IssuesModel|null, inspectorIssue: Protocol.Audits.InspectorIssue,
+    frameManager: SDK.FrameManager.FrameManager = SDK.FrameManager.FrameManager.instance()): Issue[] {
   const handler = issueCodeHandlers.get(inspectorIssue.code);
   if (handler) {
-    return handler(issuesModel, inspectorIssue);
+    return handler(issuesModel, inspectorIssue, frameManager);
   }
   console.warn(`No handler registered for issue code ${inspectorIssue.code}`);
   return [];
@@ -199,9 +196,9 @@ export function defaultHideIssueByCodeSetting(): HideIssueMenuSetting {
   return setting;
 }
 
-export function getHideIssueByCodeSetting(): Common.Settings.Setting<HideIssueMenuSetting> {
-  return Common.Settings.Settings.instance().createSetting(
-      'hide-issue-by-code-setting-experiment-2021', defaultHideIssueByCodeSetting());
+export function getHideIssueByCodeSetting(settings: Common.Settings.Settings = Common.Settings.Settings.instance()):
+    Common.Settings.Setting<HideIssueMenuSetting> {
+  return settings.createSetting('hide-issue-by-code-setting-experiment-2021', defaultHideIssueByCodeSetting());
 }
 
 /**
@@ -226,17 +223,20 @@ export class IssuesManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes
   #issuesById = new Map<string, Issue>();
   #issuesByOutermostTarget: WeakMap<SDK.Target.Target, Set<Issue>> = new Map();
   #frameManager: SDK.FrameManager.FrameManager;
+  #targetManager: SDK.TargetManager.TargetManager;
 
   constructor(private readonly showThirdPartyIssuesSetting?: Common.Settings.Setting<boolean>,
               private readonly hideIssueSetting?: Common.Settings.Setting<HideIssueMenuSetting>,
-              frameManager: SDK.FrameManager.FrameManager = SDK.FrameManager.FrameManager.instance()) {
+              frameManager: SDK.FrameManager.FrameManager = SDK.FrameManager.FrameManager.instance(),
+              targetManager: SDK.TargetManager.TargetManager = SDK.TargetManager.TargetManager.instance()) {
     super();
     this.#frameManager = frameManager;
+    this.#targetManager = targetManager;
     new SourceFrameIssuesManager(this);
-    SDK.TargetManager.TargetManager.instance().observeModels(SDK.IssuesModel.IssuesModel, this);
-    SDK.TargetManager.TargetManager.instance().addModelListener(
-        SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.PrimaryPageChanged,
-        this.#onPrimaryPageChanged, this);
+    this.#targetManager.observeModels(SDK.IssuesModel.IssuesModel, this);
+    this.#targetManager.addModelListener(SDK.ResourceTreeModel.ResourceTreeModel,
+                                         SDK.ResourceTreeModel.Events.PrimaryPageChanged, this.#onPrimaryPageChanged,
+                                         this);
     this.#frameManager.addEventListener(SDK.FrameManager.Events.FRAME_ADDED_TO_TARGET, this.#onFrameAddedToTarget,
                                         this);
 
@@ -244,37 +244,36 @@ export class IssuesManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes
     // a full update when the setting changes to get an up-to-date issues list.
     this.showThirdPartyIssuesSetting?.addChangeListener(() => this.#updateFilteredIssues());
     this.hideIssueSetting?.addChangeListener(() => this.#updateFilteredIssues());
-    SDK.TargetManager.TargetManager.instance().observeTargets(
-        {
-          targetAdded: (target: SDK.Target.Target) => {
-            if (target.outermostTarget() === target) {
-              this.#updateFilteredIssues();
-            }
-          },
-          targetRemoved: (_: SDK.Target.Target) => {},
-        },
-        {scoped: true});
+    this.#targetManager.observeTargets({
+      targetAdded: (target: SDK.Target.Target) => {
+        if (target.outermostTarget() === target) {
+          this.#updateFilteredIssues();
+        }
+      },
+      targetRemoved: (_: SDK.Target.Target) => {},
+    },
+                                       {scoped: true});
   }
 
   static instance(opts: IssuesManagerCreationOptions = {
     forceNew: false,
     ensureFirst: false,
   }): IssuesManager {
-    if (issuesManagerInstance && opts.ensureFirst) {
+    if (Root.DevToolsContext.globalInstance().has(IssuesManager) && opts.ensureFirst) {
       throw new Error(
           'IssuesManager was already created. Either set "ensureFirst" to false or make sure that this invocation is really the first one.');
     }
 
-    if (!issuesManagerInstance || opts.forceNew) {
-      issuesManagerInstance =
-          new IssuesManager(opts.showThirdPartyIssuesSetting, opts.hideIssueSetting, opts.frameManager);
+    if (!Root.DevToolsContext.globalInstance().has(IssuesManager) || opts.forceNew) {
+      Root.DevToolsContext.globalInstance().set(
+          IssuesManager, new IssuesManager(opts.showThirdPartyIssuesSetting, opts.hideIssueSetting, opts.frameManager));
     }
 
-    return issuesManagerInstance;
+    return Root.DevToolsContext.globalInstance().get(IssuesManager);
   }
 
   static removeInstance(): void {
-    issuesManagerInstance = null;
+    Root.DevToolsContext.globalInstance().delete(IssuesManager);
   }
 
   #onPrimaryPageChanged(
@@ -311,7 +310,7 @@ export class IssuesManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes
     // When DevTools is opened after navigation has completed, issues may be received
     // before the outermost frame is available. Thus, we trigger a recalcuation of third-party-ness
     // when we attach to the outermost frame.
-    if (frame.isOutermostFrame() && SDK.TargetManager.TargetManager.instance().isInScope(frame.resourceTreeModel())) {
+    if (frame.isOutermostFrame() && this.#targetManager.isInScope(frame.resourceTreeModel())) {
       this.#updateFilteredIssues();
     }
   }
@@ -331,7 +330,7 @@ export class IssuesManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes
   #onIssueAddedEvent(event: Common.EventTarget.EventTargetEvent<SDK.IssuesModel.IssueAddedEvent>): void {
     const {issuesModel, inspectorIssue} = event.data;
 
-    const issues = createIssuesFromProtocolIssue(issuesModel, inspectorIssue);
+    const issues = createIssuesFromProtocolIssue(issuesModel, inspectorIssue, this.#frameManager);
     for (const issue of issues) {
       this.addIssue(issuesModel, issue);
       const message = issue.maybeCreateConsoleMessage();
@@ -425,7 +424,7 @@ export class IssuesManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes
   }
 
   #issueFilter(issue: Issue): boolean {
-    const scopeTarget = SDK.TargetManager.TargetManager.instance().scopeTarget();
+    const scopeTarget = this.#targetManager.scopeTarget();
     if (!scopeTarget) {
       return false;
     }

package/front_end/models/issues_manager/RelatedIssue.ts

@@ -6,7 +6,7 @@ import * as Common from '../../core/common/common.js';
 import * as SDK from '../../core/sdk/sdk.js';
 
 import type {Issue, IssueCategory} from './Issue.js';
-import {IssuesManager} from './IssuesManager.js';
+import type {IssuesManager} from './IssuesManager.js';
 
 export type IssuesAssociatable = Readonly<SDK.NetworkRequest.NetworkRequest>|SDK.Cookie.Cookie|string;
 
@@ -45,24 +45,26 @@ export function issuesAssociatedWith(issues: Issue[], obj: IssuesAssociatable):
   throw new Error(`issues can not be associated with ${JSON.stringify(obj)}`);
 }
 
-export function hasIssues(obj: IssuesAssociatable): boolean {
-  const issues = Array.from(IssuesManager.instance().issues());
+export function hasIssues(obj: IssuesAssociatable, issuesManager: IssuesManager): boolean {
+  const issues = Array.from(issuesManager.issues());
   return issuesAssociatedWith(issues, obj).length > 0;
 }
 
-export function hasIssueOfCategory(obj: IssuesAssociatable, category: IssueCategory): boolean {
-  const issues = Array.from(IssuesManager.instance().issues());
+export function hasIssueOfCategory(obj: IssuesAssociatable, category: IssueCategory,
+                                   issuesManager: IssuesManager): boolean {
+  const issues = Array.from(issuesManager.issues());
   return issuesAssociatedWith(issues, obj).some(issue => issue.getCategory() === category);
 }
 
-export async function reveal(obj: IssuesAssociatable, category?: IssueCategory): Promise<void|undefined> {
+export async function reveal(obj: IssuesAssociatable, issuesManager: IssuesManager,
+                             category?: IssueCategory): Promise<void|undefined> {
   if (typeof obj === 'string') {
-    const issue = IssuesManager.instance().getIssueById(obj);
+    const issue = issuesManager.getIssueById(obj);
     if (issue) {
       return await Common.Revealer.reveal(issue);
     }
   }
-  const issues = Array.from(IssuesManager.instance().issues());
+  const issues = Array.from(issuesManager.issues());
   const candidates = issuesAssociatedWith(issues, obj).filter(issue => !category || issue.getCategory() === category);
   if (candidates.length > 0) {
     return await Common.Revealer.reveal(candidates[0]);

package/front_end/models/issues_manager/issues_manager.ts

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import * as AttributionReportingIssue from './AttributionReportingIssue.js';
 import * as CheckFormsIssuesTrigger from './CheckFormsIssuesTrigger.js';
 import * as ClientHintIssue from './ClientHintIssue.js';
 import * as ConnectionAllowlistIssue from './ConnectionAllowlistIssue.js';
@@ -37,7 +36,6 @@ import * as StylesheetLoadingIssue from './StylesheetLoadingIssue.js';
 import * as UnencodedDigestIssue from './UnencodedDigestIssue.js';
 
 export {
-  AttributionReportingIssue,
   CheckFormsIssuesTrigger,
   ClientHintIssue,
   ConnectionAllowlistIssue,

package/front_end/models/javascript_metadata/NativeFunctions.js

@@ -8292,7 +8292,7 @@ export const NativeFunctions = [
   },
   {
     name: "setAttributionReporting",
-    signatures: [["attributionReporting"]]
+    signatures: [["options"]]
   },
   {
     name: "Worker",

package/front_end/models/logs/RequestResolver.ts

@@ -6,7 +6,7 @@ import * as Common from '../../core/common/common.js';
 import type * as SDK from '../../core/sdk/sdk.js';
 import type * as Protocol from '../../generated/protocol.js';
 
-import {Events as NetworkLogEvents, NetworkLog} from './NetworkLog.js';
+import {Events as NetworkLogEvents, type NetworkLog} from './NetworkLog.js';
 
 /**
  * A class that facilitates resolving a requestId to a network request. If the requestId does not resolve, a listener
@@ -22,7 +22,7 @@ export class RequestResolver extends
   private networkListener: Common.EventTarget.EventDescriptor|null = null;
   private networkLog: NetworkLog;
 
-  constructor(networkLog: NetworkLog = NetworkLog.instance()) {
+  constructor(networkLog: NetworkLog) {
     super();
     this.networkLog = networkLog;
   }

package/front_end/models/source_map_scopes/FunctionCodeResolver.ts

@@ -2,6 +2,7 @@
 // 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 type * as Platform from '../../core/platform/platform.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import * as Bindings from '../bindings/bindings.js';
@@ -41,8 +42,9 @@ interface InputData {
 
 const inputCache = new WeakMap<Workspace.UISourceCode.UISourceCode, Promise<InputData>>();
 
-async function prepareInput(uiSourceCode: Workspace.UISourceCode.UISourceCode, content: string): Promise<InputData> {
-  const formattedContent = await format(uiSourceCode, content);
+async function prepareInput(uiSourceCode: Workspace.UISourceCode.UISourceCode, content: string,
+                            settings: Common.Settings.Settings): Promise<InputData> {
+  const formattedContent = await format(uiSourceCode, content, settings);
   const text = new TextUtils.Text.Text(formattedContent ? formattedContent.formattedContent : content);
   let performanceData = uiSourceCode.getDecorationData(Workspace.UISourceCode.DecoratorType.PERFORMANCE) as
           Workspace.UISourceCode.LineColumnProfileMap |
@@ -59,14 +61,14 @@ async function prepareInput(uiSourceCode: Workspace.UISourceCode.UISourceCode, c
 }
 
 /** Formatting and parsing line endings for Text is expensive, so cache it. */
-async function prepareInputAndCache(
-    uiSourceCode: Workspace.UISourceCode.UISourceCode, content: string): Promise<InputData> {
+async function prepareInputAndCache(uiSourceCode: Workspace.UISourceCode.UISourceCode, content: string,
+                                    settings: Common.Settings.Settings): Promise<InputData> {
   let cachedPromise = inputCache.get(uiSourceCode);
   if (cachedPromise) {
     return await cachedPromise;
   }
 
-  cachedPromise = prepareInput(uiSourceCode, content);
+  cachedPromise = prepareInput(uiSourceCode, content, settings);
   inputCache.set(uiSourceCode, cachedPromise);
   return await cachedPromise;
 }
@@ -246,8 +248,8 @@ export async function getFunctionCodeFromLocation(
   return await getFunctionCodeFromRawLocation(rawLocation, options);
 }
 
-async function format(uiSourceCode: Workspace.UISourceCode.UISourceCode, content: string):
-    Promise<Formatter.ScriptFormatter.FormattedContent|null> {
+async function format(uiSourceCode: Workspace.UISourceCode.UISourceCode, content: string,
+                      settings: Common.Settings.Settings): Promise<Formatter.ScriptFormatter.FormattedContent|null> {
   const contentType = uiSourceCode.contentType();
   const shouldFormat = !contentType.isFromSourceMap() && (contentType.isDocument() || contentType.isScript()) &&
       TextUtils.TextUtils.isMinified(content);
@@ -255,7 +257,7 @@ async function format(uiSourceCode: Workspace.UISourceCode.UISourceCode, content
     return null;
   }
 
-  return await Formatter.ScriptFormatter.formatScriptContent(contentType.canonicalMimeType(), content, '\t');
+  return await Formatter.ScriptFormatter.formatScriptContent(settings, contentType.canonicalMimeType(), content, '\t');
 }
 
 /**
@@ -275,6 +277,7 @@ export async function getFunctionCodeFromRawLocation(
     return null;
   }
 
-  const inputData = await prepareInputAndCache(functionBounds.uiSourceCode, content);
+  const settings = rawLocation.debuggerModel.target().targetManager().settings;
+  const inputData = await prepareInputAndCache(functionBounds.uiSourceCode, content, settings);
   return createFunctionCode(inputData, functionBounds, options);
 }

package/front_end/models/trace/handlers/FramesHandler.ts

@@ -6,7 +6,6 @@ import * as Platform from '../../../core/platform/platform.js';
 import * as Helpers from '../helpers/helpers.js';
 import * as Types from '../types/types.js';
 
-import {type AuctionWorkletsData, data as auctionWorkletsData} from './AuctionWorkletsHandler.js';
 import {data as layerTreeHandlerData, type LayerTreeData} from './LayerTreeHandler.js';
 import {data as metaHandlerData, type MetaHandlerData} from './MetaHandler.js';
 import {data as rendererHandlerData, type RendererHandlerData} from './RendererHandler.js';
@@ -81,7 +80,6 @@ export async function finalize(): Promise<void> {
   const modelForTrace = new TimelineFrameModel(
       relevantFrameEvents,
       rendererHandlerData(),
-      auctionWorkletsData(),
       metaHandlerData(),
       layerTreeHandlerData(),
   );
@@ -101,7 +99,7 @@ export function data(): FramesData {
 }
 
 export function deps(): HandlerName[] {
-  return ['Meta', 'Renderer', 'AuctionWorklets', 'LayerTree'];
+  return ['Meta', 'Renderer', 'LayerTree'];
 }
 
 export class TimelineFrameModel {
@@ -122,13 +120,12 @@ export class TimelineFrameModel {
   #activeThreadId: Types.Events.ThreadID|null = null;
   #layerTreeData: LayerTreeData;
 
-  constructor(
-      allEvents: readonly Types.Events.Event[], rendererData: RendererHandlerData,
-      auctionWorkletsData: AuctionWorkletsData, metaData: MetaHandlerData, layerTreeData: LayerTreeData) {
+  constructor(allEvents: readonly Types.Events.Event[], rendererData: RendererHandlerData, metaData: MetaHandlerData,
+              layerTreeData: LayerTreeData) {
     // We only care about getting threads from the Renderer, not Samples,
     // because Frames don't exist in a CPU Profile (which won't have Renderer
     // threads.)
-    const mainThreads = Threads.threadsInRenderer(rendererData, auctionWorkletsData).filter(thread => {
+    const mainThreads = Threads.threadsInRenderer(rendererData).filter(thread => {
       return thread.type === Threads.ThreadType.MAIN_THREAD && thread.processIsOnMainFrame;
     });
     const threadData = mainThreads.map(thread => {

package/front_end/models/trace/handlers/ModelHandlers.ts

@@ -5,7 +5,6 @@
 export * as AnimationFrames from './AnimationFramesHandler.js';
 export * as Animations from './AnimationHandler.js';
 export * as AsyncJSCalls from './AsyncJSCallsHandler.js';
-export * as AuctionWorklets from './AuctionWorkletsHandler.js';
 export * as DOMStats from './DOMStatsHandler.js';
 export * as ExtensionTraceData from './ExtensionTraceDataHandler.js';
 export * as Flows from './FlowsHandler.js';

package/front_end/models/trace/handlers/RendererHandler.ts

@@ -6,7 +6,6 @@ import * as Platform from '../../../core/platform/platform.js';
 import * as Helpers from '../helpers/helpers.js';
 import * as Types from '../types/types.js';
 
-import {data as auctionWorkletsData} from './AuctionWorkletsHandler.js';
 import * as HandlerHelpers from './helpers.js';
 import {data as metaHandlerData, type FrameProcessData} from './MetaHandler.js';
 import {data as networkRequestHandlerData} from './NetworkRequestsHandler.js';
@@ -248,7 +247,6 @@ export function assignThreadName(
  *  - Deletes processes with an unknown origin.
  */
 export function sanitizeProcesses(processes: Map<Types.Events.ProcessID, RendererProcess>): void {
-  const auctionWorklets = auctionWorkletsData().worklets;
   const metaData = metaHandlerData();
   if (metaData.traceIsGeneric) {
     return;
@@ -258,19 +256,8 @@ export function sanitizeProcesses(processes: Map<Types.Events.ProcessID, Rendere
     // parsed for some reason, or if it's an "about:" origin, delete it.
     // This is done because we don't really care about processes for which we
     // can't provide actionable insights to the user (e.g. about:blank pages).
-    //
-    // There is one exception; AuctionWorklet processes get parsed in a
-    // separate handler, so at this point we check to see if the process has
-    // been found by the AuctionWorkletsHandler, and if so we update the URL.
-    // This ensures that we keep this process around and do not drop it due to
-    // the lack of a URL.
     if (process.url === null) {
-      const maybeWorklet = auctionWorklets.get(pid);
-      if (maybeWorklet) {
-        process.url = maybeWorklet.host;
-      } else {
-        processes.delete(pid);
-      }
+      processes.delete(pid);
       continue;
     }
   }
@@ -392,7 +379,7 @@ export function makeCompleteEvent(event: Types.Events.Begin|Types.Events.End): T
 }
 
 export function deps(): HandlerName[] {
-  return ['Meta', 'Samples', 'AuctionWorklets', 'NetworkRequests'];
+  return ['Meta', 'Samples', 'NetworkRequests'];
 }
 
 export interface RendererHandlerData {