chrome-devtools-frontend 1.0.923302 → 1.0.925026

package/front_end/panels/layers/LayerTreeModel.ts

@@ -34,7 +34,7 @@ import * as UI from '../../ui/legacy/legacy.js';
 import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
 import type * as Protocol from '../../generated/protocol.js';
 
-export class LayerTreeModel extends SDK.SDKModel.SDKModel {
+export class LayerTreeModel extends SDK.SDKModel.SDKModel<EventTypes> {
   readonly layerTreeAgent: ProtocolProxyApi.LayerTreeApi;
   readonly paintProfilerModel: SDK.PaintProfiler.PaintProfilerModel;
   private layerTreeInternal: SDK.LayerTreeBase.LayerTreeBase|null;
@@ -149,6 +149,11 @@ export enum Events {
   LayerPainted = 'LayerPainted',
 }
 
+export type EventTypes = {
+  [Events.LayerTreeChanged]: void,
+  [Events.LayerPainted]: AgentLayer,
+};
+
 export class AgentLayerTree extends SDK.LayerTreeBase.LayerTreeBase {
   private layerTreeModel: LayerTreeModel;
 

package/front_end/panels/layers/LayersPanel.ts

@@ -169,11 +169,10 @@ export class LayersPanel extends UI.Panel.PanelWithSidebar implements SDK.Target
     return Promise.resolve();
   }
 
-  private onLayerPainted(event: Common.EventTarget.EventTargetEvent): void {
+  private onLayerPainted({data: layer}: Common.EventTarget.EventTargetEvent<SDK.LayerTreeBase.Layer>): void {
     if (!this.model) {
       return;
     }
-    const layer = event.data as SDK.LayerTreeBase.Layer;
     const selection = this.layerViewHost.selection();
     if (selection && selection.layer() === layer) {
       this.layerDetailsView.update();
@@ -212,8 +211,8 @@ export class LayersPanel extends UI.Panel.PanelWithSidebar implements SDK.Target
     }
   }
 
-  private onScaleChanged(event: Common.EventTarget.EventTargetEvent): void {
-    this.paintProfilerView.setScale(event.data as number);
+  private onScaleChanged(event: Common.EventTarget.EventTargetEvent<number>): void {
+    this.paintProfilerView.setScale(event.data);
   }
 }
 

package/front_end/panels/lighthouse/LighthouseReportRenderer.ts

@@ -160,6 +160,7 @@ export class LighthouseReportUIFeatures extends LighthouseReport.ReportUIFeature
     super(dom);
     this.beforePrint = null;
     this.afterPrint = null;
+    this._topbar._print = this._print.bind(this);
   }
 
   setBeforePrint(beforePrint: (() => void)|null): void {

package/front_end/panels/media/MainView.ts

@@ -8,7 +8,7 @@ import * as UI from '../../ui/legacy/legacy.js';
 import type * as Protocol from '../../generated/protocol.js';
 
 import type {PlayerEvent} from './MediaModel.js';
-import {MediaModel, ProtocolTriggers} from './MediaModel.js';
+import {MediaModel, Events} from './MediaModel.js';
 import {PlayerDetailView} from './PlayerDetailView.js';
 import {PlayerListView} from './PlayerListView.js';
 
@@ -196,19 +196,19 @@ export class MainView extends UI.Panel.PanelWithSidebar implements SDK.TargetMan
 
   private addEventListeners(mediaModel: MediaModel): void {
     mediaModel.ensureEnabled();
-    mediaModel.addEventListener(ProtocolTriggers.PlayerPropertiesChanged, this.propertiesChanged, this);
-    mediaModel.addEventListener(ProtocolTriggers.PlayerEventsAdded, this.eventsAdded, this);
-    mediaModel.addEventListener(ProtocolTriggers.PlayerMessagesLogged, this.messagesLogged, this);
-    mediaModel.addEventListener(ProtocolTriggers.PlayerErrorsRaised, this.errorsRaised, this);
-    mediaModel.addEventListener(ProtocolTriggers.PlayersCreated, this.playersCreated, this);
+    mediaModel.addEventListener(Events.PlayerPropertiesChanged, this.propertiesChanged, this);
+    mediaModel.addEventListener(Events.PlayerEventsAdded, this.eventsAdded, this);
+    mediaModel.addEventListener(Events.PlayerMessagesLogged, this.messagesLogged, this);
+    mediaModel.addEventListener(Events.PlayerErrorsRaised, this.errorsRaised, this);
+    mediaModel.addEventListener(Events.PlayersCreated, this.playersCreated, this);
   }
 
   private removeEventListeners(mediaModel: MediaModel): void {
-    mediaModel.removeEventListener(ProtocolTriggers.PlayerPropertiesChanged, this.propertiesChanged, this);
-    mediaModel.removeEventListener(ProtocolTriggers.PlayerEventsAdded, this.eventsAdded, this);
-    mediaModel.removeEventListener(ProtocolTriggers.PlayerMessagesLogged, this.messagesLogged, this);
-    mediaModel.removeEventListener(ProtocolTriggers.PlayerErrorsRaised, this.errorsRaised, this);
-    mediaModel.removeEventListener(ProtocolTriggers.PlayersCreated, this.playersCreated, this);
+    mediaModel.removeEventListener(Events.PlayerPropertiesChanged, this.propertiesChanged, this);
+    mediaModel.removeEventListener(Events.PlayerEventsAdded, this.eventsAdded, this);
+    mediaModel.removeEventListener(Events.PlayerMessagesLogged, this.messagesLogged, this);
+    mediaModel.removeEventListener(Events.PlayerErrorsRaised, this.errorsRaised, this);
+    mediaModel.removeEventListener(Events.PlayersCreated, this.playersCreated, this);
   }
 
   private onPlayerCreated(playerID: string): void {
@@ -217,25 +217,29 @@ export class MainView extends UI.Panel.PanelWithSidebar implements SDK.TargetMan
     this.downloadStore.addPlayer(playerID);
   }
 
-  private propertiesChanged(event: Common.EventTarget.EventTargetEvent): void {
+  private propertiesChanged(event: Common.EventTarget.EventTargetEvent<Protocol.Media.PlayerPropertiesChangedEvent>):
+      void {
     for (const property of event.data.properties) {
       this.onProperty(event.data.playerId, property);
     }
   }
 
-  private eventsAdded(event: Common.EventTarget.EventTargetEvent): void {
+  private eventsAdded(event: Common.EventTarget.EventTargetEvent<Protocol.Media.PlayerEventsAddedEvent>): void {
     for (const ev of event.data.events) {
-      this.onEvent(event.data.playerId, ev);
+      // TODO(crbug.com/1228674): The conversion from Protocol.Media.PlayerEvent to PlayerEvent happens implicitly
+      // by augmenting the protocol type with some additional property in various places. This needs to be cleaned up
+      // in a conversion function that takes the protocol type and produces the PlayerEvent type.
+      this.onEvent(event.data.playerId, ev as PlayerEvent);
     }
   }
 
-  private messagesLogged(event: Common.EventTarget.EventTargetEvent): void {
+  private messagesLogged(event: Common.EventTarget.EventTargetEvent<Protocol.Media.PlayerMessagesLoggedEvent>): void {
     for (const message of event.data.messages) {
       this.onMessage(event.data.playerId, message);
     }
   }
 
-  private errorsRaised(event: Common.EventTarget.EventTargetEvent): void {
+  private errorsRaised(event: Common.EventTarget.EventTargetEvent<Protocol.Media.PlayerErrorsRaisedEvent>): void {
     for (const error of event.data.errors) {
       this.onError(event.data.playerId, error);
     }
@@ -281,9 +285,8 @@ export class MainView extends UI.Panel.PanelWithSidebar implements SDK.TargetMan
     this.detailPanels.get(playerID)?.onEvent(event);
   }
 
-  private playersCreated(event: Common.EventTarget.EventTargetEvent): void {
-    const playerlist = event.data as Iterable<string>;
-    for (const playerID of playerlist) {
+  private playersCreated(event: Common.EventTarget.EventTargetEvent<Protocol.Media.PlayerId[]>): void {
+    for (const playerID of event.data) {
       this.onPlayerCreated(playerID);
     }
   }

package/front_end/panels/media/MediaModel.ts

@@ -12,7 +12,7 @@ export interface PlayerEvent extends Protocol.Media.PlayerEvent {
   event: string;
 }
 
-export const enum ProtocolTriggers {
+export const enum Events {
   PlayerPropertiesChanged = 'PlayerPropertiesChanged',
   PlayerEventsAdded = 'PlayerEventsAdded',
   PlayerMessagesLogged = 'PlayerMessagesLogged',
@@ -20,7 +20,15 @@ export const enum ProtocolTriggers {
   PlayersCreated = 'PlayersCreated',
 }
 
-export class MediaModel extends SDK.SDKModel.SDKModel implements ProtocolProxyApi.MediaDispatcher {
+export type EventTypes = {
+  [Events.PlayerPropertiesChanged]: Protocol.Media.PlayerPropertiesChangedEvent,
+  [Events.PlayerEventsAdded]: Protocol.Media.PlayerEventsAddedEvent,
+  [Events.PlayerMessagesLogged]: Protocol.Media.PlayerMessagesLoggedEvent,
+  [Events.PlayerErrorsRaised]: Protocol.Media.PlayerErrorsRaisedEvent,
+  [Events.PlayersCreated]: Protocol.Media.PlayerId[],
+};
+
+export class MediaModel extends SDK.SDKModel.SDKModel<EventTypes> implements ProtocolProxyApi.MediaDispatcher {
   private enabled: boolean;
   private readonly agent: ProtocolProxyApi.MediaApi;
 
@@ -46,23 +54,23 @@ export class MediaModel extends SDK.SDKModel.SDKModel implements ProtocolProxyAp
   }
 
   playerPropertiesChanged(event: Protocol.Media.PlayerPropertiesChangedEvent): void {
-    this.dispatchEventToListeners(ProtocolTriggers.PlayerPropertiesChanged, event);
+    this.dispatchEventToListeners(Events.PlayerPropertiesChanged, event);
   }
 
   playerEventsAdded(event: Protocol.Media.PlayerEventsAddedEvent): void {
-    this.dispatchEventToListeners(ProtocolTriggers.PlayerEventsAdded, event);
+    this.dispatchEventToListeners(Events.PlayerEventsAdded, event);
   }
 
   playerMessagesLogged(event: Protocol.Media.PlayerMessagesLoggedEvent): void {
-    this.dispatchEventToListeners(ProtocolTriggers.PlayerMessagesLogged, event);
+    this.dispatchEventToListeners(Events.PlayerMessagesLogged, event);
   }
 
   playerErrorsRaised(event: Protocol.Media.PlayerErrorsRaisedEvent): void {
-    this.dispatchEventToListeners(ProtocolTriggers.PlayerErrorsRaised, event);
+    this.dispatchEventToListeners(Events.PlayerErrorsRaised, event);
   }
 
   playersCreated({players}: Protocol.Media.PlayersCreatedEvent): void {
-    this.dispatchEventToListeners(ProtocolTriggers.PlayersCreated, players);
+    this.dispatchEventToListeners(Events.PlayersCreated, players);
   }
 }
 SDK.SDKModel.SDKModel.register(MediaModel, {capabilities: SDK.Target.Capability.Media, autostart: false});

package/front_end/panels/media/PlayerMessagesView.ts

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import * as Common from '../../core/common/common.js';
+import type * as Common from '../../core/common/common.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as UI from '../../ui/legacy/legacy.js';
 
@@ -70,8 +70,7 @@ interface SelectableLevel {
   overwrite?: boolean;
 }
 
-class MessageLevelSelector extends Common.ObjectWrapper.ObjectWrapper implements
-    UI.SoftDropDown.Delegate<SelectableLevel> {
+class MessageLevelSelector implements UI.SoftDropDown.Delegate<SelectableLevel> {
   private readonly items: UI.ListModel.ListModel<SelectableLevel>;
   private readonly view: PlayerMessagesView;
   private readonly itemMap: Map<number, SelectableLevel>;
@@ -84,7 +83,6 @@ class MessageLevelSelector extends Common.ObjectWrapper.ObjectWrapper implements
   elementsForItems: WeakMap<SelectableLevel, HTMLElement>;
 
   constructor(items: UI.ListModel.ListModel<SelectableLevel>, view: PlayerMessagesView) {
-    super();
     this.items = items;
     this.view = view;
     this.itemMap = new Map();

package/front_end/panels/network/NetworkPanel.ts

@@ -377,7 +377,7 @@ export class NetworkPanel extends UI.Panel.Panel implements UI.ContextMenu.Provi
     this.networkLogView.setWindow(startTime, endTime);
   }
 
-  private async searchToggleClick(_event: Common.EventTarget.EventTargetEvent): Promise<void> {
+  private async searchToggleClick(): Promise<void> {
     const action = UI.ActionRegistry.ActionRegistry.instance().action('network.search');
     if (action) {
       await action.execute();
@@ -403,8 +403,8 @@ export class NetworkPanel extends UI.Panel.Panel implements UI.ContextMenu.Provi
     this.panelToolbar.appendToolbarItem(this.filterBar.filterButton());
     updateSidebarToggle();
     splitWidget.addEventListener(UI.SplitWidget.Events.ShowModeChanged, updateSidebarToggle);
-    searchToggle.addEventListener(UI.Toolbar.ToolbarButton.Events.Click, event => {
-      this.searchToggleClick(event);
+    searchToggle.addEventListener(UI.Toolbar.ToolbarButton.Events.Click, () => {
+      this.searchToggleClick();
     });
     this.panelToolbar.appendToolbarItem(searchToggle);
     this.panelToolbar.appendSeparator();
@@ -640,12 +640,12 @@ export class NetworkPanel extends UI.Panel.Panel implements UI.ContextMenu.Provi
     this.hideRequestPanel();
   }
 
-  private onRowSizeChanged(_event: Common.EventTarget.EventTargetEvent): void {
+  private onRowSizeChanged(): void {
     this.updateUI();
   }
 
-  private onRequestSelected(event: Common.EventTarget.EventTargetEvent): void {
-    const request = (event.data as SDK.NetworkRequest.NetworkRequest | null);
+  private onRequestSelected(event: Common.EventTarget.EventTargetEvent<SDK.NetworkRequest.NetworkRequest|null>): void {
+    const request = event.data;
     this.currentRequest = request;
     this.networkOverview.setHighlightedRequest(request);
     this.updateNetworkItemView();

package/front_end/panels/network/RequestHeadersView.ts

@@ -120,6 +120,10 @@ const UIStrings = {
   */
   fromDiskCache: '(from disk cache)',
   /**
+  *@description Text in Request Headers View of the Network panel
+  */
+  fromWebBundle: '(from Web Bundle)',
+  /**
   *@description Message to explain lack of raw headers for a particular network request
   */
   provisionalHeadersAreShownS: 'Provisional headers are shown. Disable cache to see full headers.',
@@ -513,6 +517,9 @@ export class RequestHeadersView extends UI.Widget.VBox {
       } else if (this.request.redirectSourceSignedExchangeInfoHasNoErrors()) {
         statusText += ' ' + i18nString(UIStrings.fromSignedexchange);
         statusTextElement.classList.add('status-from-cache');
+      } else if (this.request.webBundleInnerRequestInfo()) {
+        statusText += ' ' + i18nString(UIStrings.fromWebBundle);
+        statusTextElement.classList.add('status-from-cache');
       } else if (this.request.fromPrefetchCache()) {
         statusText += ' ' + i18nString(UIStrings.fromPrefetchCache);
         statusTextElement.classList.add('status-from-cache');

package/front_end/panels/network/ResourceWebSocketFrameView.ts

@@ -312,7 +312,8 @@ export class ResourceWebSocketFrameView extends UI.Widget.VBox {
     this.refresh();
   }
 
-  private async onFrameSelected(event: Common.EventTarget.EventTargetEvent): Promise<void> {
+  private async onFrameSelected(event: Common.EventTarget.EventTargetEvent<DataGrid.DataGrid.DataGridNode<unknown>>):
+      Promise<void> {
     this.currentSelectedNode = (event.data as ResourceWebSocketFrameNode);
     const content = this.currentSelectedNode.dataText();
 
@@ -333,7 +334,7 @@ export class ResourceWebSocketFrameView extends UI.Widget.VBox {
             this.request.url(), Common.ResourceType.resourceTypes.WebSocket, content)));
   }
 
-  private onFrameDeselected(_event: Common.EventTarget.EventTargetEvent): void {
+  private onFrameDeselected(): void {
     this.currentSelectedNode = null;
     this.splitWidget.setSidebarWidget(this.frameEmptyWidget);
   }

package/front_end/panels/network/networkLogView.css

@@ -243,6 +243,11 @@
   filter: brightness(0) invert(1);
 }
 
+.network-log-grid.data-grid:focus .data-grid-data-grid-node.selected [is=ui-icon].icon-mask {
+  --network-grid-selected-color: #dadce0;
+  --override-icon-mask-background-color: var(--network-grid-selected-color);
+}
+
 .network-log-grid.data-grid .network-error-row.data-grid-data-grid-node img.icon,
 .network-log-grid.data-grid .network-error-row.data-grid-data-grid-node.selected img.icon {
   /* This is generated with https://codepen.io/sosuke/pen/Pjoqqp to target var(--color-red) */

package/front_end/panels/profiler/HeapProfileView.ts

@@ -123,7 +123,7 @@ function convertToSamplingHeapProfile(profileHeader: SamplingHeapProfileHeader):
 
 export class HeapProfileView extends ProfileView implements UI.SearchableView.Searchable {
   profileHeader: SamplingHeapProfileHeader;
-  readonly profileType: ProfileType;
+  readonly profileType: SamplingHeapProfileTypeBase;
   adjustedTotal: number;
   readonly selectedSizeText: UI.Toolbar.ToolbarText;
   timestamps: number[];
@@ -186,7 +186,7 @@ export class HeapProfileView extends ProfileView implements UI.SearchableView.Se
     this.setProfile(profile);
   }
 
-  onStatsUpdate(event: Common.EventTarget.EventTargetEvent): void {
+  onStatsUpdate(event: Common.EventTarget.EventTargetEvent<Protocol.HeapProfiler.SamplingHeapProfile|null>): void {
     const profile = event.data;
 
     if (!this.totalTime) {
@@ -202,7 +202,7 @@ export class HeapProfileView extends ProfileView implements UI.SearchableView.Se
     this.sizes.push(0);
     this.timestamps.push(Date.now());
     this.ordinals.push(this.lastOrdinal + 1);
-    for (const sample of profile.samples) {
+    for (const sample of profile?.samples ?? []) {
       this.lastOrdinal = Math.max(this.lastOrdinal, sample.ordinal);
       const bucket = Platform.ArrayUtilities.upperBound(
                          this.ordinals, sample.ordinal, Platform.ArrayUtilities.DEFAULT_COMPARATOR) -
@@ -243,7 +243,8 @@ export class HeapProfileView extends ProfileView implements UI.SearchableView.Se
   }
 }
 
-export class SamplingHeapProfileTypeBase extends ProfileType {
+export class SamplingHeapProfileTypeBase extends
+    Common.ObjectWrapper.eventMixin<SamplingHeapProfileType.EventTypes, typeof ProfileType>(ProfileType) {
   recording: boolean;
   clearedDuringRecording: boolean;
 
@@ -445,6 +446,11 @@ export namespace SamplingHeapProfileType {
     RecordingStopped = 'RecordingStopped',
     StatsUpdate = 'StatsUpdate',
   }
+
+  export type EventTypes = {
+    [Events.RecordingStopped]: void,
+    [Events.StatsUpdate]: Protocol.HeapProfiler.SamplingHeapProfile|null,
+  };
 }
 
 export class SamplingHeapProfileHeader extends WritableProfileHeader {
@@ -505,6 +511,10 @@ export class SamplingHeapProfileHeader extends WritableProfileHeader {
   heapProfilerModel(): SDK.HeapProfilerModel.HeapProfilerModel|null {
     return this.heapProfilerModelInternal;
   }
+
+  override profileType(): SamplingHeapProfileTypeBase {
+    return super.profileType() as SamplingHeapProfileTypeBase;
+  }
 }
 
 export class SamplingHeapProfileNode extends SDK.ProfileTreeModel.ProfileNode {

package/front_end/panels/profiler/HeapSnapshotDataGrids.ts

@@ -28,6 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import * as Common from '../../core/common/common.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as HeapSnapshotModel from '../../models/heap_snapshot_model/heap_snapshot_model.js';
 import * as DataGrid from '../../ui/legacy/components/data_grid/data_grid.js';
@@ -146,7 +147,11 @@ const str_ = i18n.i18n.registerUIStrings('panels/profiler/HeapSnapshotDataGrids.
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 const adjacencyMap = new WeakMap<DataGrid.DataGrid.DataGridNode<HeapSnapshotGridNode>, HeapSnapshotGridNode[]>();
 
-export class HeapSnapshotSortableDataGrid extends DataGrid.DataGrid.DataGridImpl<HeapSnapshotGridNode> {
+class HeapSnapshotSortableDataGridBase extends DataGrid.DataGrid.DataGridImpl<HeapSnapshotGridNode> {}
+
+export class HeapSnapshotSortableDataGrid extends
+    Common.ObjectWrapper.eventMixin<EventTypes, typeof HeapSnapshotSortableDataGridBase>(
+        HeapSnapshotSortableDataGridBase) {
   snapshot: HeapSnapshotProxy|null;
   selectedNode: HeapSnapshotGridNode|null;
   readonly heapProfilerModelInternal: SDK.HeapProfilerModel.HeapProfilerModel|null;
@@ -402,8 +407,15 @@ export class HeapSnapshotSortableDataGrid extends DataGrid.DataGrid.DataGridImpl
 export enum HeapSnapshotSortableDataGridEvents {
   ContentShown = 'ContentShown',
   SortingComplete = 'SortingComplete',
+  ExpandRetainersComplete = 'ExpandRetainersComplete',
 }
 
+export type EventTypes = {
+  [HeapSnapshotSortableDataGridEvents.ContentShown]: HeapSnapshotSortableDataGrid,
+  [HeapSnapshotSortableDataGridEvents.SortingComplete]: void,
+  [HeapSnapshotSortableDataGridEvents.ExpandRetainersComplete]: void,
+};
+
 export class HeapSnapshotViewportDataGrid extends HeapSnapshotSortableDataGrid {
   topPaddingHeight: number;
   bottomPaddingHeight: number;
@@ -734,6 +746,7 @@ export class HeapSnapshotRetainmentDataGrid extends HeapSnapshotContainmentDataG
 }
 
 // TODO(crbug.com/1167717): Make this a const enum again
+// TODO(crbug.com/1228674): Remove this enum, it is only used in web tests.
 // eslint-disable-next-line rulesdir/const_enum
 export enum HeapSnapshotRetainmentDataGridEvents {
   ExpandRetainersComplete = 'ExpandRetainersComplete',

package/front_end/panels/profiler/HeapSnapshotGridNodes.ts

@@ -39,7 +39,7 @@ import * as UI from '../../ui/legacy/legacy.js';
 
 import type {ChildrenProvider} from './ChildrenProvider.js';
 import type {AllocationDataGrid, HeapSnapshotConstructorsDataGrid, HeapSnapshotDiffDataGrid, HeapSnapshotSortableDataGrid} from './HeapSnapshotDataGrids.js';
-import {HeapSnapshotRetainmentDataGridEvents} from './HeapSnapshotDataGrids.js';
+import {HeapSnapshotSortableDataGridEvents} from './HeapSnapshotDataGrids.js';
 import type {HeapSnapshotProviderProxy, HeapSnapshotProxy} from './HeapSnapshotProxy.js';
 import type {DataDisplayDelegate} from './ProfileHeader.js';
 
@@ -93,7 +93,11 @@ const UIStrings = {
 const str_ = i18n.i18n.registerUIStrings('panels/profiler/HeapSnapshotGridNodes.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 
-export class HeapSnapshotGridNode extends DataGrid.DataGrid.DataGridNode<HeapSnapshotGridNode> {
+class HeapSnapshotGridNodeBase extends DataGrid.DataGrid.DataGridNode<HeapSnapshotGridNode> {}
+
+export class HeapSnapshotGridNode extends
+    Common.ObjectWrapper.eventMixin<HeapSnapshotGridNode.EventTypes, typeof HeapSnapshotGridNodeBase>(
+        HeapSnapshotGridNodeBase) {
   dataGridInternal: HeapSnapshotSortableDataGrid;
   instanceCount: number;
   readonly savedChildren: Map<number, HeapSnapshotGridNode>;
@@ -469,6 +473,10 @@ export namespace HeapSnapshotGridNode {
   export enum Events {
     PopulateComplete = 'PopulateComplete',
   }
+
+  export type EventTypes = {
+    [Events.PopulateComplete]: void,
+  };
 }
 
 export abstract class HeapSnapshotGenericObjectNode extends HeapSnapshotGridNode {
@@ -847,7 +855,7 @@ export class HeapSnapshotRetainingObjectNode extends HeapSnapshotObjectNode {
         return;
       }
     }
-    this.dataGridInternal.dispatchEventToListeners(HeapSnapshotRetainmentDataGridEvents.ExpandRetainersComplete);
+    this.dataGridInternal.dispatchEventToListeners(HeapSnapshotSortableDataGridEvents.ExpandRetainersComplete);
   }
 }