chrome-devtools-frontend 1.0.1016605 → 1.0.1017938

package/config/gni/devtools_grd_files.gni

@@ -654,6 +654,7 @@ grd_files_debug_sources = [
   "front_end/core/sdk/ServiceWorkerManager.js",
   "front_end/core/sdk/SourceMap.js",
   "front_end/core/sdk/SourceMapManager.js",
+  "front_end/core/sdk/StorageKeyManager.js",
   "front_end/core/sdk/Target.js",
   "front_end/core/sdk/TargetManager.js",
   "front_end/core/sdk/TracingManager.js",
@@ -961,6 +962,7 @@ grd_files_debug_sources = [
   "front_end/panels/elements/StylePropertyTreeElement.js",
   "front_end/panels/elements/StylePropertyUtils.js",
   "front_end/panels/elements/StylesSidebarPane.js",
+  "front_end/panels/elements/TopLayerContainer.js",
   "front_end/panels/elements/classesPaneWidget.css.js",
   "front_end/panels/elements/components/AccessibilityTreeNode.js",
   "front_end/panels/elements/components/AdornerManager.js",

package/front_end/core/i18n/locales/en-US.json

@@ -3035,6 +3035,9 @@
   "panels/application/components/FrameDetailsView.ts | creationStackTraceExplanation": {
     "message": "This frame was created programmatically. The stack trace shows where this happened."
   },
+  "panels/application/components/FrameDetailsView.ts | creatorAdScript": {
+    "message": "Creator Ad Script"
+  },
   "panels/application/components/FrameDetailsView.ts | crossoriginIsolated": {
     "message": "Cross-Origin Isolated"
   },
@@ -4892,12 +4895,6 @@
   "panels/elements/ElementsTreeElement.ts | enableScrollSnap": {
     "message": "Enable scroll-snap overlay"
   },
-  "panels/elements/ElementsTreeElement.ts | enterIsolationMode": {
-    "message": "Enter Isolation Mode"
-  },
-  "panels/elements/ElementsTreeElement.ts | exitIsolationMode": {
-    "message": "Exit Isolation Mode"
-  },
   "panels/elements/ElementsTreeElement.ts | expandRecursively": {
     "message": "Expand recursively"
   },
@@ -5159,6 +5156,9 @@
   "panels/elements/StylesSidebarPane.ts | unknownPropertyName": {
     "message": "Unknown property name"
   },
+  "panels/elements/TopLayerContainer.ts | topLayer": {
+    "message": "top-layer"
+  },
   "panels/emulation/DeviceModeToolbar.ts | addDevicePixelRatio": {
     "message": "Add device pixel ratio"
   },

package/front_end/core/i18n/locales/en-XL.json

@@ -3035,6 +3035,9 @@
   "panels/application/components/FrameDetailsView.ts | creationStackTraceExplanation": {
     "message": "T̂h́îś f̂ŕâḿê ẃâś ĉŕêát̂éd̂ ṕr̂óĝŕâḿm̂át̂íĉál̂ĺŷ. T́ĥé stack trace ŝh́ôẃŝ ẃĥér̂é t̂h́îś ĥáp̂ṕêńêd́."
   },
+  "panels/application/components/FrameDetailsView.ts | creatorAdScript": {
+    "message": "Ĉŕêát̂ór̂ Ád̂ Śĉŕîṕt̂"
+  },
   "panels/application/components/FrameDetailsView.ts | crossoriginIsolated": {
     "message": "Ĉŕôśŝ-Ór̂íĝín̂ Íŝól̂át̂éd̂"
   },
@@ -4892,12 +4895,6 @@
   "panels/elements/ElementsTreeElement.ts | enableScrollSnap": {
     "message": "Êńâb́l̂é ŝćr̂ól̂ĺ-ŝńâṕ ôv́êŕl̂áŷ"
   },
-  "panels/elements/ElementsTreeElement.ts | enterIsolationMode": {
-    "message": "Êńt̂ér̂ Íŝól̂át̂íôń M̂ód̂é"
-  },
-  "panels/elements/ElementsTreeElement.ts | exitIsolationMode": {
-    "message": "Êx́ît́ Îśôĺât́îón̂ Ḿôd́ê"
-  },
   "panels/elements/ElementsTreeElement.ts | expandRecursively": {
     "message": "Êx́p̂án̂d́ r̂éĉúr̂śîv́êĺŷ"
   },
@@ -5159,6 +5156,9 @@
   "panels/elements/StylesSidebarPane.ts | unknownPropertyName": {
     "message": "Ûńk̂ńôẃn̂ ṕr̂óp̂ér̂t́ŷ ńâḿê"
   },
+  "panels/elements/TopLayerContainer.ts | topLayer": {
+    "message": "t̂óp̂-ĺâýêŕ"
+  },
   "panels/emulation/DeviceModeToolbar.ts | addDevicePixelRatio": {
     "message": "Âd́d̂ d́êv́îćê ṕîx́êĺ r̂át̂íô"
   },

package/front_end/core/sdk/DOMModel.ts

@@ -1410,6 +1410,10 @@ export class DOMModel extends SDKModel<EventTypes> {
     this.scheduleMutationEvent(node);
   }
 
+  topLayerElementsUpdated(): void {
+    this.dispatchEventToListeners(Events.TopLayerElementsChanged);
+  }
+
   pseudoElementRemoved(parentId: Protocol.DOM.NodeId, pseudoElementId: Protocol.DOM.NodeId): void {
     const parent = this.idToDOMNode.get(parentId);
     if (!parent) {
@@ -1511,6 +1515,10 @@ export class DOMModel extends SDKModel<EventTypes> {
     return this.agent.invoke_querySelectorAll({nodeId, selector}).then(({nodeIds}) => nodeIds);
   }
 
+  getTopLayerElements(): Promise<Protocol.DOM.NodeId[]|null> {
+    return this.agent.invoke_getTopLayerElements().then(({nodeIds}) => nodeIds);
+  }
+
   markUndoableState(minorChange?: boolean): void {
     void DOMModelUndoStack.instance().markUndoableState(this, minorChange || false);
   }
@@ -1574,6 +1582,7 @@ export enum Events {
   ChildNodeCountUpdated = 'ChildNodeCountUpdated',
   DistributedNodesChanged = 'DistributedNodesChanged',
   MarkersChanged = 'MarkersChanged',
+  TopLayerElementsChanged = 'TopLayerElementsChanged',
 }
 
 export type EventTypes = {
@@ -1587,6 +1596,7 @@ export type EventTypes = {
   [Events.ChildNodeCountUpdated]: DOMNode,
   [Events.DistributedNodesChanged]: DOMNode,
   [Events.MarkersChanged]: DOMNode,
+  [Events.TopLayerElementsChanged]: void,
 };
 
 class DOMDispatcher implements ProtocolProxyApi.DOMDispatcher {
@@ -1652,6 +1662,7 @@ class DOMDispatcher implements ProtocolProxyApi.DOMDispatcher {
   }
 
   topLayerElementsUpdated(): void {
+    this.#domModel.topLayerElementsUpdated();
   }
 }
 

package/front_end/core/sdk/DebuggerModel.ts

@@ -230,6 +230,10 @@ export class DebuggerModel extends SDKModel<EventTypes> {
     return Boolean(this.#debuggerEnabledInternal);
   }
 
+  debuggerId(): string|null {
+    return this.#debuggerId;
+  }
+
   private async enableDebugger(): Promise<void> {
     if (this.#debuggerEnabledInternal) {
       return;

package/front_end/core/sdk/FrameManager.ts

@@ -28,8 +28,12 @@ export class FrameManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
   }>;
   readonly #framesForTarget: Map<Protocol.Target.TargetID|'main', Set<Protocol.Page.FrameId>>;
   #topFrame: ResourceTreeFrame|null;
-  #creationStackTraceDataForTransferringFrame:
-      Map<string, {creationStackTrace: Protocol.Runtime.StackTrace | null, creationStackTraceTarget: Target}>;
+  #transferringFramesDataCache: Map<string, {
+    creationStackTrace?: Protocol.Runtime.StackTrace,
+    creationStackTraceTarget?: Target,
+    adScriptId?: Protocol.Runtime.ScriptId,
+    debuggerId?: Protocol.Runtime.UniqueDebuggerId,
+  }>;
   #awaitedFrames: Map<string, {notInTarget?: Target, resolve: (frame: ResourceTreeFrame) => void}[]> = new Map();
 
   constructor() {
@@ -46,7 +50,7 @@ export class FrameManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     this.#framesForTarget = new Map();
 
     this.#topFrame = null;
-    this.#creationStackTraceDataForTransferringFrame = new Map();
+    this.#transferringFramesDataCache = new Map();
   }
 
   static instance({forceNew}: {
@@ -94,19 +98,30 @@ export class FrameManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     const frameData = this.#frames.get(frame.id);
     // If the frame is already in the map, increase its count, otherwise add it to the map.
     if (frameData) {
-      // In order to not lose frame creation stack trace information during
-      // an OOPIF transfer we need to copy it to the new frame
+      // In order to not lose the following attributes of a frame during
+      // an OOPIF transfer we need to copy them to the new frame
       frame.setCreationStackTrace(frameData.frame.getCreationStackTraceData());
+      frame.setAdScriptId(frameData.frame.getAdScriptId());
+      frame.setDebuggerId(frameData.frame.getDebuggerId());
       this.#frames.set(frame.id, {frame, count: frameData.count + 1});
     } else {
       // If the transferring frame's detached event is received before its frame added
-      // event in the new target, the persisted frame creation stacktrace is reassigned.
-      const traceData = this.#creationStackTraceDataForTransferringFrame.get(frame.id);
-      if (traceData && traceData.creationStackTrace) {
-        frame.setCreationStackTrace(traceData);
+      // event in the new target, the frame's cached attributes are reassigned.
+      const cachedFrameAttributes = this.#transferringFramesDataCache.get(frame.id);
+      if (cachedFrameAttributes?.creationStackTrace && cachedFrameAttributes?.creationStackTraceTarget) {
+        frame.setCreationStackTrace({
+          creationStackTrace: cachedFrameAttributes.creationStackTrace,
+          creationStackTraceTarget: cachedFrameAttributes.creationStackTraceTarget,
+        });
+      }
+      if (cachedFrameAttributes?.adScriptId) {
+        frame.setAdScriptId(cachedFrameAttributes.adScriptId);
+      }
+      if (cachedFrameAttributes?.debuggerId) {
+        frame.setDebuggerId(cachedFrameAttributes.debuggerId);
       }
       this.#frames.set(frame.id, {frame, count: 1});
-      this.#creationStackTraceDataForTransferringFrame.delete(frame.id);
+      this.#transferringFramesDataCache.delete(frame.id);
     }
     this.resetTopFrame();
 
@@ -126,13 +141,19 @@ export class FrameManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     this.decreaseOrRemoveFrame(frame.id);
 
     // If the transferring frame's detached event is received before its frame
-    // added event in the new target, we persist the frame creation stacktrace here
-    // so that later on the frame added event in the new target it can be reassigned.
+    // added event in the new target, we persist some attributes of the frame here
+    // so that later on the frame added event in the new target they can be reassigned.
     if (isSwap && !this.#frames.get(frame.id)) {
       const traceData = frame.getCreationStackTraceData();
-      if (traceData.creationStackTrace) {
-        this.#creationStackTraceDataForTransferringFrame.set(frame.id, traceData);
-      }
+      const adScriptId = frame.getAdScriptId();
+      const debuggerId = frame.getDebuggerId();
+      const cachedFrameAttributes = {
+        ...(traceData.creationStackTrace && {creationStackTrace: traceData.creationStackTrace}),
+        ...(traceData.creationStackTrace && {creationStackTraceTarget: traceData.creationStackTraceTarget}),
+        ...(adScriptId && {adScriptId}),
+        ...(debuggerId && {debuggerId}),
+      };
+      this.#transferringFramesDataCache.set(frame.id, cachedFrameAttributes);
     }
 
     // Remove the frameId from the target's set of frameIds.

package/front_end/core/sdk/ResourceTreeModel.ts

@@ -50,10 +50,13 @@ import {Capability} from './Target.js';
 import {SDKModel} from './SDKModel.js';
 import {TargetManager} from './TargetManager.js';
 import {SecurityOriginManager} from './SecurityOriginManager.js';
+import {StorageKeyManager} from './StorageKeyManager.js';
 
 export class ResourceTreeModel extends SDKModel<EventTypes> {
   readonly agent: ProtocolProxyApi.PageApi;
+  readonly storageAgent: ProtocolProxyApi.StorageApi;
   readonly #securityOriginManager: SecurityOriginManager;
+  readonly #storageKeyManager: StorageKeyManager;
   readonly framesInternal: Map<string, ResourceTreeFrame>;
   #cachedResourcesProcessed: boolean;
   #pendingReloadOptions: {
@@ -75,8 +78,10 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
       networkManager.addEventListener(NetworkManagerEvents.RequestUpdateDropped, this.onRequestUpdateDropped, this);
     }
     this.agent = target.pageAgent();
+    this.storageAgent = target.storageAgent();
     void this.agent.invoke_enable();
     this.#securityOriginManager = (target.model(SecurityOriginManager) as SecurityOriginManager);
+    this.#storageKeyManager = (target.model(StorageKeyManager) as StorageKeyManager);
     this.#pendingBackForwardCacheNotUsedEvents = new Set<Protocol.Page.BackForwardCacheNotUsedEvent>();
     this.#pendingPrerenderAttemptCompletedEvents = new Set<Protocol.Page.PrerenderAttemptCompletedEvent>();
     target.registerPageDispatcher(new PageDispatcher(this));
@@ -129,6 +134,14 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
     }
   }
 
+  async storageKeyForFrame(frameId: Protocol.Page.FrameId): Promise<string|null> {
+    const response = await this.storageAgent.invoke_getStorageKeyForFrame({frameId: frameId});
+    if (response.getError() === 'Frame tree node for given frame not found') {
+      return null;
+    }
+    return response.storageKey;
+  }
+
   domModel(): DOMModel {
     return this.target().model(DOMModel) as DOMModel;
   }
@@ -164,11 +177,12 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
     }
     this.dispatchEventToListeners(Events.FrameAdded, frame);
     this.updateSecurityOrigins();
+    void this.updateStorageKeys();
   }
 
   frameAttached(
       frameId: Protocol.Page.FrameId, parentFrameId: Protocol.Page.FrameId|null,
-      stackTrace?: Protocol.Runtime.StackTrace): ResourceTreeFrame|null {
+      stackTrace?: Protocol.Runtime.StackTrace, adScriptId?: Protocol.Page.AdScriptId): ResourceTreeFrame|null {
     const sameTargetParentFrame = parentFrameId ? (this.framesInternal.get(parentFrameId) || null) : null;
     // Do nothing unless cached resource tree is processed - it will overwrite everything.
     if (!this.#cachedResourcesProcessed && sameTargetParentFrame) {
@@ -178,7 +192,8 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
       return null;
     }
 
-    const frame = new ResourceTreeFrame(this, sameTargetParentFrame, frameId, null, stackTrace || null);
+    const frame =
+        new ResourceTreeFrame(this, sameTargetParentFrame, frameId, null, stackTrace || null, adScriptId || null);
     if (parentFrameId && !sameTargetParentFrame) {
       frame.crossTargetParentFrameId = parentFrameId;
     }
@@ -233,6 +248,7 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
       this.target().setInspectedURL(frame.url);
     }
     this.updateSecurityOrigins();
+    void this.updateStorageKeys();
   }
 
   documentOpened(framePayload: Protocol.Page.Frame): void {
@@ -265,6 +281,7 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
       frame.remove(isSwap);
     }
     this.updateSecurityOrigins();
+    void this.updateStorageKeys();
   }
 
   private onRequestFinished(event: Common.EventTarget.EventTargetEvent<NetworkRequest>): void {
@@ -332,7 +349,7 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
   private addFramesRecursively(
       sameTargetParentFrame: ResourceTreeFrame|null, frameTreePayload: Protocol.Page.FrameResourceTree): void {
     const framePayload = frameTreePayload.frame;
-    const frame = new ResourceTreeFrame(this, sameTargetParentFrame, framePayload.id, framePayload, null);
+    const frame = new ResourceTreeFrame(this, sameTargetParentFrame, framePayload.id, framePayload, null, null);
     if (!sameTargetParentFrame && framePayload.parentId) {
       frame.crossTargetParentFrameId = framePayload.parentId;
     }
@@ -520,6 +537,26 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
     };
   }
 
+  private async getStorageKeyData(): Promise<StorageKeyData> {
+    const storageKeys = new Set<string>();
+    let mainStorageKey: string|null = null;
+
+    for (const {isMainFrame, storageKey} of await Promise.all(
+             [...this.framesInternal.values()].map(async f => f.storageKey.then(k => ({
+                                                                                  isMainFrame: f.isMainFrame(),
+                                                                                  storageKey: k,
+                                                                                }))))) {
+      if (isMainFrame) {
+        mainStorageKey = storageKey;
+      }
+      if (storageKey) {
+        storageKeys.add(storageKey);
+      }
+    }
+
+    return {storageKeys: storageKeys, mainStorageKey: mainStorageKey};
+  }
+
   private updateSecurityOrigins(): void {
     const data = this.getSecurityOriginData();
     this.#securityOriginManager.setMainSecurityOrigin(
@@ -527,6 +564,16 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
     this.#securityOriginManager.updateSecurityOrigins(data.securityOrigins);
   }
 
+  private async updateStorageKeys(): Promise<void> {
+    const data = await this.getStorageKeyData();
+    this.#storageKeyManager.setMainStorageKey(data.mainStorageKey || '');
+    this.#storageKeyManager.updateStorageKeys(data.storageKeys);
+  }
+
+  async getMainStorageKey(): Promise<string|null> {
+    return this.mainFrame ? this.mainFrame.storageKey : null;
+  }
+
   getMainSecurityOrigin(): string|null {
     const data = this.getSecurityOriginData();
     return data.mainSecurityOrigin || data.unreachableMainSecurityOrigin;
@@ -626,6 +673,7 @@ export class ResourceTreeFrame {
   #urlInternal: Platform.DevToolsPath.UrlString;
   #domainAndRegistryInternal: string;
   #securityOriginInternal: string|null;
+  #storageKeyInternal?: Promise<string|null>;
   #unreachableUrlInternal: Platform.DevToolsPath.UrlString;
   #adFrameStatusInternal?: Protocol.Page.AdFrameStatus;
   #secureContextType: Protocol.Page.SecureContextType|null;
@@ -634,6 +682,8 @@ export class ResourceTreeFrame {
   #creationStackTrace: Protocol.Runtime.StackTrace|null;
   #creationStackTraceTarget: Target|null;
   #childFramesInternal: Set<ResourceTreeFrame>;
+  #adScriptId: Protocol.Runtime.ScriptId|null;
+  #debuggerId: Protocol.Runtime.UniqueDebuggerId|null;
   resourcesMap: Map<Platform.DevToolsPath.UrlString, Resource>;
   backForwardCacheDetails: {
     restoredFromCache: boolean|undefined,
@@ -648,7 +698,8 @@ export class ResourceTreeFrame {
 
   constructor(
       model: ResourceTreeModel, parentFrame: ResourceTreeFrame|null, frameId: Protocol.Page.FrameId,
-      payload: Protocol.Page.Frame|null, creationStackTrace: Protocol.Runtime.StackTrace|null) {
+      payload: Protocol.Page.Frame|null, creationStackTrace: Protocol.Runtime.StackTrace|null,
+      adScriptId: Protocol.Page.AdScriptId|null) {
     this.#model = model;
     this.#sameTargetParentFrameInternal = parentFrame;
     this.#idInternal = frameId;
@@ -670,6 +721,9 @@ export class ResourceTreeFrame {
     this.#creationStackTrace = creationStackTrace;
     this.#creationStackTraceTarget = null;
 
+    this.#adScriptId = adScriptId?.scriptId || null;
+    this.#debuggerId = adScriptId?.debuggerId || null;
+
     this.#childFramesInternal = new Set();
 
     this.resourcesMap = new Map();
@@ -754,10 +808,33 @@ export class ResourceTreeFrame {
     return this.#domainAndRegistryInternal;
   }
 
+  getAdScriptId(): Protocol.Runtime.ScriptId|null {
+    return this.#adScriptId;
+  }
+
+  setAdScriptId(adScriptId: Protocol.Runtime.ScriptId|null): void {
+    this.#adScriptId = adScriptId;
+  }
+
+  getDebuggerId(): Protocol.Runtime.UniqueDebuggerId|null {
+    return this.#debuggerId;
+  }
+
+  setDebuggerId(debuggerId: Protocol.Runtime.UniqueDebuggerId|null): void {
+    this.#debuggerId = debuggerId;
+  }
+
   get securityOrigin(): string|null {
     return this.#securityOriginInternal;
   }
 
+  get storageKey(): Promise<string|null> {
+    if (!this.#storageKeyInternal) {
+      this.#storageKeyInternal = this.#model.storageKeyForFrame(this.#idInternal);
+    }
+    return this.#storageKeyInternal;
+  }
+
   unreachableUrl(): Platform.DevToolsPath.UrlString {
     return this.#unreachableUrlInternal;
   }
@@ -1033,8 +1110,8 @@ export class PageDispatcher implements ProtocolProxyApi.PageDispatcher {
     this.#resourceTreeModel.dispatchEventToListeners(Events.LifecycleEvent, {frameId, name});
   }
 
-  frameAttached({frameId, parentFrameId, stack}: Protocol.Page.FrameAttachedEvent): void {
-    this.#resourceTreeModel.frameAttached(frameId, parentFrameId, stack);
+  frameAttached({frameId, parentFrameId, stack, adScriptId}: Protocol.Page.FrameAttachedEvent): void {
+    this.#resourceTreeModel.frameAttached(frameId, parentFrameId, stack, adScriptId);
   }
 
   frameNavigated({frame, type}: Protocol.Page.FrameNavigatedEvent): void {
@@ -1122,3 +1199,8 @@ export interface SecurityOriginData {
   mainSecurityOrigin: string|null;
   unreachableMainSecurityOrigin: string|null;
 }
+
+export interface StorageKeyData {
+  storageKeys: Set<string>;
+  mainStorageKey: string|null;
+}

package/front_end/core/sdk/Script.ts

@@ -268,7 +268,7 @@ export class Script implements TextUtils.ContentProvider.ContentProvider, FrameA
       return {status: Protocol.Debugger.SetScriptSourceResponseStatus.Ok};
     }
     const response = await this.debuggerModel.target().debuggerAgent().invoke_setScriptSource(
-        {scriptId: this.scriptId, scriptSource: newSource});
+        {scriptId: this.scriptId, scriptSource: newSource, allowTopFrameEditing: true});
     if (response.getError()) {
       // Something went seriously wrong, like the V8 inspector no longer knowing about this script without
       // shutting down the Debugger agent etc.

package/front_end/core/sdk/SecurityOriginManager.ts

@@ -81,5 +81,5 @@ export type EventTypes = {
   [Events.MainSecurityOriginChanged]: MainSecurityOriginChangedEvent,
 };
 
-// TODO(jarhar): this is the only usage of Capability.None. Do something about it!
+// TODO(jarhar): this is the one of the two usages of Capability.None. Do something about it!
 SDKModel.register(SecurityOriginManager, {capabilities: Capability.None, autostart: false});

package/front_end/core/sdk/StorageKeyManager.ts

@@ -0,0 +1,71 @@
+// Copyright 2022 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import type {Target} from './Target.js';
+import {Capability} from './Target.js';
+import {SDKModel} from './SDKModel.js';
+
+export class StorageKeyManager extends SDKModel<EventTypes> {
+  #mainStorageKeyInternal: string;
+  #storageKeysInternal: Set<string>;
+  constructor(target: Target) {
+    super(target);
+
+    this.#mainStorageKeyInternal = '';
+    this.#storageKeysInternal = new Set();
+  }
+
+  updateStorageKeys(storageKeys: Set<string>): void {
+    const oldStorageKeys = this.#storageKeysInternal;
+    this.#storageKeysInternal = storageKeys;
+
+    for (const storageKey of oldStorageKeys) {
+      if (!this.#storageKeysInternal.has(storageKey)) {
+        this.dispatchEventToListeners(Events.StorageKeyRemoved, storageKey);
+      }
+    }
+
+    for (const storageKey of this.#storageKeysInternal) {
+      if (!oldStorageKeys.has(storageKey)) {
+        this.dispatchEventToListeners(Events.StorageKeyAdded, storageKey);
+      }
+    }
+  }
+
+  storageKeys(): string[] {
+    return [...this.#storageKeysInternal];
+  }
+
+  mainStorageKey(): string {
+    return this.#mainStorageKeyInternal;
+  }
+
+  setMainStorageKey(storageKey: string): void {
+    this.#mainStorageKeyInternal = storageKey;
+    this.dispatchEventToListeners(Events.MainStorageKeyChanged, {
+      mainStorageKey: this.#mainStorageKeyInternal,
+    });
+  }
+}
+
+// TODO(crbug.com/1167717): Make this a const enum again
+// eslint-disable-next-line rulesdir/const_enum
+export enum Events {
+  StorageKeyAdded = 'StorageKeyAdded',
+  StorageKeyRemoved = 'StorageKeyRemoved',
+  MainStorageKeyChanged = 'MainStorageKeyChanged',
+}
+
+export interface MainStorageKeyChangedEvent {
+  mainStorageKey: string;
+}
+
+export type EventTypes = {
+  [Events.StorageKeyAdded]: string,
+  [Events.StorageKeyRemoved]: string,
+  [Events.MainStorageKeyChanged]: MainStorageKeyChangedEvent,
+};
+
+// TODO(jarhar): this is the one of the two usages of Capability.None. Do something about it!
+SDKModel.register(StorageKeyManager, {capabilities: Capability.None, autostart: false});

package/front_end/core/sdk/sdk.ts

@@ -72,6 +72,7 @@ import * as ServiceWorkerCacheModel from './ServiceWorkerCacheModel.js';
 import * as ServiceWorkerManager from './ServiceWorkerManager.js';
 import * as SourceMap from './SourceMap.js';
 import * as SourceMapManager from './SourceMapManager.js';
+import * as StorageKeyManager from './StorageKeyManager.js';
 import * as Target from './Target.js';
 import * as TargetManager from './TargetManager.js';
 import * as TracingManager from './TracingManager.js';
@@ -141,6 +142,7 @@ export {
   ServiceWorkerManager,
   SourceMap,
   SourceMapManager,
+  StorageKeyManager,
   Target,
   TargetManager,
   TracingManager,

package/front_end/entrypoints/formatter_worker/ScopeParser.ts

@@ -312,8 +312,9 @@ export class ScopeVariableAnalysis {
         break;
       case 'Property':
         if (node.shorthand) {
-          console.assert(node.value === node.key);
           console.assert(node.value.type === 'Identifier');
+          console.assert(node.key.type === 'Identifier');
+          console.assert((node.value as Acorn.ESTree.Identifier).name === (node.key as Acorn.ESTree.Identifier).name);
           this.#addVariable((node.value as Acorn.ESTree.Identifier).name, node.value.start, DefinitionKind.None, true);
         } else {
           if (node.computed) {
@@ -469,8 +470,9 @@ export class ScopeVariableAnalysis {
       case 'Property':
         // This is AssignmentProperty inside an object pattern.
         if (node.shorthand) {
-          console.assert(node.value === node.key);
           console.assert(node.value.type === 'Identifier');
+          console.assert(node.key.type === 'Identifier');
+          console.assert((node.value as Acorn.ESTree.Identifier).name === (node.key as Acorn.ESTree.Identifier).name);
           this.#addVariable((node.value as Acorn.ESTree.Identifier).name, node.value.start, definitionKind, true);
         } else {
           if (node.computed) {

package/front_end/models/issues_manager/DeprecationIssue.ts

@@ -253,7 +253,8 @@ const UIStrings = {
    */
   rtcpMuxPolicyNegotiate: 'The `rtcpMuxPolicy` option is deprecated and will be removed.',
   /**
-   * @description TODO(crbug.com/1318878): Description needed for translation
+   * @description A deprecation warning shown in the DevTools Issues tab. The placeholder is always the noun
+   * "SharedArrayBuffer" which refers to a JavaScript construct.
    */
   sharedArrayBufferConstructedWithoutIsolation:
       '`SharedArrayBuffer` will require cross-origin isolation. See https://developer.chrome.com/blog/enabling-shared-array-buffer/ for more details.',
@@ -265,7 +266,9 @@ const UIStrings = {
   textToSpeech_DisallowedByAutoplay:
       '`speechSynthesis.speak()` without user activation is deprecated and will be removed.',
   /**
-   * @description TODO(crbug.com/1318879): Description needed for translation
+   * @description A deprecation warning shown in the DevTools Issues tab. The placeholder is always the noun
+   * "SharedArrayBuffer" which refers to a JavaScript construct. "Extensions" refers to Chrome extensions. The warning is shown
+   * when Chrome Extensions attempt to use "SharedArrayBuffer"s under insecure circumstances.
    */
   v8SharedArrayBufferConstructedInExtensionWithoutIsolation:
       'Extensions should opt into cross-origin isolation to continue using `SharedArrayBuffer`. See https://developer.chrome.com/docs/extensions/mv3/cross-origin-isolation/.',

package/front_end/models/timeline_model/TimelineModel.ts

@@ -181,7 +181,7 @@ export class TimelineModelImpl {
       case RecordType.MarkLoad:
       case RecordType.MarkLCPCandidate:
       case RecordType.MarkLCPInvalidate:
-        return Boolean(event.args['data']['isMainFrame']);
+        return Boolean(event.args['data']['isOutermostMainFrame'] ?? event.args['data']['isMainFrame']);
       default:
         return false;
     }
@@ -203,11 +203,13 @@ export class TimelineModelImpl {
   }
 
   isLCPCandidateEvent(event: SDK.TracingModel.Event): boolean {
-    return event.name === RecordType.MarkLCPCandidate && Boolean(event.args['data']['isMainFrame']);
+    return event.name === RecordType.MarkLCPCandidate &&
+        Boolean(event.args['data']['isOutermostMainFrame'] ?? event.args['data']['isMainFrame']);
   }
 
   isLCPInvalidateEvent(event: SDK.TracingModel.Event): boolean {
-    return event.name === RecordType.MarkLCPInvalidate && Boolean(event.args['data']['isMainFrame']);
+    return event.name === RecordType.MarkLCPInvalidate &&
+        Boolean(event.args['data']['isOutermostMainFrame'] ?? event.args['data']['isMainFrame']);
   }
 
   isFCPEvent(event: SDK.TracingModel.Event): boolean {
@@ -1133,7 +1135,7 @@ export class TimelineModelImpl {
           break;
         }
         const frameId = TimelineModelImpl.eventFrameId(event);
-        const isMainFrame = Boolean(eventData['isMainFrame']);
+        const isOutermostMainFrame = Boolean(eventData['isOutermostMainFrame'] ?? eventData['isMainFrame']);
         const pageFrame = frameId ? this.pageFrames.get(frameId) : null;
         if (pageFrame) {
           pageFrame.update(event.startTime, eventData);
@@ -1144,13 +1146,13 @@ export class TimelineModelImpl {
             if (eventData['page'] && eventData['page'] !== this.legacyCurrentPage) {
               return false;
             }
-          } else if (isMainFrame) {
+          } else if (isOutermostMainFrame) {
             return false;
           } else if (!this.addPageFrame(event, eventData)) {
             return false;
           }
         }
-        if (isMainFrame && frameId) {
+        if (isOutermostMainFrame && frameId) {
           const frame = this.pageFrames.get(frameId);
           if (frame) {
             this.mainFrame = frame;