chrome-devtools-frontend 1.0.1603822 → 1.0.1605219

package/front_end/core/sdk/NetworkManager.ts

@@ -129,13 +129,15 @@ const CONNECTION_TYPES = new Map([
  * to in multiple places, and this ensures we don't have accidental typos which
  * mean extra settings get mistakenly created.
  */
-export function customUserNetworkConditionsSetting(): Common.Settings.Setting<Conditions[]> {
-  return Common.Settings.Settings.instance().moduleSetting<Conditions[]>('custom-network-conditions');
+export function customUserNetworkConditionsSetting(
+    settings: Common.Settings.Settings = Common.Settings.Settings.instance()): Common.Settings.Setting<Conditions[]> {
+  return settings.moduleSetting<Conditions[]>('custom-network-conditions');
 }
 
-export function activeNetworkThrottlingKeySetting(): Common.Settings.Setting<ThrottlingConditionKey> {
-  return Common.Settings.Settings.instance().createSetting(
-      'active-network-condition-key', PredefinedThrottlingConditionKey.NO_THROTTLING);
+export function activeNetworkThrottlingKeySetting(
+    settings: Common.Settings.Settings =
+        Common.Settings.Settings.instance()): Common.Settings.Setting<ThrottlingConditionKey> {
+  return settings.createSetting('active-network-condition-key', PredefinedThrottlingConditionKey.NO_THROTTLING);
 }
 
 export class NetworkManager extends SDKModel<EventTypes> {
@@ -144,8 +146,7 @@ export class NetworkManager extends SDKModel<EventTypes> {
   readonly #networkAgent: ProtocolProxyApi.NetworkApi;
   readonly #bypassServiceWorkerSetting: Common.Settings.Setting<boolean>;
 
-  readonly activeNetworkThrottlingKey: Common.Settings.Setting<ThrottlingConditionKey> =
-      activeNetworkThrottlingKeySetting();
+  readonly activeNetworkThrottlingKey: Common.Settings.Setting<ThrottlingConditionKey>;
 
   constructor(target: Target) {
     super(target);
@@ -154,7 +155,11 @@ export class NetworkManager extends SDKModel<EventTypes> {
     this.#networkAgent = target.networkAgent();
     target.registerNetworkDispatcher(this.dispatcher);
     target.registerFetchDispatcher(this.fetchDispatcher);
-    if (Common.Settings.Settings.instance().moduleSetting('cache-disabled').get()) {
+
+    const settings = this.target().targetManager().settings;
+    this.activeNetworkThrottlingKey = activeNetworkThrottlingKeySetting(settings);
+
+    if (settings.moduleSetting('cache-disabled').get()) {
       void this.#networkAgent.invoke_setCacheDisabled({cacheDisabled: true});
     }
 
@@ -166,16 +171,13 @@ export class NetworkManager extends SDKModel<EventTypes> {
     });
     void this.#networkAgent.invoke_setAttachDebugStack({enabled: true});
 
-    this.#bypassServiceWorkerSetting =
-        Common.Settings.Settings.instance().createSetting('bypass-service-worker', false);
+    this.#bypassServiceWorkerSetting = settings.createSetting('bypass-service-worker', false);
     if (this.#bypassServiceWorkerSetting.get()) {
       this.bypassServiceWorkerChanged();
     }
     this.#bypassServiceWorkerSetting.addChangeListener(this.bypassServiceWorkerChanged, this);
 
-    Common.Settings.Settings.instance()
-        .moduleSetting('cache-disabled')
-        .addChangeListener(this.cacheDisabledSettingChanged, this);
+    settings.moduleSetting('cache-disabled').addChangeListener(this.cacheDisabledSettingChanged, this);
   }
 
   static forRequest(request: NetworkRequest): NetworkManager|null {
@@ -372,9 +374,8 @@ export class NetworkManager extends SDKModel<EventTypes> {
   }
 
   override dispose(): void {
-    Common.Settings.Settings.instance()
-        .moduleSetting('cache-disabled')
-        .removeChangeListener(this.cacheDisabledSettingChanged, this);
+    const settings = this.target().targetManager().settings;
+    settings.moduleSetting('cache-disabled').removeChangeListener(this.cacheDisabledSettingChanged, this);
   }
 
   private bypassServiceWorkerChanged(): void {
@@ -1212,7 +1213,8 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     this.#manager.dispatchEventToListeners(Events.RequestFinished, networkRequest);
     MultitargetNetworkManager.instance().inflightMainResourceRequests.delete(networkRequest.requestId());
 
-    if (Common.Settings.Settings.instance().moduleSetting('monitoring-xhr-enabled').get() &&
+    const settings = this.#manager.target().targetManager().settings;
+    if (settings.moduleSetting('monitoring-xhr-enabled').get() &&
         networkRequest.resourceType().category() === Common.ResourceType.resourceCategories.XHR) {
       let message;
       const failedToLoad = networkRequest.failed || networkRequest.hasErrorStatusCode();
@@ -1677,7 +1679,9 @@ export class RequestCondition extends Common.ObjectWrapper.ObjectWrapper<Request
   #conditions: ThrottlingConditions;
   #ruleIds = new Set<string>();
 
-  static createFromSetting(setting: RequestConditionsSetting): RequestCondition {
+  static createFromSetting(
+      setting: RequestConditionsSetting,
+      settings: Common.Settings.Settings = Common.Settings.Settings.instance()): RequestCondition {
     if ('urlPattern' in setting) {
       const pattern = RequestURLPattern.create(setting.urlPattern) ?? {
         wildcardURL: setting.urlPattern,
@@ -1685,7 +1689,7 @@ export class RequestCondition extends Common.ObjectWrapper.ObjectWrapper<Request
       };
 
       const conditions = getPredefinedOrBlockingCondition(setting.conditions) ??
-          customUserNetworkConditionsSetting().get().find(condition => condition.key === setting.conditions) ??
+          customUserNetworkConditionsSetting(settings).get().find(condition => condition.key === setting.conditions) ??
           NoThrottlingConditions;
 
       return new this(pattern, setting.enabled, conditions);
@@ -1785,10 +1789,8 @@ export namespace RequestCondition {
 }
 
 export class RequestConditions extends Common.ObjectWrapper.ObjectWrapper<RequestConditions.EventTypes> {
-  readonly #setting =
-      Common.Settings.Settings.instance().createSetting<RequestConditionsSetting[]>('network-blocked-patterns', []);
-  readonly #conditionsEnabledSetting =
-      Common.Settings.Settings.instance().moduleSetting<boolean>('request-blocking-enabled');
+  readonly #setting: Common.Settings.Setting<RequestConditionsSetting[]>;
+  readonly #conditionsEnabledSetting: Common.Settings.Setting<boolean>;
   readonly #conditions: RequestCondition[] = [];
   readonly #requestConditionsById = new Map<string, {
     conditions: Conditions,
@@ -1796,11 +1798,13 @@ export class RequestConditions extends Common.ObjectWrapper.ObjectWrapper<Reques
   }>();
   #conditionsAppliedForTestPromise: Promise<unknown> = Promise.resolve();
 
-  constructor() {
+  constructor(settings: Common.Settings.Settings) {
     super();
+    this.#setting = settings.createSetting<RequestConditionsSetting[]>('network-blocked-patterns', []);
+    this.#conditionsEnabledSetting = settings.moduleSetting<boolean>('request-blocking-enabled');
     for (const condition of this.#setting.get()) {
       try {
-        this.#conditions.push(RequestCondition.createFromSetting(condition));
+        this.#conditions.push(RequestCondition.createFromSetting(condition, settings));
       } catch (e) {
         console.error('Error loading throttling settings: ', e);
       }
@@ -2003,7 +2007,7 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
   readonly inflightMainResourceRequests = new Map<string, NetworkRequest>();
   #networkConditions: Conditions = NoThrottlingConditions;
   #updatingInterceptionPatternsPromise: Promise<void>|null = null;
-  readonly #requestConditions = new RequestConditions();
+  readonly #requestConditions: RequestConditions;
   readonly #urlsForRequestInterceptor:
       Platform.MapUtilities.Multimap<(arg0: InterceptedRequest) => Promise<void>, InterceptionPattern> =
       new Platform.MapUtilities.Multimap();
@@ -2014,6 +2018,8 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
   constructor(targetManager: TargetManager) {
     super();
     this.#targetManager = targetManager;
+    const settings = targetManager.settings;
+    this.#requestConditions = new RequestConditions(settings);
 
     // TODO(allada) Remove these and merge it with request interception.
     const blockedPatternChanged: () => void = () => {
@@ -2264,8 +2270,9 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
   }
 
   private async updateInterceptionPatterns(): Promise<void> {
-    if (!Common.Settings.Settings.instance().moduleSetting('cache-disabled').get()) {
-      Common.Settings.Settings.instance().moduleSetting('cache-disabled').set(true);
+    const settings = this.#targetManager.settings;
+    if (!settings.moduleSetting('cache-disabled').get()) {
+      settings.moduleSetting('cache-disabled').set(true);
     }
     this.#updatingInterceptionPatternsPromise = null;
     const promises = ([] as Array<Promise<unknown>>);

package/front_end/core/sdk/OverlayModel.ts

@@ -179,28 +179,28 @@ export class OverlayModel extends SDKModel<EventTypes> implements ProtocolProxyA
     }
   }
 
-  static hideDOMNodeHighlight(): void {
-    for (const overlayModel of TargetManager.instance().models(OverlayModel)) {
+  static hideDOMNodeHighlight(targetManager: TargetManager = TargetManager.instance()): void {
+    for (const overlayModel of targetManager.models(OverlayModel)) {
       overlayModel.delayedHideHighlight(0);
     }
   }
 
-  static async muteHighlight(): Promise<void[]> {
-    return await Promise.all(TargetManager.instance().models(OverlayModel).map(model => model.suspendModel()));
+  static async muteHighlight(targetManager: TargetManager = TargetManager.instance()): Promise<void[]> {
+    return await Promise.all(targetManager.models(OverlayModel).map(model => model.suspendModel()));
   }
 
-  static async unmuteHighlight(): Promise<void[]> {
-    return await Promise.all(TargetManager.instance().models(OverlayModel).map(model => model.resumeModel()));
+  static async unmuteHighlight(targetManager: TargetManager = TargetManager.instance()): Promise<void[]> {
+    return await Promise.all(targetManager.models(OverlayModel).map(model => model.resumeModel()));
   }
 
-  static highlightRect(rect: HighlightRect): void {
-    for (const overlayModel of TargetManager.instance().models(OverlayModel)) {
+  static highlightRect(rect: HighlightRect, targetManager: TargetManager = TargetManager.instance()): void {
+    for (const overlayModel of targetManager.models(OverlayModel)) {
       void overlayModel.highlightRect(rect);
     }
   }
 
-  static clearHighlight(): void {
-    for (const overlayModel of TargetManager.instance().models(OverlayModel)) {
+  static clearHighlight(targetManager: TargetManager = TargetManager.instance()): void {
+    for (const overlayModel of targetManager.models(OverlayModel)) {
       void overlayModel.clearHighlight();
     }
   }

package/front_end/core/sdk/PreloadingModel.ts

@@ -16,7 +16,6 @@ import {
 } from './ResourceTreeModel.js';
 import {SDKModel} from './SDKModel.js';
 import {Capability, type Target} from './Target.js';
-import {TargetManager} from './TargetManager.js';
 
 export interface WithId<I, V> {
   id: I;
@@ -48,17 +47,17 @@ export class PreloadingModel extends SDKModel<EventTypes> {
 
     const targetInfo = target.targetInfo();
     if (targetInfo?.subtype === 'prerender') {
-      this.lastPrimaryPageModel = TargetManager.instance().primaryPageTarget()?.model(PreloadingModel) || null;
+      this.lastPrimaryPageModel = target.targetManager().primaryPageTarget()?.model(PreloadingModel) || null;
     }
 
-    TargetManager.instance().addModelListener(
+    target.targetManager().addModelListener(
         ResourceTreeModel, ResourceTreeModelEvents.PrimaryPageChanged, this.onPrimaryPageChanged, this);
   }
 
   override dispose(): void {
     super.dispose();
 
-    TargetManager.instance().removeModelListener(
+    this.target().targetManager().removeModelListener(
         ResourceTreeModel, ResourceTreeModelEvents.PrimaryPageChanged, this.onPrimaryPageChanged, this);
 
     void this.agent.invoke_disable();

package/front_end/core/sdk/ServiceWorkerManager.ts

@@ -11,7 +11,6 @@ import type * as Platform from '../platform/platform.js';
 import {Events as RuntimeModelEvents, type ExecutionContext, RuntimeModel} from './RuntimeModel.js';
 import {SDKModel} from './SDKModel.js';
 import {Capability, type Target, Type} from './Target.js';
-import {TargetManager} from './TargetManager.js';
 
 const UIStrings = {
   /**
@@ -544,7 +543,7 @@ class ServiceWorkerContextNamer {
     this.#serviceWorkerManager = serviceWorkerManager;
     serviceWorkerManager.addEventListener(Events.REGISTRATION_UPDATED, this.registrationsUpdated, this);
     serviceWorkerManager.addEventListener(Events.REGISTRATION_DELETED, this.registrationsUpdated, this);
-    TargetManager.instance().addModelListener(
+    this.#target.targetManager().addModelListener(
         RuntimeModel, RuntimeModelEvents.ExecutionContextCreated, this.executionContextCreated, this);
   }
 
@@ -578,7 +577,7 @@ class ServiceWorkerContextNamer {
   }
 
   private updateAllContextLabels(): void {
-    for (const target of TargetManager.instance().targets()) {
+    for (const target of this.#target.targetManager().targets()) {
       const serviceWorkerTargetId = this.serviceWorkerTargetId(target);
       if (!serviceWorkerTargetId) {
         continue;

package/front_end/core/sdk/SourceMapScopesInfo.ts

@@ -49,70 +49,21 @@ export class SourceMapScopesInfo {
 
     // Convert the entire scopeTree. Returns a root range that encompasses everything,
     // and inserts scopes by sourceIndex into the above scopeBySourceUrl.
-    const {range} = convertScope(scopeTree, undefined);
-    return new SourceMapScopesInfo(sourceMap, {scopes: scopeBySourceUrl, ranges: [range]});
+    const stack: Array<{
+      node: Formatter.FormatterWorkerPool.ScopeTreeNode,
+      parentRange?: ScopesCodec.GeneratedRange,
+      parentScopeHint?: ScopesCodec.OriginalScope,
+    }> = [{node: scopeTree}];
 
-    /**
-     * Recursively finds the correct place in the tree to insert the new scope.
-     * Maintains the invariant that children are sorted and contained by their parent.
-     */
-    function insertInScope(parent: ScopesCodec.OriginalScope, newScope: ScopesCodec.OriginalScope): void {
-      // Check if the newScope fits strictly inside any of the existing children.
-      for (const child of parent.children) {
-        if (contains(child, newScope)) {
-          insertInScope(child, newScope);
-          return;
-        }
-      }
+    let rootRange: ScopesCodec.GeneratedRange|undefined = undefined;
 
-      // When here, newScope belongs directly in parent.
-      // However, newScope might encompass some of parent's existing children (due
-      // to compiler transform quirks or arbitrary insertion order). We must move
-      // those children inside newScope.
-      const childrenToKeep: ScopesCodec.OriginalScope[] = [];
-      for (const child of parent.children) {
-        if (contains(newScope, child)) {
-          // child is actually inside newScope, so re-parent it.
-          newScope.children.push(child);
-          child.parent = newScope;
-        } else {
-          childrenToKeep.push(child);
-        }
-      }
-
-      // Find the correct index in the remaining children to insert newScope.
-      // We look for the first child that starts after the new scope.
-      const insertIndex = childrenToKeep.findIndex(child => compareScopes(newScope, child) < 0);
-      if (insertIndex === -1) {
-        // If no child starts after, it goes at the end.
-        childrenToKeep.push(newScope);
-      } else {
-        childrenToKeep.splice(insertIndex, 0, newScope);
-      }
-
-      // Update parent's children to only be the ones that don't belong to newScope.
-      parent.children = childrenToKeep;
-      newScope.parent = parent;
-    }
-
-    function contains(outer: ScopesCodec.OriginalScope, inner: ScopesCodec.OriginalScope): boolean {
-      return comparePositions(outer.start, inner.start) <= 0 && comparePositions(outer.end, inner.end) >= 0;
-    }
-
-    function compareScopes(a: ScopesCodec.OriginalScope, b: ScopesCodec.OriginalScope): number {
-      return comparePositions(a.start, b.start);
-    }
-
-    function comparePositions(a: ScopesCodec.Position, b: ScopesCodec.Position): number {
-      if (a.line !== b.line) {
-        return a.line - b.line;
+    while (stack.length > 0) {
+      const popped = stack.pop();
+      if (!popped) {
+        break;
       }
-      return a.column - b.column;
-    }
+      const {node, parentRange, parentScopeHint} = popped;
 
-    function convertScope(
-        node: Formatter.FormatterWorkerPool.ScopeTreeNode,
-        parentRange: ScopesCodec.GeneratedRange|undefined): {range: ScopesCodec.GeneratedRange} {
       const start = positionFromOffset(node.start);
       const end = positionFromOffset(node.end);
       const startEntry = sourceMap.findEntry(start.line, start.column);
@@ -156,15 +107,94 @@ export class SourceMapScopesInfo {
         children: [],
       };
 
+      if (!rootRange) {
+        rootRange = range;
+      }
       parentRange?.children.push(range);
+
+      let nextParentScopeHint = parentScopeHint;
       if (canMapOriginalPosition && scope) {
         const rootScope = scopeBySourceUrl[sourceIndex];
-        insertInScope(rootScope, scope);
+        const startSearchFrom =
+            (parentScopeHint && containsOriginal(parentScopeHint, scope)) ? parentScopeHint : rootScope;
+        insertInScope(startSearchFrom, scope);
+        nextParentScopeHint = scope;
       }
 
-      node.children.forEach(child => convertScope(child, range));
+      for (let i = node.children.length - 1; i >= 0; --i) {
+        stack.push({node: node.children[i], parentRange: range, parentScopeHint: nextParentScopeHint});
+      }
+    }
 
-      return {range};
+    return new SourceMapScopesInfo(sourceMap, {scopes: scopeBySourceUrl, ranges: rootRange ? [rootRange] : []});
+
+    /**
+     * Finds the correct place in the tree to insert the new scope.
+     * Maintains the invariant that children are sorted and contained by their parent.
+     */
+    function insertInScope(rootScope: ScopesCodec.OriginalScope, newScope: ScopesCodec.OriginalScope): void {
+      let parent = rootScope;
+      // Check if the newScope fits strictly inside any of the existing children.
+      // We iterate to find the deepest parent to avoid Maximum Call Stack Size Exceeded
+      // errors on highly nested scripts.
+      while (true) {
+        let deeperParent: ScopesCodec.OriginalScope|null = null;
+        for (const child of parent.children) {
+          if (containsOriginal(child, newScope)) {
+            deeperParent = child;
+            break;
+          }
+        }
+        if (deeperParent) {
+          parent = deeperParent;
+        } else {
+          break;
+        }
+      }
+
+      // When here, newScope belongs directly in parent.
+      // However, newScope might encompass some of parent's existing children (due
+      // to compiler transform quirks or arbitrary insertion order). We must move
+      // those children inside newScope.
+      const childrenToKeep: ScopesCodec.OriginalScope[] = [];
+      for (const child of parent.children) {
+        if (containsOriginal(newScope, child)) {
+          // child is actually inside newScope, so re-parent it.
+          newScope.children.push(child);
+          child.parent = newScope;
+        } else {
+          childrenToKeep.push(child);
+        }
+      }
+
+      // Find the correct index in the remaining children to insert newScope.
+      // We look for the first child that starts after the new scope.
+      const insertIndex = childrenToKeep.findIndex(child => compareScopes(newScope, child) < 0);
+      if (insertIndex === -1) {
+        // If no child starts after, it goes at the end.
+        childrenToKeep.push(newScope);
+      } else {
+        childrenToKeep.splice(insertIndex, 0, newScope);
+      }
+
+      // Update parent's children to only be the ones that don't belong to newScope.
+      parent.children = childrenToKeep;
+      newScope.parent = parent;
+    }
+
+    function containsOriginal(outer: ScopesCodec.OriginalScope, inner: ScopesCodec.OriginalScope): boolean {
+      return comparePositions(outer.start, inner.start) <= 0 && comparePositions(outer.end, inner.end) >= 0;
+    }
+
+    function compareScopes(a: ScopesCodec.OriginalScope, b: ScopesCodec.OriginalScope): number {
+      return comparePositions(a.start, b.start);
+    }
+
+    function comparePositions(a: ScopesCodec.Position, b: ScopesCodec.Position): number {
+      if (a.line !== b.line) {
+        return a.line - b.line;
+      }
+      return a.column - b.column;
     }
 
     function positionFromOffset(offset: number): ScopesCodec.Position {

package/front_end/entrypoints/formatter_worker/FormatterWorker.ts

@@ -19,9 +19,7 @@ import {JSONFormatter} from './JSONFormatter.js';
 import {substituteExpression} from './Substitute.js';
 
 export interface Chunk {
-  // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  chunk: any[];
+  chunk: unknown[];
   isLastChunk: boolean;
 }
 

package/front_end/entrypoints/heap_snapshot_worker/AllocationProfile.ts

@@ -8,27 +8,16 @@ import type {LiveObjects, Profile} from './HeapSnapshot.js';
 
 export class AllocationProfile {
   readonly #strings: string[];
-  #nextNodeId: number;
-  #functionInfos: FunctionAllocationInfo[];
-  #idToNode: Record<number, BottomUpAllocationNode|null>;
-  readonly #idToTopDownNode: Record<number, TopDownAllocationNode>;
-  #collapsedTopNodeIdToFunctionInfo: Record<number, FunctionAllocationInfo>;
-  #traceTops: HeapSnapshotModel.HeapSnapshotModel.SerializedAllocationNode[]|null;
+  #nextNodeId = 1;
+  #functionInfos: FunctionAllocationInfo[] = [];
+  #idToNode: Record<number, BottomUpAllocationNode|null> = {};
+  readonly #idToTopDownNode: Record<number, TopDownAllocationNode> = {};
+  #collapsedTopNodeIdToFunctionInfo: Record<number, FunctionAllocationInfo> = {};
+  #traceTops: HeapSnapshotModel.HeapSnapshotModel.SerializedAllocationNode[]|null = null;
 
   constructor(profile: Profile, liveObjectStats: LiveObjects) {
     this.#strings = profile.strings;
 
-    this.#nextNodeId = 1;
-    this.#functionInfos = [];
-
-    this.#idToNode = {};
-
-    this.#idToTopDownNode = {};
-
-    this.#collapsedTopNodeIdToFunctionInfo = {};
-
-    this.#traceTops = null;
-
     this.#buildFunctionAllocationInfos(profile);
     this.#buildAllocationTree(profile, liveObjectStats);
   }
@@ -71,7 +60,7 @@ export class AllocationProfile {
     function traverseNode(
         // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration)
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        rawNodeArray: any, nodeOffset: any, parent: TopDownAllocationNode|null): TopDownAllocationNode {
+        rawNodeArray: any, nodeOffset: number, parent: TopDownAllocationNode|null): TopDownAllocationNode {
       const functionInfo = functionInfos[rawNodeArray[nodeOffset + functionInfoIndexOffset]];
       const id = rawNodeArray[nodeOffset + nodeIdOffset];
       const stats = liveObjectStats[id];
@@ -188,7 +177,7 @@ export class TopDownAllocationNode {
   liveCount: number;
   liveSize: number;
   parent: TopDownAllocationNode|null;
-  children: TopDownAllocationNode[];
+  children: TopDownAllocationNode[] = [];
   constructor(
       id: number, functionInfo: FunctionAllocationInfo, count: number, size: number, liveCount: number,
       liveSize: number, parent: TopDownAllocationNode|null) {
@@ -199,29 +188,20 @@ export class TopDownAllocationNode {
     this.liveCount = liveCount;
     this.liveSize = liveSize;
     this.parent = parent;
-
-    this.children = [];
   }
 }
 
 export class BottomUpAllocationNode {
   functionInfo: FunctionAllocationInfo;
-  allocationCount: number;
-  allocationSize: number;
-  liveCount: number;
-  liveSize: number;
-  traceTopIds: number[];
-  readonly #callers: BottomUpAllocationNode[];
+  allocationCount = 0;
+  allocationSize = 0;
+  liveCount = 0;
+  liveSize = 0;
+  traceTopIds: number[] = [];
+  readonly #callers: BottomUpAllocationNode[] = [];
+
   constructor(functionInfo: FunctionAllocationInfo) {
     this.functionInfo = functionInfo;
-    this.allocationCount = 0;
-    this.allocationSize = 0;
-    this.liveCount = 0;
-    this.liveSize = 0;
-
-    this.traceTopIds = [];
-
-    this.#callers = [];
   }
 
   addCaller(traceNode: TopDownAllocationNode): BottomUpAllocationNode {
@@ -256,11 +236,11 @@ export class FunctionAllocationInfo {
   scriptId: number;
   line: number;
   column: number;
-  totalCount: number;
-  totalSize: number;
-  totalLiveCount: number;
-  totalLiveSize: number;
-  #traceTops: TopDownAllocationNode[];
+  totalCount = 0;
+  totalSize = 0;
+  totalLiveCount = 0;
+  totalLiveSize = 0;
+  #traceTops: TopDownAllocationNode[] = [];
   #bottomUpTree?: BottomUpAllocationNode;
   constructor(functionName: string, scriptName: string, scriptId: number, line: number, column: number) {
     this.functionName = functionName;
@@ -268,12 +248,6 @@ export class FunctionAllocationInfo {
     this.scriptId = scriptId;
     this.line = line;
     this.column = column;
-    this.totalCount = 0;
-    this.totalSize = 0;
-    this.totalLiveCount = 0;
-    this.totalLiveSize = 0;
-
-    this.#traceTops = [];
   }
 
   addTraceTopNode(node: TopDownAllocationNode): void {
@@ -294,14 +268,14 @@ export class FunctionAllocationInfo {
     if (!this.#bottomUpTree) {
       this.#buildAllocationTraceTree();
     }
-    return this.#bottomUpTree as BottomUpAllocationNode;
+    return this.#bottomUpTree ?? null;
   }
 
   #buildAllocationTraceTree(): void {
     this.#bottomUpTree = new BottomUpAllocationNode(this);
 
     for (let i = 0; i < this.#traceTops.length; i++) {
-      let node: (TopDownAllocationNode|null)|TopDownAllocationNode = this.#traceTops[i];
+      let node: TopDownAllocationNode|null = this.#traceTops[i];
       let bottomUpNode: BottomUpAllocationNode = this.#bottomUpTree;
       const count = node.allocationCount;
       const size = node.allocationSize;

package/front_end/entrypoints/heap_snapshot_worker/HeapSnapshot.ts

@@ -2675,7 +2675,7 @@ export abstract class HeapSnapshot {
     if (snapshotDiff) {
       return snapshotDiff;
     }
-    snapshotDiff = ({} as Record<string, HeapSnapshotModel.HeapSnapshotModel.Diff>);
+    snapshotDiff = {};
 
     const aggregates = this.getAggregatesByClassKey(true, 'allObjects');
     for (const classKey in baseSnapshotAggregates) {

package/front_end/entrypoints/main/MainImpl.ts

@@ -397,10 +397,6 @@ export class MainImpl {
         Root.ExperimentNames.ExperimentName.FONT_EDITOR, 'New font editor in the Styles tab',
         'https://developer.chrome.com/blog/new-in-devtools-89/#font');
 
-    // New cookie features.
-    Root.Runtime.experiments.register(
-        Root.ExperimentNames.ExperimentName.EXPERIMENTAL_COOKIE_FEATURES, 'Experimental cookie features');
-
     Root.Runtime.experiments.registerHostExperiment({
       name: Root.ExperimentNames.ExperimentName.DURABLE_MESSAGES,
       title: 'Durable Messages',

package/front_end/generated/InspectorBackendCommands.ts

@@ -344,6 +344,10 @@ inspectorBackend.registerCommand("Cast.startTabMirroring", [{"name": "sinkName",
 inspectorBackend.registerCommand("Cast.stopCasting", [{"name": "sinkName", "type": "string", "optional": false, "description": "", "typeRef": null}], [], "Stops the active Cast session on the sink.");
 inspectorBackend.registerType("Cast.Sink", [{"name": "name", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "id", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "session", "type": "string", "optional": true, "description": "Text describing the current session. Present only if there is an active session on the sink.", "typeRef": null}]);
 
+// CrashReportContext.
+inspectorBackend.registerCommand("CrashReportContext.getEntries", [], ["entries"], "Returns all entries in the CrashReportContext across all frames in the page.");
+inspectorBackend.registerType("CrashReportContext.CrashReportContextEntry", [{"name": "key", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "value", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "frameId", "type": "string", "optional": false, "description": "The ID of the frame where the key-value pair was set.", "typeRef": "Page.FrameId"}]);
+
 // DOM.
 inspectorBackend.registerEnum("DOM.PseudoType", {FirstLine: "first-line", FirstLetter: "first-letter", Checkmark: "checkmark", Before: "before", After: "after", ExpandIcon: "expand-icon", PickerIcon: "picker-icon", InterestHint: "interest-hint", Marker: "marker", Backdrop: "backdrop", Column: "column", Selection: "selection", SearchText: "search-text", TargetText: "target-text", SpellingError: "spelling-error", GrammarError: "grammar-error", Highlight: "highlight", FirstLineInherited: "first-line-inherited", ScrollMarker: "scroll-marker", ScrollMarkerGroup: "scroll-marker-group", ScrollButton: "scroll-button", Scrollbar: "scrollbar", ScrollbarThumb: "scrollbar-thumb", ScrollbarButton: "scrollbar-button", ScrollbarTrack: "scrollbar-track", ScrollbarTrackPiece: "scrollbar-track-piece", ScrollbarCorner: "scrollbar-corner", Resizer: "resizer", InputListButton: "input-list-button", ViewTransition: "view-transition", ViewTransitionGroup: "view-transition-group", ViewTransitionImagePair: "view-transition-image-pair", ViewTransitionGroupChildren: "view-transition-group-children", ViewTransitionOld: "view-transition-old", ViewTransitionNew: "view-transition-new", Placeholder: "placeholder", FileSelectorButton: "file-selector-button", DetailsContent: "details-content", Picker: "picker", PermissionIcon: "permission-icon", OverscrollAreaParent: "overscroll-area-parent"});
 inspectorBackend.registerEnum("DOM.ShadowRootType", {UserAgent: "user-agent", Open: "open", Closed: "closed"});