chrome-devtools-frontend 1.0.923302 → 1.0.925026

package/front_end/panels/web_audio/WebAudioModel.ts

@@ -6,7 +6,7 @@ import * as SDK from '../../core/sdk/sdk.js';
 import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
 import type * as Protocol from '../../generated/protocol.js';
 
-export class WebAudioModel extends SDK.SDKModel.SDKModel implements ProtocolProxyApi.WebAudioDispatcher {
+export class WebAudioModel extends SDK.SDKModel.SDKModel<EventTypes> implements ProtocolProxyApi.WebAudioDispatcher {
   private enabled: boolean;
   private readonly agent: ProtocolProxyApi.WebAudioApi;
   constructor(target: SDK.Target.Target) {
@@ -138,3 +138,21 @@ export const enum Events {
   NodeParamConnected = 'NodeParamConnected',
   NodeParamDisconnected = 'NodeParamDisconnected',
 }
+
+export type EventTypes = {
+  [Events.ContextCreated]: Protocol.WebAudio.BaseAudioContext,
+  [Events.ContextDestroyed]: Protocol.WebAudio.GraphObjectId,
+  [Events.ContextChanged]: Protocol.WebAudio.BaseAudioContext,
+  [Events.ModelReset]: void,
+  [Events.ModelSuspend]: void,
+  [Events.AudioListenerCreated]: Protocol.WebAudio.AudioListener,
+  [Events.AudioListenerWillBeDestroyed]: Protocol.WebAudio.AudioListenerWillBeDestroyedEvent,
+  [Events.AudioNodeCreated]: Protocol.WebAudio.AudioNode,
+  [Events.AudioNodeWillBeDestroyed]: Protocol.WebAudio.AudioNodeWillBeDestroyedEvent,
+  [Events.AudioParamCreated]: Protocol.WebAudio.AudioParam,
+  [Events.AudioParamWillBeDestroyed]: Protocol.WebAudio.AudioParamWillBeDestroyedEvent,
+  [Events.NodesConnected]: Protocol.WebAudio.NodesConnectedEvent,
+  [Events.NodesDisconnected]: Protocol.WebAudio.NodesDisconnectedEvent,
+  [Events.NodeParamConnected]: Protocol.WebAudio.NodeParamConnectedEvent,
+  [Events.NodeParamDisconnected]: Protocol.WebAudio.NodeParamDisconnectedEvent,
+};

package/front_end/panels/web_audio/WebAudioView.ts

@@ -8,10 +8,10 @@ import * as i18n from '../../core/i18n/i18n.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import * as UI from '../../ui/legacy/legacy.js';
 import type * as Protocol from '../../generated/protocol.js';
+import * as GraphVisualizer from './graph_visualizer/graph_visualizer.js';
 
 import {ContextDetailBuilder, ContextSummaryBuilder} from './AudioContextContentBuilder.js';
 import {AudioContextSelector, Events as SelectorEvents} from './AudioContextSelector.js';
-import {GraphManager} from './graph_visualizer/GraphManager.js';
 import {Events as ModelEvents, WebAudioModel} from './WebAudioModel.js';
 
 const UIStrings = {
@@ -29,7 +29,7 @@ export class WebAudioView extends UI.ThrottledWidget.ThrottledWidget implements
   private readonly contextSelector: AudioContextSelector;
   private readonly contentContainer: HTMLElement;
   private readonly detailViewContainer: HTMLElement;
-  private graphManager: GraphManager;
+  private graphManager: GraphVisualizer.GraphManager.GraphManager;
   private readonly landingPage: UI.Widget.VBox;
   private readonly summaryBarContainer: HTMLElement;
   constructor() {
@@ -50,7 +50,7 @@ export class WebAudioView extends UI.ThrottledWidget.ThrottledWidget implements
     // Creates the detail view.
     this.detailViewContainer = this.contentContainer.createChild('div', 'web-audio-details-container vbox flex-auto');
 
-    this.graphManager = new GraphManager();
+    this.graphManager = new GraphVisualizer.GraphManager.GraphManager();
 
     // Creates the landing page.
     this.landingPage = new UI.Widget.VBox();
@@ -154,20 +154,20 @@ export class WebAudioView extends UI.ThrottledWidget.ThrottledWidget implements
     webAudioModel.removeEventListener(ModelEvents.NodeParamDisconnected, this.nodeParamDisconnected, this);
   }
 
-  private contextCreated(event: Common.EventTarget.EventTargetEvent): void {
-    const context = (event.data as Protocol.WebAudio.BaseAudioContext);
+  private contextCreated(event: Common.EventTarget.EventTargetEvent<Protocol.WebAudio.BaseAudioContext>): void {
+    const context = event.data;
     this.graphManager.createContext(context.contextId);
     this.contextSelector.contextCreated(event);
   }
 
-  private contextDestroyed(event: Common.EventTarget.EventTargetEvent): void {
-    const contextId = (event.data as string);
+  private contextDestroyed(event: Common.EventTarget.EventTargetEvent<Protocol.WebAudio.GraphObjectId>): void {
+    const contextId = event.data;
     this.graphManager.destroyContext(contextId);
     this.contextSelector.contextDestroyed(event);
   }
 
-  private contextChanged(event: Common.EventTarget.EventTargetEvent): void {
-    const context = (event.data as Protocol.WebAudio.BaseAudioContext);
+  private contextChanged(event: Common.EventTarget.EventTargetEvent<Protocol.WebAudio.BaseAudioContext>): void {
+    const context = event.data;
     if (!this.graphManager.hasContext(context.contextId)) {
       return;
     }
@@ -189,8 +189,8 @@ export class WebAudioView extends UI.ThrottledWidget.ThrottledWidget implements
     this.graphManager.clearGraphs();
   }
 
-  private audioListenerCreated(event: Common.EventTarget.EventTargetEvent): void {
-    const listener = (event.data as Protocol.WebAudio.AudioListener);
+  private audioListenerCreated(event: Common.EventTarget.EventTargetEvent<Protocol.WebAudio.AudioListener>): void {
+    const listener = event.data;
     const graph = this.graphManager.getGraph(listener.contextId);
     if (!graph) {
       return;
@@ -203,7 +203,8 @@ export class WebAudioView extends UI.ThrottledWidget.ThrottledWidget implements
     });
   }
 
-  private audioListenerWillBeDestroyed(event: Common.EventTarget.EventTargetEvent): void {
+  private audioListenerWillBeDestroyed(
+      event: Common.EventTarget.EventTargetEvent<Protocol.WebAudio.AudioListenerWillBeDestroyedEvent>): void {
     const {contextId, listenerId} = event.data;
     const graph = this.graphManager.getGraph(contextId);
     if (!graph) {
@@ -212,8 +213,8 @@ export class WebAudioView extends UI.ThrottledWidget.ThrottledWidget implements
     graph.removeNode(listenerId);
   }
 
-  private audioNodeCreated(event: Common.EventTarget.EventTargetEvent): void {
-    const node = (event.data as Protocol.WebAudio.AudioNode);
+  private audioNodeCreated(event: Common.EventTarget.EventTargetEvent<Protocol.WebAudio.AudioNode>): void {
+    const node = event.data;
     const graph = this.graphManager.getGraph(node.contextId);
     if (!graph) {
       return;
@@ -226,7 +227,8 @@ export class WebAudioView extends UI.ThrottledWidget.ThrottledWidget implements
     });
   }
 
-  private audioNodeWillBeDestroyed(event: Common.EventTarget.EventTargetEvent): void {
+  private audioNodeWillBeDestroyed(
+      event: Common.EventTarget.EventTargetEvent<Protocol.WebAudio.AudioNodeWillBeDestroyedEvent>): void {
     const {contextId, nodeId} = event.data;
     const graph = this.graphManager.getGraph(contextId);
     if (!graph) {
@@ -235,8 +237,8 @@ export class WebAudioView extends UI.ThrottledWidget.ThrottledWidget implements
     graph.removeNode(nodeId);
   }
 
-  private audioParamCreated(event: Common.EventTarget.EventTargetEvent): void {
-    const param = (event.data as Protocol.WebAudio.AudioParam);
+  private audioParamCreated(event: Common.EventTarget.EventTargetEvent<Protocol.WebAudio.AudioParam>): void {
+    const param = event.data;
     const graph = this.graphManager.getGraph(param.contextId);
     if (!graph) {
       return;
@@ -248,7 +250,8 @@ export class WebAudioView extends UI.ThrottledWidget.ThrottledWidget implements
     });
   }
 
-  private audioParamWillBeDestroyed(event: Common.EventTarget.EventTargetEvent): void {
+  private audioParamWillBeDestroyed(
+      event: Common.EventTarget.EventTargetEvent<Protocol.WebAudio.AudioParamWillBeDestroyedEvent>): void {
     const {contextId, paramId} = event.data;
     const graph = this.graphManager.getGraph(contextId);
     if (!graph) {
@@ -257,7 +260,7 @@ export class WebAudioView extends UI.ThrottledWidget.ThrottledWidget implements
     graph.removeParam(paramId);
   }
 
-  private nodesConnected(event: Common.EventTarget.EventTargetEvent): void {
+  private nodesConnected(event: Common.EventTarget.EventTargetEvent<Protocol.WebAudio.NodesConnectedEvent>): void {
     const {contextId, sourceId, destinationId, sourceOutputIndex, destinationInputIndex} = event.data;
     const graph = this.graphManager.getGraph(contextId);
     if (!graph) {
@@ -271,7 +274,8 @@ export class WebAudioView extends UI.ThrottledWidget.ThrottledWidget implements
     });
   }
 
-  private nodesDisconnected(event: Common.EventTarget.EventTargetEvent): void {
+  private nodesDisconnected(event: Common.EventTarget.EventTargetEvent<Protocol.WebAudio.NodesDisconnectedEvent>):
+      void {
     const {contextId, sourceId, destinationId, sourceOutputIndex, destinationInputIndex} = event.data;
     const graph = this.graphManager.getGraph(contextId);
     if (!graph) {
@@ -285,7 +289,8 @@ export class WebAudioView extends UI.ThrottledWidget.ThrottledWidget implements
     });
   }
 
-  private nodeParamConnected(event: Common.EventTarget.EventTargetEvent): void {
+  private nodeParamConnected(event: Common.EventTarget.EventTargetEvent<Protocol.WebAudio.NodeParamConnectedEvent>):
+      void {
     const {contextId, sourceId, destinationId, sourceOutputIndex} = event.data;
     const graph = this.graphManager.getGraph(contextId);
     if (!graph) {
@@ -305,7 +310,8 @@ export class WebAudioView extends UI.ThrottledWidget.ThrottledWidget implements
     });
   }
 
-  private nodeParamDisconnected(event: Common.EventTarget.EventTargetEvent): void {
+  private nodeParamDisconnected(
+      event: Common.EventTarget.EventTargetEvent<Protocol.WebAudio.NodeParamDisconnectedEvent>): void {
     const {contextId, sourceId, destinationId, sourceOutputIndex} = event.data;
     const graph = this.graphManager.getGraph(contextId);
     if (!graph) {

package/front_end/panels/web_audio/graph_visualizer/graph_visualizer.ts

@@ -2,13 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import './GraphStyle.js';
-import './GraphManager.js';
-import './NodeRendererUtility.js';
-import './NodeView.js';
-import './EdgeView.js';
-import './GraphView.js';
-
 import * as EdgeView from './EdgeView.js';
 import * as GraphManager from './GraphManager.js';
 import * as GraphStyle from './GraphStyle.js';

package/front_end/panels/web_audio/web_audio.ts

@@ -2,37 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import './graph_visualizer/GraphStyle.js';
-import './graph_visualizer/GraphManager.js';
-import './graph_visualizer/NodeRendererUtility.js';
-import './graph_visualizer/NodeView.js';
-import './graph_visualizer/EdgeView.js';
-import './graph_visualizer/GraphView.js';
-import './WebAudioModel.js';
-import './AudioContextSelector.js';
-import './AudioContextContentBuilder.js';
-import './WebAudioView.js';
-
 import * as AudioContextContentBuilder from './AudioContextContentBuilder.js';
 import * as AudioContextSelector from './AudioContextSelector.js';
-import * as EdgeView from './graph_visualizer/EdgeView.js';
-import * as GraphManager from './graph_visualizer/GraphManager.js';
-import * as GraphStyle from './graph_visualizer/GraphStyle.js';
-import * as GraphView from './graph_visualizer/GraphView.js';
-import * as NodeRendererUtility from './graph_visualizer/NodeRendererUtility.js';
-import * as NodeView from './graph_visualizer/NodeView.js';
 import * as WebAudioModel from './WebAudioModel.js';
 import * as WebAudioView from './WebAudioView.js';
 
+export {EdgeView, GraphManager, GraphStyle, GraphView, NodeRendererUtility, NodeView} from './graph_visualizer/graph_visualizer.js';
 export {
   AudioContextContentBuilder,
   AudioContextSelector,
-  EdgeView,
-  GraphManager,
-  GraphStyle,
-  GraphView,
-  NodeRendererUtility,
-  NodeView,
   WebAudioModel,
   WebAudioView,
 };

package/front_end/panels/webauthn/WebauthnPane.ts

@@ -143,8 +143,13 @@ const enum Events {
   RemoveCredential = 'RemoveCredential',
 }
 
+type EventTypes = {
+  [Events.ExportCredential]: Protocol.WebAuthn.Credential,
+  [Events.RemoveCredential]: Protocol.WebAuthn.Credential,
+};
+
 class DataGridNode extends DataGrid.DataGrid.DataGridNode<DataGridNode> {
-  constructor(credential: Protocol.WebAuthn.Credential) {
+  constructor(private readonly credential: Protocol.WebAuthn.Credential) {
     super(credential);
   }
 
@@ -162,7 +167,7 @@ class DataGridNode extends DataGrid.DataGrid.DataGridNode<DataGridNode> {
 
     const exportButton = UI.UIUtils.createTextButton(i18nString(UIStrings.export), (): void => {
       if (this.dataGrid) {
-        this.dataGrid.dispatchEventToListeners(Events.ExportCredential, this.data);
+        (this.dataGrid as WebauthnDataGrid).dispatchEventToListeners(Events.ExportCredential, this.credential);
       }
     });
 
@@ -170,7 +175,7 @@ class DataGridNode extends DataGrid.DataGrid.DataGridNode<DataGridNode> {
 
     const removeButton = UI.UIUtils.createTextButton(i18nString(UIStrings.remove), (): void => {
       if (this.dataGrid) {
-        this.dataGrid.dispatchEventToListeners(Events.RemoveCredential, this.data);
+        (this.dataGrid as WebauthnDataGrid).dispatchEventToListeners(Events.RemoveCredential, this.credential);
       }
     });
 
@@ -180,6 +185,10 @@ class DataGridNode extends DataGrid.DataGrid.DataGridNode<DataGridNode> {
   }
 }
 
+class WebauthnDataGridBase extends DataGrid.DataGrid.DataGridImpl<DataGridNode> {}
+class WebauthnDataGrid extends Common.ObjectWrapper.eventMixin<EventTypes, typeof WebauthnDataGridBase>(
+    WebauthnDataGridBase) {}
+
 class EmptyDataGridNode extends DataGrid.DataGrid.DataGridNode<DataGridNode> {
   createCells(element: Element): void {
     element.removeChildren();
@@ -352,7 +361,7 @@ export class WebauthnPaneImpl extends UI.Widget.VBox {
       deleteCallback: undefined,
       refreshCallback: undefined,
     };
-    const dataGrid = new DataGrid.DataGrid.DataGridImpl(dataGridConfig);
+    const dataGrid = new WebauthnDataGrid(dataGridConfig);
     dataGrid.renderInline();
     dataGrid.setStriped(true);
     dataGrid.addEventListener(Events.ExportCredential, this.handleExportCredential, this);
@@ -363,14 +372,15 @@ export class WebauthnPaneImpl extends UI.Widget.VBox {
     return dataGrid;
   }
 
-  private handleExportCredential(e: {data: Protocol.WebAuthn.Credential}): void {
-    this.exportCredential(e.data);
+  private handleExportCredential({data: credential}: Common.EventTarget.EventTargetEvent<Protocol.WebAuthn.Credential>):
+      void {
+    this.exportCredential(credential);
   }
 
-  private handleRemoveCredential(authenticatorId: Protocol.WebAuthn.AuthenticatorId, e: {
-    data: Protocol.WebAuthn.Credential,
-  }): void {
-    this.removeCredential(authenticatorId, e.data.credentialId);
+  private handleRemoveCredential(authenticatorId: Protocol.WebAuthn.AuthenticatorId, {
+    data: credential,
+  }: Common.EventTarget.EventTargetEvent<Protocol.WebAuthn.Credential>): void {
+    this.removeCredential(authenticatorId, credential.credentialId);
   }
 
   private async updateCredentials(authenticatorId: Protocol.WebAuthn.AuthenticatorId): Promise<void> {