chrome-devtools-frontend 1.0.1015822 → 1.0.1017091

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

@@ -5159,6 +5159,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

@@ -5159,6 +5159,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

@@ -314,7 +314,7 @@ export class DebuggerModel extends SDKModel<EventTypes> {
     await this.agent.invoke_disable();
     this.#isPausingInternal = false;
     this.globalObjectCleared();
-    this.dispatchEventToListeners(Events.DebuggerWasDisabled);
+    this.dispatchEventToListeners(Events.DebuggerWasDisabled, this);
     if (typeof this.#debuggerId === 'string') {
       _debuggerIdToModel.delete(this.#debuggerId);
     }
@@ -973,7 +973,7 @@ export enum Events {
 
 export type EventTypes = {
   [Events.DebuggerWasEnabled]: DebuggerModel,
-  [Events.DebuggerWasDisabled]: void,
+  [Events.DebuggerWasDisabled]: DebuggerModel,
   [Events.DebuggerPaused]: DebuggerModel,
   [Events.DebuggerResumed]: DebuggerModel,
   [Events.ParsedScriptSource]: Script,

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,6 +177,7 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
     }
     this.dispatchEventToListeners(Events.FrameAdded, frame);
     this.updateSecurityOrigins();
+    void this.updateStorageKeys();
   }
 
   frameAttached(
@@ -233,6 +247,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 +280,7 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
       frame.remove(isSwap);
     }
     this.updateSecurityOrigins();
+    void this.updateStorageKeys();
   }
 
   private onRequestFinished(event: Common.EventTarget.EventTargetEvent<NetworkRequest>): void {
@@ -520,6 +536,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 +563,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 +672,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;
@@ -758,6 +805,13 @@ export class ResourceTreeFrame {
     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;
   }
@@ -1122,3 +1176,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

@@ -257,28 +257,29 @@ export class Script implements TextUtils.ContentProvider.ContentProvider, FrameA
     return source + '\n //# sourceURL=' + this.sourceURL;
   }
 
-  async editSource(newSource: string):
-      Promise<{error: string | null, exceptionDetails?: Protocol.Runtime.ExceptionDetails}> {
+  async editSource(newSource: string): Promise<
+      {status: Protocol.Debugger.SetScriptSourceResponseStatus, exceptionDetails?: Protocol.Runtime.ExceptionDetails}> {
     newSource = Script.trimSourceURLComment(newSource);
     // We append correct #sourceURL to script for consistency only. It's not actually needed for things to work correctly.
     newSource = this.appendSourceURLCommentIfNeeded(newSource);
 
-    if (!this.scriptId) {
-      return {error: 'Script failed to parse'};
-    }
-
     const {content: oldSource} = await this.requestContent();
     if (oldSource === newSource) {
-      return {error: null};
+      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.
+      throw new Error(`Script#editSource failed for script with id ${this.scriptId}: ${response.getError()}`);
+    }
 
-    if (!response.getError() && !response.exceptionDetails) {
+    if (!response.getError() && response.status === Protocol.Debugger.SetScriptSourceResponseStatus.Ok) {
       this.#contentPromise = Promise.resolve({content: newSource, isEncoded: false});
     }
 
-    return {error: response.getError() || null, exceptionDetails: response.exceptionDetails};
+    return {status: response.status, exceptionDetails: response.exceptionDetails};
   }
 
   rawLocation(lineNumber: number, columnNumber: number): Location|null {

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) {