chrome-devtools-frontend 1.0.1544076 → 1.0.1547147

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

@@ -675,7 +675,7 @@ Network requests data:
 
   static callFrameDataFormatDescription = `Each call frame is presented in the following format:
 
-'id;eventKey;name;duration;selfTime;urlIndex;childRange;[S]'
+'id;eventKey;name;duration;selfTime;urlIndex;childRange;[line];[column];[S]'
 
 Key definitions:
 
@@ -686,15 +686,17 @@ Key definitions:
 * selfTime: The time spent directly within the call frame, excluding its children's execution.
 * urlIndex: Index referencing the "All URLs" list. Empty if no specific script URL is associated.
 * childRange: Specifies the direct children of this node using their IDs. If empty ('' or 'S' at the end), the node has no children. If a single number (e.g., '4'), the node has one child with that ID. If in the format 'firstId-lastId' (e.g., '4-5'), it indicates a consecutive range of child IDs from 'firstId' to 'lastId', inclusive.
+* line: An optional field for a call frame's line number. This is where the function is defined.
+* column: An optional field for a call frame's column number. This is where the function is defined.
 * S: _Optional_. The letter 'S' terminates the line if that call frame was selected by the user.
 
 Example Call Tree:
 
-1;r-123;main;500;100;;
-2;r-124;update;200;50;;3
-3;p-49575-15428179-2834-374;animate;150;20;0;4-5;S
-4;p-49575-15428179-3505-1162;calculatePosition;80;80;;
-5;p-49575-15428179-5391-2767;applyStyles;50;50;;
+1;r-123;main;500;100;0;1;;
+2;r-124;update;200;50;;3;0;1;
+3;p-49575-15428179-2834-374;animate;150;20;0;4-5;0;1;S
+4;p-49575-15428179-3505-1162;calculatePosition;80;80;0;1;;
+5;p-49575-15428179-5391-2767;applyStyles;50;50;0;1;;
 `;
 
   /**

package/front_end/models/ai_assistance/performance/AICallTree.snapshot.txt

@@ -9,14 +9,14 @@ Content:
 
 # Call tree:
 
-1;p-1-1-0-2;(anonymous);2370;;0;2
-2;p-1-1-0-3;executeUserEntryPoint;2370;;1;3
-3;p-1-1-0-4;Module._load;2370;;2;4
-4;p-1-1-0-5;Module.load;2370;;2;5
-5;p-1-1-0-6;Module._extensions..js;2370;;2;6
-6;p-1-1-0-7;Module._compile;2370;;2;7
-7;p-1-1-0-8;callAndPauseOnStart;2370;;;8;S
-8;p-1-1-0-9;(anonymous);2370;2370;3;
+1;p-1-1-0-2;(anonymous);2370;;0;2;0;0
+2;p-1-1-0-3;executeUserEntryPoint;2370;;1;3;126;30
+3;p-1-1-0-4;Module._load;2370;;2;4;949;23
+4;p-1-1-0-5;Module.load;2370;;2;5;1193;32
+5;p-1-1-0-6;Module._extensions..js;2370;;2;6;1388;36
+6;p-1-1-0-7;Module._compile;2370;;2;7;1329;36
+7;p-1-1-0-8;callAndPauseOnStart;2370;;;8;;;S
+8;p-1-1-0-9;(anonymous);2370;2370;3;;0;0
 === end content
 
 Title: AICallTree serializes a simple tree
@@ -27,12 +27,12 @@ Content:
 
 # Call tree:
 
-1;r-36071;Task;0.2;;;2
-2;r-36072;Timer fired;0.2;;;3
-3;r-36076;Function call;0.2;;0;4
-4;p-74406-259-16342-528;_ds.q.ns;0.2;;0;5;S
-5;p-74406-259-16342-529;clearTimeout;0.2;0;;6
-6;r-36082;Recalculate style;0.2;0.2;;
+1;r-36071;Task;0.2;;;2;;
+2;r-36072;Timer fired;0.2;;;3;;
+3;r-36076;Function call;0.2;;0;4;190;175
+4;p-74406-259-16342-528;_ds.q.ns;0.2;;0;5;190;175;S
+5;p-74406-259-16342-529;clearTimeout;0.2;0;;6;;
+6;r-36082;Recalculate style;0.2;0.2;0;;136;87
 === end content
 
 Title: AICallTree serializes a simple tree in a concise format
@@ -43,12 +43,12 @@ Content:
 
 # Call tree:
 
-1;r-36071;Task;0.2;;;2
-2;r-36072;Timer fired;0.2;;;3
-3;r-36076;Function call;0.2;;0;4
-4;p-74406-259-16342-528;_ds.q.ns;0.2;;0;5;S
-5;p-74406-259-16342-529;clearTimeout;0.2;0;;6
-6;r-36082;Recalculate style;0.2;0.2;;
+1;r-36071;Task;0.2;;;2;;
+2;r-36072;Timer fired;0.2;;;3;;
+3;r-36076;Function call;0.2;;0;4;190;175
+4;p-74406-259-16342-528;_ds.q.ns;0.2;;0;5;190;175;S
+5;p-74406-259-16342-529;clearTimeout;0.2;0;;6;;
+6;r-36082;Recalculate style;0.2;0.2;0;;136;87
 === end content
 
 Title: AICallTree serializes a tree in a concise format
@@ -59,17 +59,17 @@ Content:
 
 # Call tree:
 
-1;r-5764;Task;0.9;0;;2;S
-2;r-5765;Timer fired;0.9;0;;3
-3;r-5766;Function call;0.9;0.1;0;4
-4;p-73704-775-2873-705;(anonymous);0.8;;0;5
-5;p-73704-775-2873-706;(anonymous);0.8;;0;6-8
-6;p-73704-775-2873-707;Ot.getEntriesByType;0.1;;0;8
-7;p-73704-775-2874-709;le.createOobTrace;0.6;0.2;0;9-11
-8;p-73704-775-2873-708;getEntriesByType;0.1;0.1;;
-9;p-73704-775-2875-710;le;0.1;0.1;0;
-10;p-73704-775-2877-711;ie;0.2;;0;11-13
-11;p-73704-775-2877-712;Ot.requiredApisAvailable;0.2;0.2;0;
-12;p-73704-775-2879-713;oe;0;;0;13
-13;p-73704-775-2879-714;setTimeout;0;0;;
+1;r-5764;Task;0.9;0;;2;;;S
+2;r-5765;Timer fired;0.9;0;;3;;
+3;r-5766;Function call;0.9;0.1;0;4;0;32324
+4;p-73704-775-2873-705;(anonymous);0.8;;0;5;0;32324
+5;p-73704-775-2873-706;(anonymous);0.8;;0;6-8;0;32342
+6;p-73704-775-2873-707;Ot.getEntriesByType;0.1;;0;8;0;20337
+7;p-73704-775-2874-709;le.createOobTrace;0.6;0.2;0;9-11;0;30481
+8;p-73704-775-2873-708;getEntriesByType;0.1;0.1;;;;
+9;p-73704-775-2875-710;le;0.1;0.1;0;;0;31269
+10;p-73704-775-2877-711;ie;0.2;;0;11-13;0;25861
+11;p-73704-775-2877-712;Ot.requiredApisAvailable;0.2;0.2;0;;0;20761
+12;p-73704-775-2879-713;oe;0;;0;13;0;26165
+13;p-73704-775-2879-714;setTimeout;0;0;;;;
 === end content

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

@@ -286,10 +286,12 @@ export class AICallTree {
   *   5. `urlIndex`: An index referencing a URL in the `allUrls` array. If no URL is present, this is an empty string.
   *   6. `childRange`: A string indicating the range of IDs for the node's children. Children should always have consecutive IDs.
   *                    If there is only one child, it's a single ID.
-  *   7. `[S]`: An optional marker indicating that this node is the selected node.
+  *   7. `[line]`: An optional field for a call frame's line number.
+  *   8. `[column]`: An optional field for a call frame's column number.
+  *   9. `[S]`: An optional marker indicating that this node is the selected node.
   *
   * Example:
-  *   `1;Parse HTML;2.5;0.3;0;2-5;S`
+  *   `1;Parse HTML;2.5;0.3;0;2-5;10;11;S`
   *   This represents:
   *     - Node ID 1
   *     - Name "Parse HTML"
@@ -297,6 +299,7 @@ export class AICallTree {
   *     - Self time of 0.3ms
   *     - URL index 0 (meaning the URL is the first one in the `allUrls` array)
   *     - Child range of IDs 2 to 5
+  *     - Line, column is 10:11
   *     - This node is the selected node (S marker)
   */
   stringifyNode(
@@ -331,7 +334,8 @@ export class AICallTree {
     const selfTimeStr = roundToTenths(node.selfTime);
 
     // 6. URL Index
-    const url = SourceMapsResolver.SourceMapsResolver.resolvedURLForEntry(parsedTrace, event);
+    const location = SourceMapsResolver.SourceMapsResolver.codeLocationForEntry(parsedTrace, event);
+    const url = location?.url;
     let urlIndexStr = '';
     if (url) {
       const existingIndex = allUrls.indexOf(url);
@@ -361,6 +365,8 @@ export class AICallTree {
     line += ';' + selfTimeStr;
     line += ';' + urlIndexStr;
     line += ';' + childRangeStr;
+    line += ';' + (location?.line ?? '');
+    line += ';' + (location?.column ?? '');
 
     if (selectedMarker) {
       line += ';' + selectedMarker;

package/front_end/models/bindings/CSSWorkspaceBinding.ts

@@ -63,7 +63,7 @@ export class CSSWorkspaceBinding implements SDK.TargetManager.SDKModelObserver<S
   }
 
   modelAdded(cssModel: SDK.CSSModel.CSSModel): void {
-    this.#modelToInfo.set(cssModel, new ModelInfo(cssModel, this.#resourceMapping));
+    this.#modelToInfo.set(cssModel, new ModelInfo(cssModel, this.#resourceMapping, this));
   }
 
   modelRemoved(cssModel: SDK.CSSModel.CSSModel): void {
@@ -157,7 +157,8 @@ export class ModelInfo {
   #sassSourceMapping: SASSSourceMapping;
   readonly #locations: Platform.MapUtilities.Multimap<SDK.CSSStyleSheetHeader.CSSStyleSheetHeader, LiveLocation>;
   readonly #unboundLocations: Platform.MapUtilities.Multimap<Platform.DevToolsPath.UrlString, LiveLocation>;
-  constructor(cssModel: SDK.CSSModel.CSSModel, resourceMapping: ResourceMapping) {
+  constructor(
+      cssModel: SDK.CSSModel.CSSModel, resourceMapping: ResourceMapping, cssWorkspaceBinding: CSSWorkspaceBinding) {
     this.#eventListeners = [
       cssModel.addEventListener(
           SDK.CSSModel.Events.StyleSheetAdded,
@@ -176,7 +177,8 @@ export class ModelInfo {
     this.#resourceMapping = resourceMapping;
     this.#stylesSourceMapping = new StylesSourceMapping(cssModel, resourceMapping.workspace);
     const sourceMapManager = cssModel.sourceMapManager();
-    this.#sassSourceMapping = new SASSSourceMapping(cssModel.target(), sourceMapManager, resourceMapping.workspace);
+    this.#sassSourceMapping =
+        new SASSSourceMapping(cssModel.target(), sourceMapManager, resourceMapping.workspace, cssWorkspaceBinding);
 
     this.#locations = new Platform.MapUtilities.Multimap();
     this.#unboundLocations = new Platform.MapUtilities.Multimap();

package/front_end/models/bindings/SASSSourceMapping.ts

@@ -10,7 +10,7 @@ import * as TextUtils from '../text_utils/text_utils.js';
 import * as Workspace from '../workspace/workspace.js';
 
 import {ContentProviderBasedProject} from './ContentProviderBasedProject.js';
-import {CSSWorkspaceBinding, type SourceMapping} from './CSSWorkspaceBinding.js';
+import type {CSSWorkspaceBinding, SourceMapping} from './CSSWorkspaceBinding.js';
 import {NetworkProject} from './NetworkProject.js';
 
 export class SASSSourceMapping implements SourceMapping {
@@ -18,12 +18,14 @@ export class SASSSourceMapping implements SourceMapping {
   readonly #project: ContentProviderBasedProject;
   readonly #eventListeners: Common.EventTarget.EventDescriptor[];
   readonly #bindings: Map<string, Binding>;
+  readonly #cssWorkspaceBinding: CSSWorkspaceBinding;
 
   constructor(
       target: SDK.Target.Target,
       sourceMapManager: SDK.SourceMapManager.SourceMapManager<SDK.CSSStyleSheetHeader.CSSStyleSheetHeader>,
-      workspace: Workspace.Workspace.WorkspaceImpl) {
+      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 */);
@@ -58,7 +60,7 @@ export class SASSSourceMapping implements SourceMapping {
       }
       binding.addSourceMap(sourceMap, header.frameId);
     }
-    await CSSWorkspaceBinding.instance().updateLocations(header);
+    await this.#cssWorkspaceBinding.updateLocations(header);
     this.sourceMapAttachedForTest(sourceMap);
   }
 
@@ -78,7 +80,7 @@ export class SASSSourceMapping implements SourceMapping {
         }
       }
     }
-    await CSSWorkspaceBinding.instance().updateLocations(header);
+    await this.#cssWorkspaceBinding.updateLocations(header);
   }
 
   rawLocationToUILocation(rawLocation: SDK.CSSModel.CSSLocation): Workspace.UISourceCode.UILocation|null {

package/front_end/models/cpu_profile/CPUProfileDataModel.ts

@@ -56,7 +56,15 @@ export class CPUProfileDataModel extends ProfileTreeModel {
    * for CPU profiles coming from traces.
    */
   traceIds?: Record<string, number>;
+  /**
+   * Each item in the `lines` array contains the script line executing
+   * when the sample in that array position was taken.
+   */
   lines?: number[];
+  /**
+   * Same as `lines` above, but with the script column.
+   */
+  columns?: number[];
   totalHitCount: number;
   profileHead: CPUProfileNode;
   /**
@@ -90,14 +98,8 @@ export class CPUProfileDataModel extends ProfileTreeModel {
     this.traceIds = profile.traceIds;
     this.samples = profile.samples;
 
-    // Lines are available only in profiles coming from tracing.
-    // Elements in the lines array have a 1 to 1 correspondence with
-    // samples, by array position. They can be 1 or 0 and indicate if
-    // there is line data for a given sample, i.e. if a given sample
-    // needs to be included to calculate the line level execution time
-    // data, which we show in the sources panel after recording a
-    // profile.
     this.lines = profile.lines;
+    this.columns = profile.columns;
     this.totalHitCount = 0;
     this.profileHead = this.translateProfileTree(profile.nodes);
     this.initialize(this.profileHead);
@@ -557,6 +559,7 @@ export type ExtendedProfileNode = Protocol.Profiler.ProfileNode&{parent?: number
 export type ExtendedProfile = Protocol.Profiler.Profile&{
   nodes: Protocol.Profiler.ProfileNode[] | ExtendedProfileNode[],
   lines?: number[],
+  columns?: number[],
   /**
    * A sample can be manually collected with v8::CpuProfiler::collectSample.
    * When this is done an id (trace id) can be passed to the API to

package/front_end/models/crux-manager/CrUXManager.ts

@@ -87,6 +87,7 @@ export interface CrUXResponse {
 
 export type PageResult = Record<`${PageScope}-${DeviceScope}`, CrUXResponse|null>&{
   warnings: string[],
+  normalizedUrl: string,
 };
 
 export interface OriginMapping {
@@ -194,10 +195,12 @@ export class CrUXManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
       'url-PHONE': null,
       'url-TABLET': null,
       warnings: [],
+      normalizedUrl: '',
     };
 
     try {
       const normalizedUrl = this.#normalizeUrl(pageUrl);
+      pageResult.normalizedUrl = normalizedUrl.href;
       const promises: Array<Promise<void>> = [];
 
       for (const pageScope of pageScopeList) {
@@ -250,11 +253,11 @@ export class CrUXManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
    */
   async #getFieldDataForCurrentPage(): Promise<PageResult> {
     const currentUrl = this.#mainDocumentUrl || await this.#getInspectedURL();
-    const urlForCrux = this.#configSetting.get().overrideEnabled ? this.#configSetting.get().override || '' :
-                                                                   this.#getMappedUrl(currentUrl);
+    const normalizedUrl = this.#configSetting.get().overrideEnabled ? this.#configSetting.get().override || '' :
+                                                                      this.#getMappedUrl(currentUrl);
 
-    const result = await this.getFieldDataForPage(urlForCrux);
-    if (currentUrl !== urlForCrux) {
+    const result = await this.getFieldDataForPage(normalizedUrl);
+    if (currentUrl !== normalizedUrl) {
       result.warnings.push(i18nString(UIStrings.fieldOverrideWarning));
     }
     return result;

package/front_end/models/issues_manager/GenericIssue.ts

@@ -129,8 +129,8 @@ export const genericFormDuplicateIdForInputError = {
   }],
 };
 
-export const genericFormAriaLabelledByToNonExistingId = {
-  file: 'genericFormAriaLabelledByToNonExistingId.md',
+export const genericFormAriaLabelledByToNonExistingIdError = {
+  file: 'genericFormAriaLabelledByToNonExistingIdError.md',
   links: [{
     link: 'https://developer.mozilla.org/en-US/docs/Web/HTML/Element/label',
     linkTitle: i18nLazyString(UIStrings.labelFormlementsPageTitle),
@@ -169,8 +169,8 @@ export const genericFormLabelForMatchesNonExistingIdError = {
   }],
 };
 
-export const genericFormLabelHasNeitherForNorNestedInput = {
-  file: 'genericFormLabelHasNeitherForNorNestedInput.md',
+export const genericFormLabelHasNeitherForNorNestedInputError = {
+  file: 'genericFormLabelHasNeitherForNorNestedInputError.md',
   links: [{
     link: 'https://developer.mozilla.org/en-US/docs/Web/HTML/Element/label',
     linkTitle: i18nLazyString(UIStrings.labelFormlementsPageTitle),
@@ -193,7 +193,10 @@ const issueDescriptions = new Map<Protocol.Audits.GenericIssueErrorType, LazyMar
     genericFormAutocompleteAttributeEmptyError,
   ],
   [Protocol.Audits.GenericIssueErrorType.FormDuplicateIdForInputError, genericFormDuplicateIdForInputError],
-  [Protocol.Audits.GenericIssueErrorType.FormAriaLabelledByToNonExistingId, genericFormAriaLabelledByToNonExistingId],
+  [
+    Protocol.Audits.GenericIssueErrorType.FormAriaLabelledByToNonExistingIdError,
+    genericFormAriaLabelledByToNonExistingIdError
+  ],
   [
     Protocol.Audits.GenericIssueErrorType.FormEmptyIdAndNameAttributesForInputError,
     genericFormEmptyIdAndNameAttributesForInputError,
@@ -207,8 +210,8 @@ const issueDescriptions = new Map<Protocol.Audits.GenericIssueErrorType, LazyMar
     genericFormLabelForMatchesNonExistingIdError,
   ],
   [
-    Protocol.Audits.GenericIssueErrorType.FormLabelHasNeitherForNorNestedInput,
-    genericFormLabelHasNeitherForNorNestedInput,
+    Protocol.Audits.GenericIssueErrorType.FormLabelHasNeitherForNorNestedInputError,
+    genericFormLabelHasNeitherForNorNestedInputError,
   ],
   [
     Protocol.Audits.GenericIssueErrorType.FormInputHasWrongButWellIntendedAutocompleteValueError,
@@ -225,14 +228,14 @@ const issueTypes = new Map<Protocol.Audits.GenericIssueErrorType, IssueKind>([
   [Protocol.Audits.GenericIssueErrorType.FormInputWithNoLabelError, IssueKind.IMPROVEMENT],
   [Protocol.Audits.GenericIssueErrorType.FormAutocompleteAttributeEmptyError, IssueKind.PAGE_ERROR],
   [Protocol.Audits.GenericIssueErrorType.FormDuplicateIdForInputError, IssueKind.PAGE_ERROR],
-  [Protocol.Audits.GenericIssueErrorType.FormAriaLabelledByToNonExistingId, IssueKind.IMPROVEMENT],
+  [Protocol.Audits.GenericIssueErrorType.FormAriaLabelledByToNonExistingIdError, IssueKind.IMPROVEMENT],
   [Protocol.Audits.GenericIssueErrorType.FormEmptyIdAndNameAttributesForInputError, IssueKind.IMPROVEMENT],
   [
     Protocol.Audits.GenericIssueErrorType.FormInputAssignedAutocompleteValueToIdOrNameAttributeError,
     IssueKind.IMPROVEMENT,
   ],
   [Protocol.Audits.GenericIssueErrorType.FormLabelForMatchesNonExistingIdError, IssueKind.PAGE_ERROR],
-  [Protocol.Audits.GenericIssueErrorType.FormLabelHasNeitherForNorNestedInput, IssueKind.IMPROVEMENT],
+  [Protocol.Audits.GenericIssueErrorType.FormLabelHasNeitherForNorNestedInputError, IssueKind.IMPROVEMENT],
   [Protocol.Audits.GenericIssueErrorType.FormInputHasWrongButWellIntendedAutocompleteValueError, IssueKind.IMPROVEMENT],
 
 ]);

package/front_end/models/javascript_metadata/NativeFunctions.js

@@ -9079,6 +9079,10 @@ export const NativeFunctions = [
     name: "setBindGroup",
     signatures: [["index","bindGroup","?dynamicOffsets"],["index","bindGroup","dynamicOffsetsData","dynamicOffsetsDataStart","dynamicOffsetsDataLength"]]
   },
+  {
+    name: "setImmediates",
+    signatures: [["rangeOffset","data","?dataOffset","?size"]]
+  },
   {
     name: "writeBuffer",
     signatures: [["buffer","bufferOffset","data","?dataElementOffset","?dataElementCount"],["buffer","bufferOffset","data","?dataByteOffset","?byteSize"]]

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

@@ -217,9 +217,11 @@ export function handleEvent(event: Types.Events.Event): void {
 
     const timeDeltas = event.args.data?.timeDeltas || [];
     const lines = event.args.data?.lines || Array(samples.length).fill(0);
+    const columns = event.args.data?.columns || Array(samples.length).fill(0);
     cdpProfile.samples?.push(...samples);
     cdpProfile.timeDeltas?.push(...timeDeltas);
     cdpProfile.lines?.push(...lines);
+    cdpProfile.columns?.push(...columns);
 
     if (traceIds) {
       cdpProfile.traceIds ??= {};
@@ -270,6 +272,7 @@ function getOrCreatePreProcessedData(
                                   samples: [],
                                   timeDeltas: [],
                                   lines: [],
+                                  columns: [],
                                 },
                                 profileId,
                               }));

package/front_end/models/trace/helpers/Trace.ts

@@ -577,6 +577,19 @@ export function getStackTraceTopCallFrameInEventPayload(event: Types.Events.Even
   }
 }
 
+export function rawCallFrameForEntry(entry: Types.Events.Event): Protocol.Runtime.CallFrame|null {
+  if (Types.Events.isProfileCall(entry)) {
+    return entry.callFrame;
+  }
+
+  const topCallFrame = getStackTraceTopCallFrameInEventPayload(entry);
+  if (topCallFrame) {
+    return topCallFrame as Protocol.Runtime.CallFrame;
+  }
+
+  return null;
+}
+
 /**
  * Given a 1-based call frame creates a 0-based one.
  */

package/front_end/models/trace/types/TraceEvents.ts

@@ -174,8 +174,9 @@ export interface ProfileChunk extends Sample {
     data?: ArgsData & {
       cpuProfile?: PartialProfile,
       timeDeltas?: Micro[],
-      lines?: Micro[],
+      lines?: number[],
       source?: ProfileSource,
+      columns?: number[],
     },
   };
 }

package/front_end/models/trace_source_maps_resolver/SourceMapsResolver.ts

@@ -92,6 +92,7 @@ export class SourceMapsResolver extends EventTarget {
     if (resolvedCallFrameURL) {
       return resolvedCallFrameURL;
     }
+
     // If no source mapping was found for an entry's URL, then default
     // to the URL value contained in the event itself, if any.
     const url = Trace.Handlers.Helpers.getNonResolvedURL(entry, parsedTrace.data);
@@ -101,6 +102,34 @@ export class SourceMapsResolver extends EventTarget {
     return null;
   }
 
+  static codeLocationForEntry(parsedTrace: Trace.TraceModel.ParsedTrace, entry: Trace.Types.Events.Event):
+      {url: Platform.DevToolsPath.UrlString, line?: number, column?: number}|null {
+    const uiLocation = SourceMapsResolver.resolvedCodeLocationForEntry(entry)?.devtoolsLocation;
+    if (uiLocation) {
+      return {url: uiLocation.uiSourceCode.url(), line: uiLocation.lineNumber, column: uiLocation.columnNumber};
+    }
+
+    // If no source mapping was found for an entry's URL, then default
+    // to the frame contained in the event itself, if any.
+    const rawCallFrame = Trace.Helpers.Trace.rawCallFrameForEntry(entry);
+    if (rawCallFrame) {
+      const line = rawCallFrame.lineNumber >= 0 ? rawCallFrame.lineNumber : undefined;
+      const column = rawCallFrame.columnNumber >= 0 ? rawCallFrame.columnNumber : undefined;
+      return {url: rawCallFrame.url as Platform.DevToolsPath.UrlString, line, column};
+    }
+
+    // Lastly, look for just a url.
+    let url = Trace.Handlers.Helpers.getNonResolvedURL(entry, parsedTrace.data);
+    if (url) {
+      url = Workspace.Workspace.WorkspaceImpl.instance().uiSourceCodeForURL(url)?.url() ?? url;
+    }
+    if (url) {
+      return {url};
+    }
+
+    return null;
+  }
+
   static storeResolvedCodeDataForCallFrame(
       callFrame: Protocol.Runtime.CallFrame, resolvedCodeLocationData: ResolvedCodeLocationData): void {
     const keyForCallFrame = this.keyForCodeLocation(callFrame);

package/front_end/models/workspace/IgnoreListManager.ts

@@ -257,8 +257,7 @@ export class IgnoreListManager extends Common.ObjectWrapper.ObjectWrapper<EventT
   private async updateScriptRanges(script: SDK.Script.Script, sourceMap: SDK.SourceMap.SourceMap|undefined):
       Promise<void> {
     let hasIgnoreListedMappings = false;
-    if (!IgnoreListManager.instance().isUserIgnoreListedURL(
-            script.sourceURL, {isContentScript: script.isContentScript()})) {
+    if (!this.isUserIgnoreListedURL(script.sourceURL, {isContentScript: script.isContentScript()})) {
       hasIgnoreListedMappings =
           sourceMap?.sourceURLs().some(
               url => this.isUserIgnoreListedURL(url, {isKnownThirdParty: sourceMap.hasIgnoreListHint(url)})) ??

package/front_end/models/workspace/UISourceCode.ts

@@ -35,7 +35,9 @@ export class UISourceCode extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
   #contentType: Common.ResourceType.ResourceType;
   #requestContentPromise: Promise<TextUtils.ContentData.ContentDataOrError>|null = null;
   #decorations = new Map<string, any>();
+  #formattedDecorations = new Map<string, any>();
   #hasCommits = false;
+  #prettied = false;
   #messages: Set<Message>|null = null;
   #content: TextUtils.ContentData.ContentDataOrError|null = null;
   #forceLoadOnCheckContent = false;
@@ -497,6 +499,9 @@ export class UISourceCode extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
   }
 
   getDecorationData(type: string): any {
+    if (this.#prettied && this.#formattedDecorations.get(type)) {
+      return this.#formattedDecorations.get(type);
+    }
     return this.#decorations.get(type);
   }
 
@@ -508,6 +513,45 @@ export class UISourceCode extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     return this.#disableEdit;
   }
 
+  formatChanged(format: {originalToFormatted(lineNumber: number, columnNumber?: number): number[]}|null): void {
+    if (this.#prettied === Boolean(format)) {
+      return;
+    }
+    this.#prettied = Boolean(format);
+    if (!format) {
+      this.dispatchEventToListeners(Events.DecorationChanged, DecoratorType.PERFORMANCE);
+      return;
+    }
+    const performanceDecorations = this.#decorations.get(DecoratorType.PERFORMANCE);
+    if (!performanceDecorations) {
+      return;
+    }
+    let formattedPerformanceDecorations: Map<number, Map<number, number>> =
+        this.#formattedDecorations.get(DecoratorType.PERFORMANCE);
+    if (!formattedPerformanceDecorations) {
+      formattedPerformanceDecorations = new Map<number, Map<number, number>>();
+      this.#formattedDecorations.set(DecoratorType.PERFORMANCE, formattedPerformanceDecorations);
+    } else {
+      formattedPerformanceDecorations.clear();
+    }
+
+    for (const [lineNumber, columnData] of performanceDecorations) {
+      for (const [columnNumber, data] of columnData) {
+        const [formattedLineNumber, formattedColumnNumber] =
+            format.originalToFormatted(lineNumber - 1, columnNumber - 1);
+        const oneBasedFormattedLineNumber = formattedLineNumber + 1;
+        const oneBasedFormattedColumnNumber = formattedColumnNumber + 1;
+        let lineData = formattedPerformanceDecorations.get(oneBasedFormattedLineNumber);
+        if (!lineData) {
+          lineData = new Map();
+          formattedPerformanceDecorations.set(oneBasedFormattedLineNumber, lineData);
+        }
+        lineData.set(oneBasedFormattedColumnNumber, (lineData.get(oneBasedFormattedColumnNumber) || 0) + data);
+      }
+    }
+    this.dispatchEventToListeners(Events.DecorationChanged, 'performance');
+  }
+
   isIgnoreListed(): boolean {
     return IgnoreListManager.instance().isUserOrSourceMapIgnoreListedUISourceCode(this);
   }
@@ -696,3 +740,9 @@ export class UISourceCodeMetadata {
     this.contentSize = contentSize;
   }
 }
+
+export const enum DecoratorType {
+  PERFORMANCE = 'performance',
+  MEMORY = 'memory',
+  COVERAGE = 'coverage',
+}