chrome-devtools-frontend 1.0.930109 → 1.0.930993

package/front_end/models/bindings/CSSWorkspaceBinding.ts

@@ -16,19 +16,19 @@ import {StylesSourceMapping} from './StylesSourceMapping.js';
 let cssWorkspaceBindingInstance: CSSWorkspaceBinding|undefined;
 
 export class CSSWorkspaceBinding implements SDK.TargetManager.SDKModelObserver<SDK.CSSModel.CSSModel> {
-  private readonly workspace: Workspace.Workspace.WorkspaceImpl;
-  private readonly modelToInfo: Map<SDK.CSSModel.CSSModel, ModelInfo>;
-  private readonly sourceMappings: SourceMapping[];
-  private readonly liveLocationPromises: Set<Promise<unknown>>;
+  readonly #workspace: Workspace.Workspace.WorkspaceImpl;
+  readonly #modelToInfo: Map<SDK.CSSModel.CSSModel, ModelInfo>;
+  readonly #sourceMappings: SourceMapping[];
+  readonly #liveLocationPromises: Set<Promise<unknown>>;
 
   private constructor(targetManager: SDK.TargetManager.TargetManager, workspace: Workspace.Workspace.WorkspaceImpl) {
-    this.workspace = workspace;
+    this.#workspace = workspace;
 
-    this.modelToInfo = new Map();
-    this.sourceMappings = [];
+    this.#modelToInfo = new Map();
+    this.#sourceMappings = [];
     targetManager.observeModels(SDK.CSSModel.CSSModel, this);
 
-    this.liveLocationPromises = new Set();
+    this.#liveLocationPromises = new Set();
   }
 
   static instance(opts: {
@@ -53,17 +53,21 @@ export class CSSWorkspaceBinding implements SDK.TargetManager.SDKModelObserver<S
     cssWorkspaceBindingInstance = undefined;
   }
 
+  get modelToInfo(): Map<SDK.CSSModel.CSSModel, ModelInfo> {
+    return this.#modelToInfo;
+  }
+
   private getCSSModelInfo(cssModel: SDK.CSSModel.CSSModel): ModelInfo {
-    return this.modelToInfo.get(cssModel) as ModelInfo;
+    return this.#modelToInfo.get(cssModel) as ModelInfo;
   }
 
   modelAdded(cssModel: SDK.CSSModel.CSSModel): void {
-    this.modelToInfo.set(cssModel, new ModelInfo(cssModel, this.workspace));
+    this.#modelToInfo.set(cssModel, new ModelInfo(cssModel, this.#workspace));
   }
 
   modelRemoved(cssModel: SDK.CSSModel.CSSModel): void {
     this.getCSSModelInfo(cssModel).dispose();
-    this.modelToInfo.delete(cssModel);
+    this.#modelToInfo.delete(cssModel);
   }
 
   /**
@@ -71,14 +75,14 @@ export class CSSWorkspaceBinding implements SDK.TargetManager.SDKModelObserver<S
    * pending LiveLocations are processed.
    */
   async pendingLiveLocationChangesPromise(): Promise<void> {
-    await Promise.all(this.liveLocationPromises);
+    await Promise.all(this.#liveLocationPromises);
   }
 
   private recordLiveLocationChange(promise: Promise<unknown>): void {
     promise.then(() => {
-      this.liveLocationPromises.delete(promise);
+      this.#liveLocationPromises.delete(promise);
     });
-    this.liveLocationPromises.add(promise);
+    this.#liveLocationPromises.add(promise);
   }
 
   async updateLocations(header: SDK.CSSStyleSheetHeader.CSSStyleSheetHeader): Promise<void> {
@@ -120,8 +124,8 @@ export class CSSWorkspaceBinding implements SDK.TargetManager.SDKModelObserver<S
   }
 
   rawLocationToUILocation(rawLocation: SDK.CSSModel.CSSLocation): Workspace.UISourceCode.UILocation|null {
-    for (let i = this.sourceMappings.length - 1; i >= 0; --i) {
-      const uiLocation = this.sourceMappings[i].rawLocationToUILocation(rawLocation);
+    for (let i = this.#sourceMappings.length - 1; i >= 0; --i) {
+      const uiLocation = this.#sourceMappings[i].rawLocationToUILocation(rawLocation);
       if (uiLocation) {
         return uiLocation;
       }
@@ -130,21 +134,21 @@ export class CSSWorkspaceBinding implements SDK.TargetManager.SDKModelObserver<S
   }
 
   uiLocationToRawLocations(uiLocation: Workspace.UISourceCode.UILocation): SDK.CSSModel.CSSLocation[] {
-    for (let i = this.sourceMappings.length - 1; i >= 0; --i) {
-      const rawLocations = this.sourceMappings[i].uiLocationToRawLocations(uiLocation);
+    for (let i = this.#sourceMappings.length - 1; i >= 0; --i) {
+      const rawLocations = this.#sourceMappings[i].uiLocationToRawLocations(uiLocation);
       if (rawLocations.length) {
         return rawLocations;
       }
     }
     const rawLocations = [];
-    for (const modelInfo of this.modelToInfo.values()) {
+    for (const modelInfo of this.#modelToInfo.values()) {
       rawLocations.push(...modelInfo.uiLocationToRawLocations(uiLocation));
     }
     return rawLocations;
   }
 
   addSourceMapping(sourceMapping: SourceMapping): void {
-    this.sourceMappings.push(sourceMapping);
+    this.#sourceMappings.push(sourceMapping);
   }
 }
 
@@ -158,13 +162,13 @@ export interface SourceMapping {
 }
 
 export class ModelInfo {
-  private readonly eventListeners: Common.EventTarget.EventDescriptor[];
-  private stylesSourceMapping: StylesSourceMapping;
-  private sassSourceMapping: SASSSourceMapping;
-  private readonly locations: Platform.MapUtilities.Multimap<SDK.CSSStyleSheetHeader.CSSStyleSheetHeader, LiveLocation>;
-  private readonly unboundLocations: Platform.MapUtilities.Multimap<string, LiveLocation>;
+  readonly #eventListeners: Common.EventTarget.EventDescriptor[];
+  #stylesSourceMapping: StylesSourceMapping;
+  #sassSourceMapping: SASSSourceMapping;
+  readonly #locations: Platform.MapUtilities.Multimap<SDK.CSSStyleSheetHeader.CSSStyleSheetHeader, LiveLocation>;
+  readonly #unboundLocations: Platform.MapUtilities.Multimap<string, LiveLocation>;
   constructor(cssModel: SDK.CSSModel.CSSModel, workspace: Workspace.Workspace.WorkspaceImpl) {
-    this.eventListeners = [
+    this.#eventListeners = [
       cssModel.addEventListener(
           SDK.CSSModel.Events.StyleSheetAdded,
           event => {
@@ -179,12 +183,16 @@ export class ModelInfo {
           this),
     ];
 
-    this.stylesSourceMapping = new StylesSourceMapping(cssModel, workspace);
+    this.#stylesSourceMapping = new StylesSourceMapping(cssModel, workspace);
     const sourceMapManager = cssModel.sourceMapManager();
-    this.sassSourceMapping = new SASSSourceMapping(cssModel.target(), sourceMapManager, workspace);
+    this.#sassSourceMapping = new SASSSourceMapping(cssModel.target(), sourceMapManager, workspace);
+
+    this.#locations = new Platform.MapUtilities.Multimap();
+    this.#unboundLocations = new Platform.MapUtilities.Multimap();
+  }
 
-    this.locations = new Platform.MapUtilities.Multimap();
-    this.unboundLocations = new Platform.MapUtilities.Multimap();
+  get locations(): Platform.MapUtilities.Multimap<SDK.CSSStyleSheetHeader.CSSStyleSheetHeader, LiveLocation> {
+    return this.#locations;
   }
 
   async createLiveLocation(
@@ -194,10 +202,10 @@ export class ModelInfo {
     const header = rawLocation.header();
     if (header) {
       location.setHeader(header);
-      this.locations.set(header, location);
+      this.#locations.set(header, location);
       await location.update();
     } else {
-      this.unboundLocations.set(rawLocation.url, location);
+      this.#unboundLocations.set(rawLocation.url, location);
     }
     return location;
   }
@@ -205,15 +213,15 @@ export class ModelInfo {
   disposeLocation(location: LiveLocation): void {
     const header = location.header();
     if (header) {
-      this.locations.delete(header, location);
+      this.#locations.delete(header, location);
     } else {
-      this.unboundLocations.delete(location.url, location);
+      this.#unboundLocations.delete(location.url, location);
     }
   }
 
   updateLocations(header: SDK.CSSStyleSheetHeader.CSSStyleSheetHeader): Promise<void[]> {
     const promises = [];
-    for (const location of this.locations.get(header)) {
+    for (const location of this.#locations.get(header)) {
       promises.push(location.update());
     }
     return Promise.all(promises);
@@ -227,42 +235,42 @@ export class ModelInfo {
     }
 
     const promises = [];
-    for (const location of this.unboundLocations.get(header.sourceURL)) {
+    for (const location of this.#unboundLocations.get(header.sourceURL)) {
       location.setHeader(header);
-      this.locations.set(header, location);
+      this.#locations.set(header, location);
       promises.push(location.update());
     }
     await Promise.all(promises);
-    this.unboundLocations.deleteAll(header.sourceURL);
+    this.#unboundLocations.deleteAll(header.sourceURL);
   }
 
   private async styleSheetRemoved(
       event: Common.EventTarget.EventTargetEvent<SDK.CSSStyleSheetHeader.CSSStyleSheetHeader>): Promise<void> {
     const header = event.data;
     const promises = [];
-    for (const location of this.locations.get(header)) {
+    for (const location of this.#locations.get(header)) {
       location.setHeader(header);
-      this.unboundLocations.set(location.url, location);
+      this.#unboundLocations.set(location.url, location);
       promises.push(location.update());
     }
     await Promise.all(promises);
-    this.locations.deleteAll(header);
+    this.#locations.deleteAll(header);
   }
 
   rawLocationToUILocation(rawLocation: SDK.CSSModel.CSSLocation): Workspace.UISourceCode.UILocation|null {
     let uiLocation: (Workspace.UISourceCode.UILocation|null)|null = null;
-    uiLocation = uiLocation || this.sassSourceMapping.rawLocationToUILocation(rawLocation);
-    uiLocation = uiLocation || this.stylesSourceMapping.rawLocationToUILocation(rawLocation);
+    uiLocation = uiLocation || this.#sassSourceMapping.rawLocationToUILocation(rawLocation);
+    uiLocation = uiLocation || this.#stylesSourceMapping.rawLocationToUILocation(rawLocation);
     uiLocation = uiLocation || ResourceMapping.instance().cssLocationToUILocation(rawLocation);
     return uiLocation;
   }
 
   uiLocationToRawLocations(uiLocation: Workspace.UISourceCode.UILocation): SDK.CSSModel.CSSLocation[] {
-    let rawLocations = this.sassSourceMapping.uiLocationToRawLocations(uiLocation);
+    let rawLocations = this.#sassSourceMapping.uiLocationToRawLocations(uiLocation);
     if (rawLocations.length) {
       return rawLocations;
     }
-    rawLocations = this.stylesSourceMapping.uiLocationToRawLocations(uiLocation);
+    rawLocations = this.#stylesSourceMapping.uiLocationToRawLocations(uiLocation);
     if (rawLocations.length) {
       return rawLocations;
     }
@@ -270,26 +278,26 @@ export class ModelInfo {
   }
 
   dispose(): void {
-    Common.EventTarget.removeEventListeners(this.eventListeners);
-    this.stylesSourceMapping.dispose();
-    this.sassSourceMapping.dispose();
+    Common.EventTarget.removeEventListeners(this.#eventListeners);
+    this.#stylesSourceMapping.dispose();
+    this.#sassSourceMapping.dispose();
   }
 }
 
 export class LiveLocation extends LiveLocationWithPool {
   readonly url: string;
-  private readonly lineNumber: number;
-  private readonly columnNumber: number;
-  private readonly info: ModelInfo;
+  readonly #lineNumber: number;
+  readonly #columnNumber: number;
+  readonly #info: ModelInfo;
   headerInternal: SDK.CSSStyleSheetHeader.CSSStyleSheetHeader|null;
   constructor(
       rawLocation: SDK.CSSModel.CSSLocation, info: ModelInfo,
       updateDelegate: (arg0: LiveLocationInterface) => Promise<void>, locationPool: LiveLocationPool) {
     super(updateDelegate, locationPool);
     this.url = rawLocation.url;
-    this.lineNumber = rawLocation.lineNumber;
-    this.columnNumber = rawLocation.columnNumber;
-    this.info = info;
+    this.#lineNumber = rawLocation.lineNumber;
+    this.#columnNumber = rawLocation.columnNumber;
+    this.#info = info;
     this.headerInternal = null;
   }
 
@@ -305,13 +313,13 @@ export class LiveLocation extends LiveLocationWithPool {
     if (!this.headerInternal) {
       return null;
     }
-    const rawLocation = new SDK.CSSModel.CSSLocation(this.headerInternal, this.lineNumber, this.columnNumber);
+    const rawLocation = new SDK.CSSModel.CSSLocation(this.headerInternal, this.#lineNumber, this.#columnNumber);
     return CSSWorkspaceBinding.instance().rawLocationToUILocation(rawLocation);
   }
 
   dispose(): void {
     super.dispose();
-    this.info.disposeLocation(this);
+    this.#info.disposeLocation(this);
   }
 
   async isIgnoreListed(): Promise<boolean> {

package/front_end/models/bindings/CompilerScriptMapping.ts

@@ -40,53 +40,53 @@ import {IgnoreListManager} from './IgnoreListManager.js';
 import {NetworkProject} from './NetworkProject.js';
 
 export class CompilerScriptMapping implements DebuggerSourceMapping {
-  private readonly debuggerModel: SDK.DebuggerModel.DebuggerModel;
-  private readonly sourceMapManager: SDK.SourceMapManager.SourceMapManager<SDK.Script.Script>;
-  private readonly workspace: Workspace.Workspace.WorkspaceImpl;
-  private readonly debuggerWorkspaceBinding: DebuggerWorkspaceBinding;
-  private readonly regularProject: ContentProviderBasedProject;
-  private readonly contentScriptsProject: ContentProviderBasedProject;
-  private readonly regularBindings: Map<string, Binding>;
-  private readonly contentScriptsBindings: Map<string, Binding>;
-  private readonly stubUISourceCodes: Map<SDK.Script.Script, Workspace.UISourceCode.UISourceCode>;
-  private readonly stubProject: ContentProviderBasedProject;
-  private readonly eventListeners: Common.EventTarget.EventDescriptor[];
+  readonly #debuggerModel: SDK.DebuggerModel.DebuggerModel;
+  readonly #sourceMapManager: SDK.SourceMapManager.SourceMapManager<SDK.Script.Script>;
+  readonly #workspace: Workspace.Workspace.WorkspaceImpl;
+  readonly #debuggerWorkspaceBinding: DebuggerWorkspaceBinding;
+  readonly #regularProject: ContentProviderBasedProject;
+  readonly #contentScriptsProject: ContentProviderBasedProject;
+  readonly #regularBindings: Map<string, Binding>;
+  readonly #contentScriptsBindings: Map<string, Binding>;
+  readonly #stubUISourceCodes: Map<SDK.Script.Script, Workspace.UISourceCode.UISourceCode>;
+  readonly #stubProject: ContentProviderBasedProject;
+  readonly #eventListeners: Common.EventTarget.EventDescriptor[];
   constructor(
       debuggerModel: SDK.DebuggerModel.DebuggerModel, workspace: Workspace.Workspace.WorkspaceImpl,
       debuggerWorkspaceBinding: DebuggerWorkspaceBinding) {
-    this.debuggerModel = debuggerModel;
-    this.sourceMapManager = this.debuggerModel.sourceMapManager();
-    this.workspace = workspace;
-    this.debuggerWorkspaceBinding = debuggerWorkspaceBinding;
+    this.#debuggerModel = debuggerModel;
+    this.#sourceMapManager = this.#debuggerModel.sourceMapManager();
+    this.#workspace = workspace;
+    this.#debuggerWorkspaceBinding = debuggerWorkspaceBinding;
 
     const target = debuggerModel.target();
-    this.regularProject = new ContentProviderBasedProject(
+    this.#regularProject = new ContentProviderBasedProject(
         workspace, 'jsSourceMaps::' + target.id(), Workspace.Workspace.projectTypes.Network, '',
         false /* isServiceProject */);
-    this.contentScriptsProject = new ContentProviderBasedProject(
+    this.#contentScriptsProject = new ContentProviderBasedProject(
         workspace, 'jsSourceMaps:extensions:' + target.id(), Workspace.Workspace.projectTypes.ContentScripts, '',
         false /* isServiceProject */);
-    NetworkProject.setTargetForProject(this.regularProject, target);
-    NetworkProject.setTargetForProject(this.contentScriptsProject, target);
+    NetworkProject.setTargetForProject(this.#regularProject, target);
+    NetworkProject.setTargetForProject(this.#contentScriptsProject, target);
 
-    this.regularBindings = new Map();
-    this.contentScriptsBindings = new Map();
+    this.#regularBindings = new Map();
+    this.#contentScriptsBindings = new Map();
 
-    this.stubUISourceCodes = new Map();
+    this.#stubUISourceCodes = new Map();
 
-    this.stubProject = new ContentProviderBasedProject(
+    this.#stubProject = new ContentProviderBasedProject(
         workspace, 'jsSourceMaps:stub:' + target.id(), Workspace.Workspace.projectTypes.Service, '',
         true /* isServiceProject */);
-    this.eventListeners = [
-      this.sourceMapManager.addEventListener(
+    this.#eventListeners = [
+      this.#sourceMapManager.addEventListener(
           SDK.SourceMapManager.Events.SourceMapWillAttach, this.sourceMapWillAttach, this),
-      this.sourceMapManager.addEventListener(
+      this.#sourceMapManager.addEventListener(
           SDK.SourceMapManager.Events.SourceMapFailedToAttach, this.sourceMapFailedToAttach, this),
-      this.sourceMapManager.addEventListener(
+      this.#sourceMapManager.addEventListener(
           SDK.SourceMapManager.Events.SourceMapAttached, this.sourceMapAttached, this),
-      this.sourceMapManager.addEventListener(
+      this.#sourceMapManager.addEventListener(
           SDK.SourceMapManager.Events.SourceMapDetached, this.sourceMapDetached, this),
-      this.workspace.addEventListener(
+      this.#workspace.addEventListener(
           Workspace.Workspace.Events.UISourceCodeAdded,
           event => {
             this.onUiSourceCodeAdded(event);
@@ -98,29 +98,29 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
   private onUiSourceCodeAdded(event: Common.EventTarget.EventTargetEvent<Workspace.UISourceCode.UISourceCode>): void {
     const uiSourceCode = event.data;
     if (uiSourceCode.contentType().isDocument()) {
-      for (const script of this.debuggerModel.scriptsForSourceURL(uiSourceCode.url())) {
-        this.debuggerWorkspaceBinding.updateLocations(script);
+      for (const script of this.#debuggerModel.scriptsForSourceURL(uiSourceCode.url())) {
+        this.#debuggerWorkspaceBinding.updateLocations(script);
       }
     }
   }
 
   private addStubUISourceCode(script: SDK.Script.Script): void {
-    const stubUISourceCode = this.stubProject.addContentProvider(
+    const stubUISourceCode = this.#stubProject.addContentProvider(
         script.sourceURL + ':sourcemap',
         TextUtils.StaticContentProvider.StaticContentProvider.fromString(
             script.sourceURL, Common.ResourceType.resourceTypes.Script,
             '\n\n\n\n\n// Please wait a bit.\n// Compiled script is not shown while source map is being loaded!'),
         'text/javascript');
-    this.stubUISourceCodes.set(script, stubUISourceCode);
+    this.#stubUISourceCodes.set(script, stubUISourceCode);
   }
 
   private async removeStubUISourceCode(script: SDK.Script.Script): Promise<void> {
-    const uiSourceCode = this.stubUISourceCodes.get(script);
-    this.stubUISourceCodes.delete(script);
+    const uiSourceCode = this.#stubUISourceCodes.get(script);
+    this.#stubUISourceCodes.delete(script);
     if (uiSourceCode) {
-      this.stubProject.removeFile(uiSourceCode.url());
+      this.#stubProject.removeFile(uiSourceCode.url());
     }
-    await this.debuggerWorkspaceBinding.updateLocations(script);
+    await this.#debuggerWorkspaceBinding.updateLocations(script);
   }
 
   static uiSourceCodeOrigin(uiSourceCode: Workspace.UISourceCode.UISourceCode): string[] {
@@ -137,7 +137,7 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
     if (!script) {
       return [];
     }
-    const sourceMap = this.sourceMapManager.sourceMapForClient(script);
+    const sourceMap = this.#sourceMapManager.sourceMapForClient(script);
     if (!sourceMap) {
       return [];
     }
@@ -161,8 +161,8 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
   }
 
   uiSourceCodeForURL(url: string, isContentScript: boolean): Workspace.UISourceCode.UISourceCode|null {
-    return isContentScript ? this.contentScriptsProject.uiSourceCodeForURL(url) :
-                             this.regularProject.uiSourceCodeForURL(url);
+    return isContentScript ? this.#contentScriptsProject.uiSourceCodeForURL(url) :
+                             this.#regularProject.uiSourceCodeForURL(url);
   }
 
   rawLocationToUILocation(rawLocation: SDK.DebuggerModel.Location): Workspace.UISourceCode.UILocation|null {
@@ -177,12 +177,12 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
       columnNumber -= script.columnOffset;
     }
 
-    const stubUISourceCode = this.stubUISourceCodes.get(script);
+    const stubUISourceCode = this.#stubUISourceCodes.get(script);
     if (stubUISourceCode) {
       return new Workspace.UISourceCode.UILocation(stubUISourceCode, lineNumber, columnNumber);
     }
 
-    const sourceMap = this.sourceMapManager.sourceMapForClient(script);
+    const sourceMap = this.#sourceMapManager.sourceMapForClient(script);
     if (!sourceMap) {
       return null;
     }
@@ -190,8 +190,8 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
     if (!entry || !entry.sourceURL) {
       return null;
     }
-    const uiSourceCode = script.isContentScript() ? this.contentScriptsProject.uiSourceCodeForURL(entry.sourceURL) :
-                                                    this.regularProject.uiSourceCodeForURL(entry.sourceURL);
+    const uiSourceCode = script.isContentScript() ? this.#contentScriptsProject.uiSourceCodeForURL(entry.sourceURL) :
+                                                    this.#regularProject.uiSourceCodeForURL(entry.sourceURL);
     if (!uiSourceCode) {
       return null;
     }
@@ -211,8 +211,8 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
       if (!entry) {
         continue;
       }
-      for (const script of this.sourceMapManager.clientsForSourceMap(sourceMap)) {
-        locations.push(this.debuggerModel.createRawLocation(
+      for (const script of this.#sourceMapManager.clientsForSourceMap(sourceMap)) {
+        locations.push(this.#debuggerModel.createRawLocation(
             script, entry.lineNumber + script.lineOffset,
             !entry.lineNumber ? entry.columnNumber + script.columnOffset : entry.columnNumber));
       }
@@ -225,7 +225,7 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
     const script = event.data.client;
     // Create stub UISourceCode for the time source mapping is being loaded.
     this.addStubUISourceCode(script);
-    await this.debuggerWorkspaceBinding.updateLocations(script);
+    await this.#debuggerWorkspaceBinding.updateLocations(script);
   }
 
   private async sourceMapFailedToAttach(event: Common.EventTarget.EventTargetEvent<{client: SDK.Script.Script}>):
@@ -255,7 +255,7 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
       Promise<void> {
     const script = event.data.client;
     const sourceMap = event.data.sourceMap;
-    const bindings = script.isContentScript() ? this.contentScriptsBindings : this.regularBindings;
+    const bindings = script.isContentScript() ? this.#contentScriptsBindings : this.#regularBindings;
     for (const sourceURL of sourceMap.sourceURLs()) {
       const binding = bindings.get(sourceURL);
       if (binding) {
@@ -265,11 +265,11 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
         }
       }
     }
-    await this.debuggerWorkspaceBinding.updateLocations(script);
+    await this.#debuggerWorkspaceBinding.updateLocations(script);
   }
 
   sourceMapForScript(script: SDK.Script.Script): SDK.SourceMap.SourceMap|null {
-    return this.sourceMapManager.sourceMapForClient(script);
+    return this.#sourceMapManager.sourceMapForClient(script);
   }
 
   scriptsForUISourceCode(uiSourceCode: Workspace.UISourceCode.UISourceCode): SDK.Script.Script[] {
@@ -280,7 +280,7 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
 
     const scripts: SDK.Script.Script[] = [];
     for (const sourceMap of binding.getReferringSourceMaps()) {
-      this.sourceMapManager.clientsForSourceMap(sourceMap).forEach(script => scripts.push(script));
+      this.#sourceMapManager.clientsForSourceMap(sourceMap).forEach(script => scripts.push(script));
     }
     return scripts;
   }
@@ -289,8 +289,8 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
   }
 
   private async populateSourceMapSources(script: SDK.Script.Script, sourceMap: SDK.SourceMap.SourceMap): Promise<void> {
-    const project = script.isContentScript() ? this.contentScriptsProject : this.regularProject;
-    const bindings = script.isContentScript() ? this.contentScriptsBindings : this.regularBindings;
+    const project = script.isContentScript() ? this.#contentScriptsProject : this.#regularProject;
+    const bindings = script.isContentScript() ? this.#contentScriptsBindings : this.#regularBindings;
     for (const sourceURL of sourceMap.sourceURLs()) {
       let binding = bindings.get(sourceURL);
       if (!binding) {
@@ -299,7 +299,7 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
       }
       binding.addSourceMap(sourceMap, script.frameId);
     }
-    await this.debuggerWorkspaceBinding.updateLocations(script);
+    await this.#debuggerWorkspaceBinding.updateLocations(script);
   }
 
   static uiLineHasMapping(uiSourceCode: Workspace.UISourceCode.UISourceCode, lineNumber: number): boolean {
@@ -316,25 +316,25 @@ export class CompilerScriptMapping implements DebuggerSourceMapping {
   }
 
   dispose(): void {
-    Common.EventTarget.removeEventListeners(this.eventListeners);
-    this.regularProject.dispose();
-    this.contentScriptsProject.dispose();
-    this.stubProject.dispose();
+    Common.EventTarget.removeEventListeners(this.#eventListeners);
+    this.#regularProject.dispose();
+    this.#contentScriptsProject.dispose();
+    this.#stubProject.dispose();
   }
 }
 
 const uiSourceCodeToBinding = new WeakMap<Workspace.UISourceCode.UISourceCode, Binding>();
 
 class Binding {
-  private readonly project: ContentProviderBasedProject;
-  private readonly url: string;
+  readonly #project: ContentProviderBasedProject;
+  readonly #url: string;
   referringSourceMaps: SDK.SourceMap.SourceMap[];
-  private readonly activeSourceMap?: SDK.SourceMap.SourceMap|null;
+  readonly #activeSourceMap?: SDK.SourceMap.SourceMap|null;
   uiSourceCode: Workspace.UISourceCode.UISourceCode|null;
 
   constructor(project: ContentProviderBasedProject, url: string) {
-    this.project = project;
-    this.url = url;
+    this.#project = project;
+    this.#url = url;
 
     this.referringSourceMaps = [];
     this.uiSourceCode = null;
@@ -344,24 +344,24 @@ class Binding {
     const sourceMap = this.referringSourceMaps[this.referringSourceMaps.length - 1];
 
     const newUISourceCode =
-        this.project.createUISourceCode(this.url, Common.ResourceType.resourceTypes.SourceMapScript);
+        this.#project.createUISourceCode(this.#url, Common.ResourceType.resourceTypes.SourceMapScript);
     uiSourceCodeToBinding.set(newUISourceCode, this);
     const contentProvider =
-        sourceMap.sourceContentProvider(this.url, Common.ResourceType.resourceTypes.SourceMapScript);
-    const mimeType = Common.ResourceType.ResourceType.mimeFromURL(this.url) || 'text/javascript';
-    const embeddedContent = sourceMap.embeddedContentByURL(this.url);
+        sourceMap.sourceContentProvider(this.#url, Common.ResourceType.resourceTypes.SourceMapScript);
+    const mimeType = Common.ResourceType.ResourceType.mimeFromURL(this.#url) || 'text/javascript';
+    const embeddedContent = sourceMap.embeddedContentByURL(this.#url);
     const metadata = typeof embeddedContent === 'string' ?
         new Workspace.UISourceCode.UISourceCodeMetadata(null, embeddedContent.length) :
         null;
 
     if (this.uiSourceCode) {
       NetworkProject.cloneInitialFrameAttribution(this.uiSourceCode, newUISourceCode);
-      this.project.removeFile(this.uiSourceCode.url());
+      this.#project.removeFile(this.uiSourceCode.url());
     } else {
       NetworkProject.setInitialFrameAttribution(newUISourceCode, frameId);
     }
     this.uiSourceCode = newUISourceCode;
-    this.project.addUISourceCodeWithProvider(this.uiSourceCode, contentProvider, metadata, mimeType);
+    this.#project.addUISourceCodeWithProvider(this.uiSourceCode, contentProvider, metadata, mimeType);
   }
 
   addSourceMap(sourceMap: SDK.SourceMap.SourceMap, frameId: Protocol.Page.FrameId): void {
@@ -380,7 +380,7 @@ class Binding {
       this.referringSourceMaps.splice(lastIndex, 1);
     }
     if (!this.referringSourceMaps.length) {
-      this.project.removeFile(uiSourceCode.url());
+      this.#project.removeFile(uiSourceCode.url());
       this.uiSourceCode = null;
     } else {
       this.recreateUISourceCodeIfNeeded(frameId);