chrome-devtools-frontend 1.0.922782 → 1.0.923788

package/front_end/entrypoints/main/MainImpl.ts

@@ -576,19 +576,16 @@ export class MainImpl {
   private registerMessageSinkListener(): void {
     Common.Console.Console.instance().addEventListener(Common.Console.Events.MessageAdded, messageAdded);
 
-    function messageAdded(event: Common.EventTarget.EventTargetEvent): void {
-      const message = (event.data as Common.Console.Message);
+    function messageAdded({data: message}: Common.EventTarget.EventTargetEvent<Common.Console.Message>): void {
       if (message.show) {
         Common.Console.Console.instance().show();
       }
     }
   }
 
-  private revealSourceLine(event: Common.EventTarget.EventTargetEvent): void {
-    const url = (event.data['url'] as string);
-    const lineNumber = (event.data['lineNumber'] as number);
-    const columnNumber = (event.data['columnNumber'] as number);
-
+  private revealSourceLine(
+      event: Common.EventTarget.EventTargetEvent<Host.InspectorFrontendHostAPI.RevealSourceLineEvent>): void {
+    const {url, lineNumber, columnNumber} = event.data;
     const uiSourceCode = Workspace.Workspace.WorkspaceImpl.instance().uiSourceCodeForURL(url);
     if (uiSourceCode) {
       Common.Revealer.reveal(uiSourceCode.uiLocation(lineNumber, columnNumber));

package/front_end/entrypoints/node_main/NodeConnectionsPanel.ts

@@ -78,8 +78,8 @@ export class NodeConnectionsPanel extends UI.Panel.Panel {
     return nodeConnectionsPanelInstance;
   }
 
-  private devicesDiscoveryConfigChanged(event: Common.EventTarget.EventTargetEvent): void {
-    this.config = (event.data as Adb.Config);
+  private devicesDiscoveryConfigChanged({data: config}: Common.EventTarget.EventTargetEvent<Adb.Config>): void {
+    this.config = config;
     this.networkDiscoveryView.discoveryConfigChanged(this.config.networkDiscoveryConfig);
   }
   wasShown(): void {

package/front_end/entrypoints/node_main/NodeMain.ts

@@ -70,8 +70,7 @@ export class NodeChildTargetManager extends SDK.SDKModel.SDKModel implements Pro
     Host.InspectorFrontendHost.InspectorFrontendHostInstance.setDevicesUpdatesEnabled(true);
   }
 
-  private devicesDiscoveryConfigChanged(event: Common.EventTarget.EventTargetEvent): void {
-    const config = (event.data as Adb.Config);
+  private devicesDiscoveryConfigChanged({data: config}: Common.EventTarget.EventTargetEvent<Adb.Config>): void {
     const locations = [];
     for (const address of config.networkDiscoveryConfig) {
       const parts = address.split(':');

package/front_end/models/bindings/BreakpointManager.ts

@@ -734,8 +734,9 @@ export class ModelBreakpoint {
     this.breakpointIds = [];
   }
 
-  private async breakpointResolved(event: Common.EventTarget.EventTargetEvent): Promise<void> {
-    await this.addResolvedLocation((event.data as SDK.DebuggerModel.Location));
+  private async breakpointResolved({data: location}: Common.EventTarget.EventTargetEvent<SDK.DebuggerModel.Location>):
+      Promise<void> {
+    await this.addResolvedLocation(location);
   }
 
   private async locationUpdated(liveLocation: LiveLocation): Promise<void> {

package/front_end/models/bindings/CompilerScriptMapping.ts

@@ -35,7 +35,7 @@ import * as TextUtils from '../text_utils/text_utils.js';
 import * as Workspace from '../workspace/workspace.js';
 
 import {ContentProviderBasedProject} from './ContentProviderBasedProject.js';
-import type {DebuggerSourceMapping, DebuggerWorkspaceBinding} from './DebuggerWorkspaceBinding.js';
+import type {DebuggerSourceMapping, DebuggerWorkspaceBinding, RawLocationRange} from './DebuggerWorkspaceBinding.js';
 import {IgnoreListManager} from './IgnoreListManager.js';
 import {NetworkProject} from './NetworkProject.js';
 
@@ -131,15 +131,33 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
     return [];
   }
 
-  mapsToSourceCode(rawLocation: SDK.DebuggerModel.Location): boolean {
+  getLocationRangesForSameSourceLocation(rawLocation: SDK.DebuggerModel.Location): RawLocationRange[] {
+    const debuggerModel = rawLocation.debuggerModel;
     const script = rawLocation.script();
-    const sourceMap = script ? this.sourceMapManager.sourceMapForClient(script) : null;
+    if (!script) {
+      return [];
+    }
+    const sourceMap = this.sourceMapManager.sourceMapForClient(script);
     if (!sourceMap) {
-      return true;
+      return [];
     }
+
+    // Find the source location for the raw location.
     const entry = sourceMap.findEntry(rawLocation.lineNumber, rawLocation.columnNumber);
-    return entry !== null && entry.lineNumber === rawLocation.lineNumber &&
-        entry.columnNumber === rawLocation.columnNumber;
+    if (!entry || !entry.sourceURL) {
+      return [];
+    }
+
+    // Map the source location back to raw location ranges.
+    const ranges = sourceMap.findReverseRanges(entry.sourceURL, entry.sourceLineNumber, entry.sourceColumnNumber);
+    return ranges.map(textRangeToLocationRange);
+
+    function textRangeToLocationRange(t: TextUtils.TextRange.TextRange): RawLocationRange {
+      return {
+        start: debuggerModel.createRawLocation(script as SDK.Script.Script, t.startLine, t.startColumn),
+        end: debuggerModel.createRawLocation(script as SDK.Script.Script, t.endLine, t.endColumn),
+      };
+    }
   }
 
   uiSourceCodeForURL(url: string, isContentScript: boolean): Workspace.UISourceCode.UISourceCode|null {

package/front_end/models/bindings/DebuggerWorkspaceBinding.ts

@@ -72,14 +72,8 @@ export class DebuggerWorkspaceBinding implements SDK.TargetManager.SDKModelObser
   }
 
   private async computeAutoStepRanges(mode: SDK.DebuggerModel.StepMode, callFrame: SDK.DebuggerModel.CallFrame):
-      Promise<{
-        start: SDK.DebuggerModel.Location,
-        end: SDK.DebuggerModel.Location,
-      }[]> {
-    function contained(location: SDK.DebuggerModel.Location, range: {
-      start: SDK.DebuggerModel.Location,
-      end: SDK.DebuggerModel.Location,
-    }): boolean {
+      Promise<RawLocationRange[]> {
+    function contained(location: SDK.DebuggerModel.Location, range: RawLocationRange): boolean {
       const {start, end} = range;
       if (start.scriptId !== location.scriptId) {
         return false;
@@ -98,20 +92,17 @@ export class DebuggerWorkspaceBinding implements SDK.TargetManager.SDKModelObser
 
     // TODO(crbug.com/1018234): Also take into account source maps here and remove the auto-stepping
     // logic in the front-end (which is currently still an experiment) completely.
+    const rawLocation = callFrame.location();
+    if (!rawLocation) {
+      return [];
+    }
     const pluginManager = this.pluginManager;
+    let ranges: RawLocationRange[] = [];
     if (pluginManager) {
-      const rawLocation = callFrame.location();
       if (mode === SDK.DebuggerModel.StepMode.StepOut) {
         // Step out of inline function.
         return await pluginManager.getInlinedFunctionRanges(rawLocation);
       }
-      let ranges: {
-        start: SDK.DebuggerModel.Location,
-        end: SDK.DebuggerModel.Location,
-      }[]|{
-        start: SDK.DebuggerModel.Location,
-        end: SDK.DebuggerModel.Location,
-      }[] = [];
       const uiLocation = await pluginManager.rawLocationToUILocation(rawLocation);
       if (uiLocation) {
         ranges = await pluginManager.uiLocationToRawLocationRanges(
@@ -119,14 +110,25 @@ export class DebuggerWorkspaceBinding implements SDK.TargetManager.SDKModelObser
             [];
         // TODO(bmeurer): Remove the {rawLocation} from the {ranges}?
         ranges = ranges.filter(range => contained(rawLocation, range));
+        if (mode === SDK.DebuggerModel.StepMode.StepOver) {
+          // Step over an inlined function.
+          ranges = ranges.concat(await pluginManager.getInlinedCalleesRanges(rawLocation));
+        }
+        return ranges;
       }
-      if (mode === SDK.DebuggerModel.StepMode.StepOver) {
-        // Step over an inlined function.
-        ranges = ranges.concat(await pluginManager.getInlinedCalleesRanges(rawLocation));
-      }
-      return ranges;
     }
-    return [];
+
+    if (!Root.Runtime.experiments.isEnabled('emptySourceMapAutoStepping')) {
+      return [];
+    }
+
+    const compilerMapping = this.debuggerModelToData.get(rawLocation.debuggerModel)?.compilerMapping;
+    if (!compilerMapping) {
+      return [];
+    }
+    ranges = compilerMapping.getLocationRangesForSameSourceLocation(rawLocation);
+    ranges = ranges.filter(range => contained(rawLocation, range));
+    return ranges;
   }
 
   modelAdded(debuggerModel: SDK.DebuggerModel.DebuggerModel): void {
@@ -445,14 +447,7 @@ class ModelData {
   }
 
   private beforePaused(debuggerPausedDetails: SDK.DebuggerModel.DebuggerPausedDetails): boolean {
-    const callFrame = debuggerPausedDetails.callFrames[0];
-    if (!callFrame) {
-      return false;
-    }
-    if (!Root.Runtime.experiments.isEnabled('emptySourceMapAutoStepping')) {
-      return true;
-    }
-    return Boolean(this.compilerMapping.mapsToSourceCode(callFrame.location()));
+    return Boolean(debuggerPausedDetails.callFrames[0]);
   }
 
   dispose(): void {
@@ -566,6 +561,11 @@ class StackTraceTopFrameLocation extends LiveLocationWithPool {
   }
 }
 
+export interface RawLocationRange {
+  start: SDK.DebuggerModel.Location;
+  end: SDK.DebuggerModel.Location;
+}
+
 /**
  * @interface
  */

package/front_end/models/extensions/ExtensionServer.ts

@@ -817,9 +817,9 @@ export class ExtensionServer extends Common.ObjectWrapper.ObjectWrapper<EventTyp
     });
   }
 
-  private setInspectedTabId(event: Common.EventTarget.EventTargetEvent): void {
+  private setInspectedTabId(event: Common.EventTarget.EventTargetEvent<string>): void {
     const oldId = this.inspectedTabId;
-    this.inspectedTabId = (event.data as string);
+    this.inspectedTabId = event.data;
     if (oldId === null) {
       // Run deferred init
       this.initializeExtensions();
@@ -913,25 +913,22 @@ export class ExtensionServer extends Common.ObjectWrapper.ObjectWrapper<EventTyp
     this.subscriptionStopHandlers.set(eventTopic, onUnsubscribeLast);
   }
 
-  private registerAutosubscriptionHandler(
-      eventTopic: string, eventTarget: Common.EventTarget.EventTarget, frontendEventType: string,
-      handler: (arg0: Common.EventTarget.EventTargetEvent) => unknown): void {
+  private registerAutosubscriptionHandler<Events, T extends Common.EventTarget.EventType<Events>>(
+      eventTopic: string, eventTarget: Common.EventTarget.EventTarget<Events>, frontendEventType: T,
+      handler: Common.EventTarget.EventListener<Events, T>): void {
     this.registerSubscriptionHandler(
         eventTopic, () => eventTarget.addEventListener(frontendEventType, handler, this),
-        eventTarget.removeEventListener.bind(eventTarget, frontendEventType, handler, this));
+        () => eventTarget.removeEventListener(frontendEventType, handler, this));
   }
 
-  private registerAutosubscriptionTargetManagerHandler(
-      eventTopic: string, modelClass: new(arg1: SDK.Target.Target) => SDK.SDKModel.SDKModel, frontendEventType: string,
-      handler: (arg0: Common.EventTarget.EventTargetEvent) => unknown): void {
+  private registerAutosubscriptionTargetManagerHandler<Events, T extends Common.EventTarget.EventType<Events>>(
+      eventTopic: string, modelClass: new(arg1: SDK.Target.Target) => SDK.SDKModel.SDKModel<Events>,
+      frontendEventType: T, handler: Common.EventTarget.EventListener<Events, T>): void {
     this.registerSubscriptionHandler(
         eventTopic,
-
-        SDK.TargetManager.TargetManager.instance().addModelListener.bind(
-            SDK.TargetManager.TargetManager.instance(), modelClass, frontendEventType, handler, this),
-
-        SDK.TargetManager.TargetManager.instance().removeModelListener.bind(
-            SDK.TargetManager.TargetManager.instance(), modelClass, frontendEventType, handler, this));
+        () => SDK.TargetManager.TargetManager.instance().addModelListener(modelClass, frontendEventType, handler, this),
+        () => SDK.TargetManager.TargetManager.instance().removeModelListener(
+            modelClass, frontendEventType, handler, this));
   }
 
   private registerResourceContentCommittedHandler(

package/front_end/models/issues_manager/DeprecationIssue.ts

@@ -46,7 +46,7 @@ export class DeprecationIssue extends Issue<IssueCode> {
     return {
       file: 'deprecationNavigatorUserAgent.md',
       links: [{
-        link: 'https://blog.chromium.org/2021/05/update-on-user-agent-string-reduction.html',
+        link: 'https://blog.chromium.org/2021/09/user-agent-reduction-origin-trial-and-dates.html',
         linkTitle: i18nString(UIStrings.userAgentReduction),
       }],
     };

package/front_end/models/issues_manager/descriptions/CoepCorpNotSameOriginAfterDefaultedToSameOriginByCoep.md

@@ -1,8 +1,18 @@
 # Specify a Cross-Origin Resource Policy to prevent a resource from being blocked
 
-Because your site has the Cross-Origin Embedder Policy (COEP) enabled, each resource must specify a suitable Cross-Origin Resource Policy (CORP).
-This behavior prevents a document from loading cross-origin resources which don’t explicitly grant permission to be loaded.
+Because your site has the Cross-Origin Embedder Policy (COEP) enabled, each
+resource must specify a suitable Cross-Origin Resource Policy (CORP). This
+behavior prevents a document from loading cross-origin resources which don’t
+explicitly grant permission to be loaded.
 
-To solve this, add the following to the resource’s response header:
-* `Cross-Origin-Resource-Policy: same-site` if the resource and your site are served from the same site.
-* `Cross-Origin-Resource-Policy: cross-origin` if the resource is served from another location than your website. ⚠️If you set this header, any website can embed this resource.
+To solve this, add the following to the resource’ response header:
+* `Cross-Origin-Resource-Policy: same-site` if the resource and your site are
+  served from the same site.
+* `Cross-Origin-Resource-Policy: cross-origin` if the resource is served from
+  another location than your website. ⚠️If you set this header, any website can
+  embed this resource.
+
+Alternatively, the document can use the variant: `Cross-Origin-Embedder-Policy:
+credentialless` instead of `require-corp`. It allows loading the resource,
+despite the missing CORP header, at the cost of requesting it without
+credentials like Cookies.

package/front_end/models/issues_manager/descriptions/CoepFrameResourceNeedsCoepHeader.md

@@ -1,6 +1,10 @@
 # Specify a Cross-Origin Embedder Policy to prevent this frame from being blocked
 
-Because your site has the Cross-Origin Embedder Policy (COEP) enabled, each embedded iframe must also specify this policy.
-This behavior protects private data from being exposed to untrusted third party sites.
+Because your site has the Cross-Origin Embedder Policy (COEP) enabled, each
+embedded iframe must also specify this policy. This behavior protects private
+data from being exposed to untrusted third party sites.
 
-To solve this, add the following to the embedded frame’s HTML response header: `Cross-Origin-Embedder-Policy: require-corp`
+To solve this, add one of following to the embedded frame’s HTML response
+header:
+* `Cross-Origin-Embedder-Policy: require-corp`
+* `Cross-Origin-Embedder-Policy: credentialless` (Chrome > 96)

package/front_end/models/issues_manager/descriptions/deprecationNavigatorUserAgent.md

@@ -1,7 +1,7 @@
 # Audit usage of navigator.userAgent, navigator.appVersion, and navigator.platform
 
 A page or script is accessing at least one of `navigator.userAgent`, `navigator.appVersion`, and `navigator.platform`.
-In a future version of Chrome, the amount of information available in the User Agent string will be reduced.
+Starting in Chrome 101, the amount of information available in the User Agent string will be reduced.
 
 To fix this issue, replace the usage of `navigator.userAgent`, `navigator.appVersion`, and `navigator.platform` with feature detection, progressive enhancement, or migrate to `navigator.userAgentData`.
 

package/front_end/models/persistence/IsolatedFileSystemManager.ts

@@ -139,8 +139,10 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
     Host.InspectorFrontendHost.InspectorFrontendHostInstance.requestFileSystems();
     return promise;
 
-    function onFileSystemsLoaded(this: IsolatedFileSystemManager, event: Common.EventTarget.EventTargetEvent): void {
-      const fileSystems = event.data as FileSystem[];
+    function onFileSystemsLoaded(
+        this: IsolatedFileSystemManager,
+        event: Common.EventTarget.EventTargetEvent<Host.InspectorFrontendHostAPI.DevToolsFileSystem[]>): void {
+      const fileSystems = event.data;
       const promises = [];
       for (let i = 0; i < fileSystems.length; ++i) {
         promises.push(this.innerAddFileSystem(fileSystems[i], false));
@@ -168,7 +170,8 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
     return this.fileSystemsLoadedPromise;
   }
 
-  private innerAddFileSystem(fileSystem: FileSystem, dispatchEvent: boolean): Promise<IsolatedFileSystem|null> {
+  private innerAddFileSystem(fileSystem: Host.InspectorFrontendHostAPI.DevToolsFileSystem, dispatchEvent: boolean):
+      Promise<IsolatedFileSystem|null> {
     const embedderPath = fileSystem.fileSystemPath;
     const fileSystemURL = Common.ParsedURL.ParsedURL.platformPathToURL(fileSystem.fileSystemPath);
     const promise = IsolatedFileSystem.create(
@@ -193,9 +196,9 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
     this.dispatchEventToListeners(Events.FileSystemAdded, fileSystem);
   }
 
-  private onFileSystemAdded(event: Common.EventTarget.EventTargetEvent): void {
-    const errorMessage = event.data['errorMessage'] as string;
-    const fileSystem = event.data['fileSystem'] as FileSystem | null;
+  private onFileSystemAdded(
+      event: Common.EventTarget.EventTargetEvent<Host.InspectorFrontendHostAPI.FileSystemAddedEvent>): void {
+    const {errorMessage, fileSystem} = event.data;
     if (errorMessage) {
       if (errorMessage !== '<selection cancelled>') {
         Common.Console.Console.instance().error(i18nString(UIStrings.unableToAddFilesystemS, {PH1: errorMessage}));
@@ -215,8 +218,8 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
     }
   }
 
-  private onFileSystemRemoved(event: Common.EventTarget.EventTargetEvent): void {
-    const embedderPath = event.data as string;
+  private onFileSystemRemoved(event: Common.EventTarget.EventTargetEvent<string>): void {
+    const embedderPath = event.data;
     const fileSystemPath = Common.ParsedURL.ParsedURL.platformPathToURL(embedderPath);
     const isolatedFileSystem = this.fileSystemsInternal.get(fileSystemPath);
     if (!isolatedFileSystem) {
@@ -227,7 +230,8 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
     this.dispatchEventToListeners(Events.FileSystemRemoved, isolatedFileSystem);
   }
 
-  private onFileSystemFilesChanged(event: Common.EventTarget.EventTargetEvent): void {
+  private onFileSystemFilesChanged(
+      event: Common.EventTarget.EventTargetEvent<Host.InspectorFrontendHostAPI.FilesChangedEvent>): void {
     const urlPaths = {
       changed: groupFilePathsIntoFileSystemPaths.call(this, event.data.changed),
       added: groupFilePathsIntoFileSystemPaths.call(this, event.data.added),
@@ -281,10 +285,10 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
     return requestId;
   }
 
-  private onIndexingTotalWorkCalculated(event: Common.EventTarget.EventTargetEvent): void {
-    const requestId = event.data['requestId'] as number;
-    const totalWork = event.data['totalWork'] as number;
-
+  private onIndexingTotalWorkCalculated(
+      event: Common.EventTarget.EventTargetEvent<Host.InspectorFrontendHostAPI.IndexingTotalWorkCalculatedEvent>):
+      void {
+    const {requestId, totalWork} = event.data;
     const progress = this.progresses.get(requestId);
     if (!progress) {
       return;
@@ -292,10 +296,9 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
     progress.setTotalWork(totalWork);
   }
 
-  private onIndexingWorked(event: Common.EventTarget.EventTargetEvent): void {
-    const requestId = event.data['requestId'] as number;
-    const worked = event.data['worked'] as number;
-
+  private onIndexingWorked(
+      event: Common.EventTarget.EventTargetEvent<Host.InspectorFrontendHostAPI.IndexingWorkedEvent>): void {
+    const {requestId, worked} = event.data;
     const progress = this.progresses.get(requestId);
     if (!progress) {
       return;
@@ -307,9 +310,9 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
     }
   }
 
-  private onIndexingDone(event: Common.EventTarget.EventTargetEvent): void {
-    const requestId = event.data['requestId'] as number;
-
+  private onIndexingDone(event: Common.EventTarget.EventTargetEvent<Host.InspectorFrontendHostAPI.IndexingEvent>):
+      void {
+    const {requestId} = event.data;
     const progress = this.progresses.get(requestId);
     if (!progress) {
       return;
@@ -318,10 +321,9 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
     this.progresses.delete(requestId);
   }
 
-  private onSearchCompleted(event: Common.EventTarget.EventTargetEvent): void {
-    const requestId = event.data['requestId'] as number;
-    const files = event.data['files'] as string[];
-
+  private onSearchCompleted(
+      event: Common.EventTarget.EventTargetEvent<Host.InspectorFrontendHostAPI.SearchCompletedEvent>): void {
+    const {requestId, files} = event.data;
     const callback = this.callbacks.get(requestId);
     if (!callback) {
       return;
@@ -350,10 +352,3 @@ export type EventTypes = {
 };
 
 let lastRequestId = 0;
-
-export interface FileSystem {
-  type: string;
-  fileSystemName: string;
-  rootURL: string;
-  fileSystemPath: string;
-}

package/front_end/models/persistence/NetworkPersistenceManager.ts

@@ -14,7 +14,8 @@ import {PersistenceBinding, PersistenceImpl} from './PersistenceImpl.js';
 
 let networkPersistenceManagerInstance: NetworkPersistenceManager|null;
 
-export class NetworkPersistenceManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
+export class NetworkPersistenceManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes> implements
+    SDK.TargetManager.Observer {
   private bindings: WeakMap<Workspace.UISourceCode.UISourceCode, PersistenceBinding>;
   private readonly originalResponseContentPromises: WeakMap<Workspace.UISourceCode.UISourceCode, Promise<string|null>>;
   private savingForOverrides: WeakSet<Workspace.UISourceCode.UISourceCode>;
@@ -64,6 +65,15 @@ export class NetworkPersistenceManager extends Common.ObjectWrapper.ObjectWrappe
 
     this.eventDescriptors = [];
     this.enabledChanged();
+
+    SDK.TargetManager.TargetManager.instance().observeTargets(this);
+  }
+
+  targetAdded(): void {
+    this.updateActiveProject();
+  }
+  targetRemoved(): void {
+    this.updateActiveProject();
   }
 
   static instance(opts: {

package/front_end/models/persistence/PersistenceUtils.ts

@@ -70,7 +70,8 @@ export class PersistenceUtils {
   }
 }
 
-export class LinkDecorator extends Common.ObjectWrapper.ObjectWrapper implements Components.Linkifier.LinkDecorator {
+export class LinkDecorator extends Common.ObjectWrapper.ObjectWrapper<Components.Linkifier.LinkDecorator.EventTypes>
+    implements Components.Linkifier.LinkDecorator {
   constructor(persistence: PersistenceImpl) {
     super();
     persistence.addEventListener(Events.BindingCreated, this.bindingChanged, this);

package/front_end/models/workspace/FileManager.ts

@@ -66,17 +66,16 @@ export class FileManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     return result;
   }
 
-  private savedURL(event: Common.EventTarget.EventTargetEvent): void {
-    const url = event.data.url as string;
+  private savedURL(event: Common.EventTarget.EventTargetEvent<Host.InspectorFrontendHostAPI.SavedURLEvent>): void {
+    const {url, fileSystemPath} = event.data;
     const callback = this.saveCallbacks.get(url);
     this.saveCallbacks.delete(url);
     if (callback) {
-      callback({fileSystemPath: event.data.fileSystemPath as string});
+      callback({fileSystemPath});
     }
   }
 
-  private canceledSavedURL(event: Common.EventTarget.EventTargetEvent): void {
-    const url = event.data as string;
+  private canceledSavedURL({data: url}: Common.EventTarget.EventTargetEvent<string>): void {
     const callback = this.saveCallbacks.get(url);
     this.saveCallbacks.delete(url);
     if (callback) {
@@ -92,8 +91,7 @@ export class FileManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     Host.InspectorFrontendHost.InspectorFrontendHostInstance.close(url);
   }
 
-  private appendedToURL(event: Common.EventTarget.EventTargetEvent): void {
-    const url = event.data as string;
+  private appendedToURL({data: url}: Common.EventTarget.EventTargetEvent<string>): void {
     this.dispatchEventToListeners(Events.AppendedToURL, url);
   }
 }

package/front_end/models/workspace/WorkspaceImpl.ts

@@ -194,7 +194,7 @@ export class ProjectStore {
 
 let workspaceInstance: WorkspaceImpl|undefined;
 
-export class WorkspaceImpl extends Common.ObjectWrapper.ObjectWrapper {
+export class WorkspaceImpl extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
   private projectsInternal: Map<string, Project>;
   private hasResourceContentTrackingExtensionsInternal: boolean;
 

package/front_end/models/workspace_diff/WorkspaceDiff.ts

@@ -33,16 +33,14 @@ export class WorkspaceDiffImpl extends Common.ObjectWrapper.ObjectWrapper<EventT
     return this.uiSourceCodeDiff(uiSourceCode).requestDiff();
   }
 
-  subscribeToDiffChange(
-      uiSourceCode: Workspace.UISourceCode.UISourceCode, callback: (arg0: Common.EventTarget.EventTargetEvent) => void,
-      thisObj?: Object): void {
-    this.uiSourceCodeDiff(uiSourceCode).addEventListener(Events.DiffChanged, callback, thisObj);
+  subscribeToDiffChange(uiSourceCode: Workspace.UISourceCode.UISourceCode, callback: () => void, thisObj?: Object):
+      void {
+    this.uiSourceCodeDiff(uiSourceCode).addEventListener(UISourceCodeDiffEvents.DiffChanged, callback, thisObj);
   }
 
-  unsubscribeFromDiffChange(
-      uiSourceCode: Workspace.UISourceCode.UISourceCode, callback: (arg0: Common.EventTarget.EventTargetEvent) => void,
-      thisObj?: Object): void {
-    this.uiSourceCodeDiff(uiSourceCode).removeEventListener(Events.DiffChanged, callback, thisObj);
+  unsubscribeFromDiffChange(uiSourceCode: Workspace.UISourceCode.UISourceCode, callback: () => void, thisObj?: Object):
+      void {
+    this.uiSourceCodeDiff(uiSourceCode).removeEventListener(UISourceCodeDiffEvents.DiffChanged, callback, thisObj);
   }
 
   modifiedUISourceCodes(): Workspace.UISourceCode.UISourceCode[] {
@@ -166,7 +164,20 @@ export class WorkspaceDiffImpl extends Common.ObjectWrapper.ObjectWrapper<EventT
   }
 }
 
-export class UISourceCodeDiff extends Common.ObjectWrapper.ObjectWrapper {
+export const enum Events {
+  ModifiedStatusChanged = 'ModifiedStatusChanged',
+}
+
+export interface ModifiedStatusChangedEvent {
+  uiSourceCode: Workspace.UISourceCode.UISourceCode;
+  isModified: boolean;
+}
+
+export type EventTypes = {
+  [Events.ModifiedStatusChanged]: ModifiedStatusChangedEvent,
+};
+
+export class UISourceCodeDiff extends Common.ObjectWrapper.ObjectWrapper<UISourceCodeDiffEventTypes> {
   private uiSourceCode: Workspace.UISourceCode.UISourceCode;
   private requestDiffPromise: Promise<Diff.Diff.DiffArray|null>|null;
   private pendingChanges: number|null;
@@ -196,7 +207,7 @@ export class UISourceCodeDiff extends Common.ObjectWrapper.ObjectWrapper {
       if (this.dispose) {
         return;
       }
-      this.dispatchEventToListeners(Events.DiffChanged);
+      this.dispatchEventToListeners(UISourceCodeDiffEvents.DiffChanged);
       this.pendingChanges = null;
     }
   }
@@ -259,19 +270,12 @@ export class UISourceCodeDiff extends Common.ObjectWrapper.ObjectWrapper {
 
 // TODO(crbug.com/1167717): Make this a const enum again
 // eslint-disable-next-line rulesdir/const_enum
-export enum Events {
+export enum UISourceCodeDiffEvents {
   DiffChanged = 'DiffChanged',
-  ModifiedStatusChanged = 'ModifiedStatusChanged',
-}
-
-export interface ModifiedStatusChangedEvent {
-  uiSourceCode: Workspace.UISourceCode.UISourceCode;
-  isModified: boolean;
 }
 
-export type EventTypes = {
-  [Events.DiffChanged]: void,
-  [Events.ModifiedStatusChanged]: ModifiedStatusChangedEvent,
+export type UISourceCodeDiffEventTypes = {
+  [UISourceCodeDiffEvents.DiffChanged]: void,
 };
 
 // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration