chrome-devtools-frontend 1.0.970302 → 1.0.971727

package/front_end/models/bindings/CSSWorkspaceBinding.ts

@@ -100,6 +100,27 @@ export class CSSWorkspaceBinding implements SDK.TargetManager.SDKModelObserver<S
     return locationPromise;
   }
 
+  propertyRawLocation(cssProperty: SDK.CSSProperty.CSSProperty, forName: boolean): SDK.CSSModel.CSSLocation|null {
+    const style = cssProperty.ownerStyle;
+    if (!style || style.type !== SDK.CSSStyleDeclaration.Type.Regular || !style.styleSheetId) {
+      return null;
+    }
+    const header = style.cssModel().styleSheetHeaderForId(style.styleSheetId);
+    if (!header) {
+      return null;
+    }
+
+    const range = forName ? cssProperty.nameRange() : cssProperty.valueRange();
+    if (!range) {
+      return null;
+    }
+
+    const lineNumber = range.startLine;
+    const columnNumber = range.startColumn;
+    return new SDK.CSSModel.CSSLocation(
+        header, header.lineNumberInSource(lineNumber), header.columnNumberInSource(lineNumber, columnNumber));
+  }
+
   propertyUILocation(cssProperty: SDK.CSSProperty.CSSProperty, forName: boolean): Workspace.UISourceCode.UILocation
       |null {
     const style = cssProperty.ownerStyle;

package/front_end/models/bindings/DebuggerLanguagePlugins.ts

@@ -4,6 +4,7 @@
 
 import * as Common from '../../core/common/common.js';
 import * as i18n from '../../core/i18n/i18n.js';
+import type * as Platform from '../../core/platform/platform.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import * as Protocol from '../../generated/protocol.js';
 import * as Workspace from '../workspace/workspace.js';
@@ -1315,7 +1316,7 @@ class ModelData {
         this.uiSourceCodeToScripts.set(uiSourceCode, [script]);
 
         const contentProvider = new SDK.CompilerSourceMappingContentProvider.CompilerSourceMappingContentProvider(
-            url, Common.ResourceType.resourceTypes.SourceMapScript, initiator);
+            url as Platform.DevToolsPath.UrlString, Common.ResourceType.resourceTypes.SourceMapScript, initiator);
         const mimeType = Common.ResourceType.ResourceType.mimeFromURL(url) || 'text/javascript';
         this.project.addUISourceCodeWithProvider(uiSourceCode, contentProvider, null, mimeType);
       } else {

package/front_end/models/bindings/ResourceMapping.ts

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import * as Common from '../../core/common/common.js';
+import type * as Platform from '../../core/platform/platform.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import * as TextUtils from '../text_utils/text_utils.js';
 import * as Workspace from '../workspace/workspace.js';
@@ -420,7 +421,7 @@ class Binding implements TextUtils.ContentProvider.ContentProvider {
     return this.resources.values().next().value;
   }
 
-  contentURL(): string {
+  contentURL(): Platform.DevToolsPath.UrlString {
     return this.firstResource().contentURL();
   }
 

package/front_end/models/bindings/ResourceScriptMapping.ts

@@ -30,6 +30,7 @@
 
 import * as Common from '../../core/common/common.js';
 import * as i18n from '../../core/i18n/i18n.js';
+import type * as Platform from '../../core/platform/platform.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import * as Workspace from '../workspace/workspace.js';
 import type * as Protocol from '../../generated/protocol.js';
@@ -411,7 +412,7 @@ export class ResourceScriptFile extends Common.ObjectWrapper.ObjectWrapper<Resou
         Workspace.UISourceCode.Events.WorkingCopyCommitted, this.workingCopyCommitted, this);
   }
 
-  addSourceMapURL(sourceMapURL: string): void {
+  addSourceMapURL(sourceMapURL: Platform.DevToolsPath.UrlString): void {
     if (!this.scriptInternal) {
       return;
     }

package/front_end/models/bindings/StylesSourceMapping.ts

@@ -29,6 +29,7 @@
  */
 
 import * as Common from '../../core/common/common.js';
+import type * as Platform from '../../core/platform/platform.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import type * as TextUtils from '../text_utils/text_utils.js';
 import * as Workspace from '../workspace/workspace.js';
@@ -297,7 +298,7 @@ export class StyleFile implements TextUtils.ContentProvider.ContentProvider {
     Common.EventTarget.removeEventListeners(this.#eventListeners);
   }
 
-  contentURL(): string {
+  contentURL(): Platform.DevToolsPath.UrlString {
     console.assert(this.headers.size > 0);
     return this.headers.values().next().value.originalContentProvider().contentURL();
   }

package/front_end/models/issues_manager/FederatedAuthRequestIssue.ts

@@ -93,9 +93,9 @@ const issueDescriptions: Map<Protocol.Audits.FederatedAuthRequestIssueReason, La
     },
   ],
   [
-    Protocol.Audits.FederatedAuthRequestIssueReason.WellKnownHttpNotFound,
+    Protocol.Audits.FederatedAuthRequestIssueReason.ManifestHttpNotFound,
     {
-      file: 'federatedAuthRequestWellKnownHttpNotFound.md',
+      file: 'federatedAuthRequestManifestHttpNotFound.md',
       links: [{
         link: 'https://fedidcg.github.io/FedCM/',
         linkTitle: i18nLazyString(UIStrings.fedCm),
@@ -103,9 +103,9 @@ const issueDescriptions: Map<Protocol.Audits.FederatedAuthRequestIssueReason, La
     },
   ],
   [
-    Protocol.Audits.FederatedAuthRequestIssueReason.WellKnownNoResponse,
+    Protocol.Audits.FederatedAuthRequestIssueReason.ManifestNoResponse,
     {
-      file: 'federatedAuthRequestWellKnownNoResponse.md',
+      file: 'federatedAuthRequestManifestNoResponse.md',
       links: [{
         link: 'https://fedidcg.github.io/FedCM/',
         linkTitle: i18nLazyString(UIStrings.fedCm),
@@ -113,9 +113,9 @@ const issueDescriptions: Map<Protocol.Audits.FederatedAuthRequestIssueReason, La
     },
   ],
   [
-    Protocol.Audits.FederatedAuthRequestIssueReason.WellKnownInvalidResponse,
+    Protocol.Audits.FederatedAuthRequestIssueReason.ManifestInvalidResponse,
     {
-      file: 'federatedAuthRequestWellKnownInvalidResponse.md',
+      file: 'federatedAuthRequestManifestInvalidResponse.md',
       links: [{
         link: 'https://fedidcg.github.io/FedCM/',
         linkTitle: i18nLazyString(UIStrings.fedCm),
@@ -123,9 +123,9 @@ const issueDescriptions: Map<Protocol.Audits.FederatedAuthRequestIssueReason, La
     },
   ],
   [
-    Protocol.Audits.FederatedAuthRequestIssueReason.ClientIdMetadataHttpNotFound,
+    Protocol.Audits.FederatedAuthRequestIssueReason.ClientMetadataHttpNotFound,
     {
-      file: 'federatedAuthRequestClientIdMetadataHttpNotFound.md',
+      file: 'federatedAuthRequestClientMetadataHttpNotFound.md',
       links: [{
         link: 'https://fedidcg.github.io/FedCM/',
         linkTitle: i18nLazyString(UIStrings.fedCm),
@@ -133,9 +133,9 @@ const issueDescriptions: Map<Protocol.Audits.FederatedAuthRequestIssueReason, La
     },
   ],
   [
-    Protocol.Audits.FederatedAuthRequestIssueReason.ClientIdMetadataNoResponse,
+    Protocol.Audits.FederatedAuthRequestIssueReason.ClientMetadataNoResponse,
     {
-      file: 'federatedAuthRequestClientIdMetadataNoResponse.md',
+      file: 'federatedAuthRequestClientMetadataNoResponse.md',
       links: [{
         link: 'https://fedidcg.github.io/FedCM/',
         linkTitle: i18nLazyString(UIStrings.fedCm),
@@ -143,9 +143,9 @@ const issueDescriptions: Map<Protocol.Audits.FederatedAuthRequestIssueReason, La
     },
   ],
   [
-    Protocol.Audits.FederatedAuthRequestIssueReason.ClientIdMetadataInvalidResponse,
+    Protocol.Audits.FederatedAuthRequestIssueReason.ClientMetadataInvalidResponse,
     {
-      file: 'federatedAuthRequestClientIdMetadataInvalidResponse.md',
+      file: 'federatedAuthRequestClientMetadataInvalidResponse.md',
       links: [{
         link: 'https://fedidcg.github.io/FedCM/',
         linkTitle: i18nLazyString(UIStrings.fedCm),

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

@@ -0,0 +1 @@
+# The provider's FedCM manifest configuration cannot be found.

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

@@ -0,0 +1 @@
+# Provider's FedCM manifest configuration is invalid.

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

@@ -0,0 +1 @@
+# The response body is empty when fetching the provider's FedCM manifest configuration.

package/front_end/models/persistence/Automapping.ts

@@ -4,7 +4,6 @@
 
 import * as Common from '../../core/common/common.js';
 import * as Host from '../../core/host/host.js';
-import * as i18n from '../../core/i18n/i18n.js';
 import * as Platform from '../../core/platform/platform.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import * as Bindings from '../bindings/bindings.js';
@@ -14,16 +13,6 @@ import type {FileSystem} from './FileSystemWorkspaceBinding.js';
 import {FileSystemWorkspaceBinding} from './FileSystemWorkspaceBinding.js';
 import {PathEncoder, PersistenceImpl} from './PersistenceImpl.js';
 
-const UIStrings = {
-  /**
-  *@description Error message when attempting to create a binding from a malformed URI.
-  *@example {file://%E0%A4%A} PH1
-  */
-  theAttemptToBindSInTheWorkspace: 'The attempt to bind "{PH1}" in the workspace failed as this URI is malformed.',
-};
-const str_ = i18n.i18n.registerUIStrings('models/persistence/Automapping.ts', UIStrings);
-const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
-
 export class Automapping {
   private readonly workspace: Workspace.Workspace.WorkspaceImpl;
   private readonly onStatusAdded: (arg0: AutomappingStatus) => Promise<void>;
@@ -323,11 +312,7 @@ export class Automapping {
   private createBinding(networkSourceCode: Workspace.UISourceCode.UISourceCode): Promise<AutomappingStatus|null> {
     const url = networkSourceCode.url();
     if (url.startsWith('file://') || url.startsWith('snippet://')) {
-      const decodedUrl = sanitizeSourceUrl(url);
-      if (!decodedUrl) {
-        return Promise.resolve(null as AutomappingStatus | null);
-      }
-      const fileSourceCode = this.fileSystemUISourceCodes.get(decodedUrl);
+      const fileSourceCode = this.fileSystemUISourceCodes.get(url);
       const status = fileSourceCode ? new AutomappingStatus(networkSourceCode, fileSourceCode, false) : null;
       return Promise.resolve(status);
     }
@@ -338,16 +323,11 @@ export class Automapping {
     }
 
     if (networkPath.endsWith('/')) {
-      networkPath += 'index.html';
-    }
-
-    const urlDecodedNetworkPath = sanitizeSourceUrl(networkPath);
-    if (!urlDecodedNetworkPath) {
-      return Promise.resolve(null as AutomappingStatus | null);
+      networkPath = networkPath + 'index.html' as Platform.DevToolsPath.EncodedPathString;
     }
 
     const similarFiles =
-        this.filesIndex.similarFiles(urlDecodedNetworkPath).map(path => this.fileSystemUISourceCodes.get(path)) as
+        this.filesIndex.similarFiles(networkPath).map(path => this.fileSystemUISourceCodes.get(path)) as
         Workspace.UISourceCode.UISourceCode[];
     if (!similarFiles.length) {
       return Promise.resolve(null as AutomappingStatus | null);
@@ -355,16 +335,6 @@ export class Automapping {
 
     return this.pullMetadatas(similarFiles.concat(networkSourceCode)).then(onMetadatas.bind(this));
 
-    function sanitizeSourceUrl(url: string): string|null {
-      try {
-        const decodedUrl = decodeURI(url);
-        return decodedUrl;
-      } catch (error) {
-        Common.Console.Console.instance().error(i18nString(UIStrings.theAttemptToBindSInTheWorkspace, {PH1: url}));
-        return null;
-      }
-    }
-
     function onMetadatas(this: Automapping): AutomappingStatus|null {
       const activeFiles =
           similarFiles.filter(

package/front_end/models/persistence/FileSystemWorkspaceBinding.ts

@@ -59,9 +59,9 @@ export class FileSystemWorkspaceBinding {
     return fileSystemPath;
   }
 
-  static relativePath(uiSourceCode: Workspace.UISourceCode.UISourceCode): string[] {
+  static relativePath(uiSourceCode: Workspace.UISourceCode.UISourceCode): Platform.DevToolsPath.EncodedPathString[] {
     const baseURL = (uiSourceCode.project() as FileSystem).fileSystemBaseURL;
-    return uiSourceCode.url().substring(baseURL.length).split('/');
+    return uiSourceCode.url().substring(baseURL.length).split('/') as Platform.DevToolsPath.EncodedPathString[];
   }
 
   static tooltipForUISourceCode(uiSourceCode: Workspace.UISourceCode.UISourceCode): string {
@@ -193,12 +193,14 @@ export class FileSystem extends Workspace.Workspace.ProjectStore {
     return this.fileSystemInternal.mimeFromPath(uiSourceCode.url());
   }
 
-  initialGitFolders(): string[] {
-    return this.fileSystemInternal.initialGitFolders().map(folder => this.fileSystemPathInternal + '/' + folder);
+  initialGitFolders(): Platform.DevToolsPath.EncodedPathString[] {
+    return this.fileSystemInternal.initialGitFolders().map(folder => this.fileSystemPathInternal + '/' + folder) as
+        Platform.DevToolsPath.EncodedPathString[];
   }
 
-  private filePathForUISourceCode(uiSourceCode: Workspace.UISourceCode.UISourceCode): string {
-    return uiSourceCode.url().substring(this.fileSystemPathInternal.length);
+  private filePathForUISourceCode(uiSourceCode: Workspace.UISourceCode.UISourceCode):
+      Platform.DevToolsPath.EncodedPathString {
+    return uiSourceCode.url().substring(this.fileSystemPathInternal.length) as Platform.DevToolsPath.EncodedPathString;
   }
 
   isServiceProject(): boolean {
@@ -274,9 +276,9 @@ export class FileSystem extends Workspace.Workspace.ProjectStore {
       }
       console.assert(Boolean(newName));
       const slash = filePath.lastIndexOf('/');
-      const parentPath = filePath.substring(0, slash);
-      filePath = parentPath + '/' + newName;
-      filePath = filePath.substr(1);
+      const parentPath = Common.ParsedURL.ParsedURL.substr(filePath, 0, slash);
+      filePath = Common.ParsedURL.ParsedURL.encodedFromParentPathAndName(parentPath, newName);
+      filePath = Common.ParsedURL.ParsedURL.substr(filePath, 1);
       const newURL = this.fileSystemBaseURL + filePath;
       const newContentType = this.fileSystemInternal.contentType(newName);
       this.renameUISourceCode(uiSourceCode, newName);
@@ -412,7 +414,7 @@ export class FileSystem extends Workspace.Workspace.ProjectStore {
     void uiSourceCode.checkContentUpdated();
   }
 
-  tooltipForURL(url: string): string {
+  tooltipForURL(url: Platform.DevToolsPath.UrlString): string {
     return this.fileSystemInternal.tooltipForURL(url);
   }
 

package/front_end/models/persistence/IsolatedFileSystem.ts

@@ -28,8 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// TODO(crbug.com/1253323): All casts to UrlString will be removed from this file when migration to branded types is complete.
-
 import * as Common from '../../core/common/common.js';
 import * as Host from '../../core/host/host.js';
 import * as i18n from '../../core/i18n/i18n.js';
@@ -77,8 +75,8 @@ export class IsolatedFileSystem extends PlatformFileSystem {
   private readonly excludedFoldersSetting: Common.Settings.Setting<{[path: string]: string[]}>;
   private excludedFoldersInternal: Set<string>;
   private readonly excludedEmbedderFolders: string[];
-  private readonly initialFilePathsInternal: Set<string>;
-  private readonly initialGitFoldersInternal: Set<string>;
+  private readonly initialFilePathsInternal: Set<Platform.DevToolsPath.EncodedPathString>;
+  private readonly initialGitFoldersInternal: Set<Platform.DevToolsPath.EncodedPathString>;
   private readonly fileLocks: Map<string, Promise<void>>;
 
   constructor(
@@ -129,7 +127,7 @@ export class IsolatedFileSystem extends PlatformFileSystem {
     const promise = new Promise<Metadata|null>(f => {
       fulfill = f;
     });
-    this.domFileSystem.root.getFile(path, undefined, fileEntryLoaded, errorHandler);
+    this.domFileSystem.root.getFile(decodeURIComponent(path), undefined, fileEntryLoaded, errorHandler);
     return promise;
 
     function fileEntryLoaded(entry: FileEntry): void {
@@ -143,11 +141,11 @@ export class IsolatedFileSystem extends PlatformFileSystem {
     }
   }
 
-  initialFilePaths(): string[] {
+  initialFilePaths(): Platform.DevToolsPath.EncodedPathString[] {
     return [...this.initialFilePathsInternal];
   }
 
-  initialGitFolders(): string[] {
+  initialGitFolders(): Platform.DevToolsPath.EncodedPathString[] {
     return [...this.initialGitFoldersInternal];
   }
 
@@ -168,16 +166,19 @@ export class IsolatedFileSystem extends PlatformFileSystem {
             if (this.isFileExcluded(entry.fullPath)) {
               continue;
             }
-            this.initialFilePathsInternal.add(entry.fullPath.substr(1));
+            this.initialFilePathsInternal.add(Common.ParsedURL.ParsedURL.rawPathToEncodedPathString(
+                Common.ParsedURL.ParsedURL.substr(entry.fullPath as Platform.DevToolsPath.RawPathString, 1)));
           } else {
             if (entry.fullPath.endsWith('/.git')) {
               const lastSlash = entry.fullPath.lastIndexOf('/');
-              const parentFolder = entry.fullPath.substring(1, lastSlash);
-              this.initialGitFoldersInternal.add(parentFolder);
+              const parentFolder = Common.ParsedURL.ParsedURL.substr(
+                  entry.fullPath as Platform.DevToolsPath.RawPathString, 1, lastSlash);
+              this.initialGitFoldersInternal.add(Common.ParsedURL.ParsedURL.rawPathToEncodedPathString(parentFolder));
             }
             if (this.isFileExcluded(entry.fullPath + '/')) {
-              this.excludedEmbedderFolders.push(Common.ParsedURL.ParsedURL.urlToRawPathString(
-                  this.path() + entry.fullPath as Platform.DevToolsPath.UrlString, Host.Platform.isWin()));
+              const url = Common.ParsedURL.ParsedURL.concatenate(this.path(), entry.fullPath);
+              this.excludedEmbedderFolders.push(
+                  Common.ParsedURL.ParsedURL.urlToRawPathString(url, Host.Platform.isWin()));
               continue;
             }
             ++pendingRequests;
@@ -221,7 +222,7 @@ export class IsolatedFileSystem extends PlatformFileSystem {
   }
 
   async createFile(path: string, name: string|null): Promise<string|null> {
-    const dirEntry = await this.createFoldersIfNotExist(path);
+    const dirEntry = await this.createFoldersIfNotExist(decodeURIComponent(path));
     if (!dirEntry) {
       return null;
     }
@@ -230,7 +231,8 @@ export class IsolatedFileSystem extends PlatformFileSystem {
     if (!fileEntry) {
       return null;
     }
-    return fileEntry.fullPath.substr(1);
+    return Common.ParsedURL.ParsedURL.rawPathToEncodedPathString(
+        Common.ParsedURL.ParsedURL.substr(fileEntry.fullPath as Platform.DevToolsPath.RawPathString, 1));
 
     function createFileCandidate(
         this: IsolatedFileSystem, name: string, newFileIndex?: number): Promise<FileEntry|null> {
@@ -256,7 +258,8 @@ export class IsolatedFileSystem extends PlatformFileSystem {
     const promise = new Promise<boolean>(resolve => {
       resolveCallback = resolve;
     });
-    this.domFileSystem.root.getFile(path, undefined, fileEntryLoaded.bind(this), errorHandler.bind(this));
+    this.domFileSystem.root.getFile(
+        decodeURIComponent(path), undefined, fileEntryLoaded.bind(this), errorHandler.bind(this));
     return promise;
 
     function fileEntryLoaded(this: IsolatedFileSystem, fileEntry: FileEntry): void {
@@ -279,7 +282,7 @@ export class IsolatedFileSystem extends PlatformFileSystem {
 
   requestFileBlob(path: string): Promise<Blob|null> {
     return new Promise(resolve => {
-      this.domFileSystem.root.getFile(path, undefined, entry => {
+      this.domFileSystem.root.getFile(decodeURIComponent(path), undefined, entry => {
         entry.file(resolve, errorHandler.bind(this));
       }, errorHandler.bind(this));
 
@@ -347,7 +350,8 @@ export class IsolatedFileSystem extends PlatformFileSystem {
         // @ts-ignore TODO(crbug.com/1172300) Properly type this after jsdoc to ts migration
         callback = x;
       });
-      this.domFileSystem.root.getFile(path, {create: true}, fileEntryLoaded.bind(this), errorHandler.bind(this));
+      this.domFileSystem.root.getFile(
+          decodeURIComponent(path), {create: true}, fileEntryLoaded.bind(this), errorHandler.bind(this));
       return promise;
     };
 
@@ -391,7 +395,8 @@ export class IsolatedFileSystem extends PlatformFileSystem {
     let fileEntry: FileEntry;
     let dirEntry: DirectoryEntry;
 
-    this.domFileSystem.root.getFile(path, undefined, fileEntryLoaded.bind(this), errorHandler.bind(this));
+    this.domFileSystem.root.getFile(
+        decodeURIComponent(path), undefined, fileEntryLoaded.bind(this), errorHandler.bind(this));
 
     function fileEntryLoaded(this: IsolatedFileSystem, entry: FileEntry): void {
       if (entry.name === newName) {
@@ -458,7 +463,7 @@ export class IsolatedFileSystem extends PlatformFileSystem {
   }
 
   private requestEntries(path: string, callback: (arg0: Array<FileEntry>) => void): void {
-    this.domFileSystem.root.getDirectory(path, undefined, innerCallback.bind(this), errorHandler);
+    this.domFileSystem.root.getDirectory(decodeURIComponent(path), undefined, innerCallback.bind(this), errorHandler);
 
     function innerCallback(this: IsolatedFileSystem, dirEntry: DirectoryEntry): void {
       this.readDirectory(dirEntry, callback);
@@ -553,10 +558,9 @@ export class IsolatedFileSystem extends PlatformFileSystem {
                                              Common.ResourceType.resourceTypes.Document;
   }
 
-  tooltipForURL(url: string): string {
+  tooltipForURL(url: Platform.DevToolsPath.UrlString): string {
     const path = Platform.StringUtilities.trimMiddle(
-        Common.ParsedURL.ParsedURL.urlToRawPathString(url as Platform.DevToolsPath.UrlString, Host.Platform.isWin()),
-        150);
+        Common.ParsedURL.ParsedURL.urlToRawPathString(url, Host.Platform.isWin()), 150);
     return i18nString(UIStrings.linkedToS, {PH1: path});
   }
 

package/front_end/models/persistence/NetworkPersistenceManager.ts

@@ -248,6 +248,11 @@ export class NetworkPersistenceManager extends Common.ObjectWrapper.ObjectWrappe
     }
   }
 
+  private fileUrlFromNetworkUrl(url: Platform.DevToolsPath.UrlString): Platform.DevToolsPath.UrlString {
+    return (this.projectInternal as FileSystem).fileSystemPath() + '/' + this.encodedPathFromUrl(url) as
+        Platform.DevToolsPath.UrlString;
+  }
+
   private decodeLocalPathToUrlPath(path: string): string {
     try {
       return unescape(path);
@@ -341,12 +346,11 @@ export class NetworkPersistenceManager extends Common.ObjectWrapper.ObjectWrappe
         !this.canHandleNetworkUISourceCode(uiSourceCode)) {
       return;
     }
-    const url = Common.ParsedURL.ParsedURL.urlWithoutHash(uiSourceCode.url());
+    const url = Common.ParsedURL.ParsedURL.urlWithoutHash(uiSourceCode.url()) as Platform.DevToolsPath.UrlString;
     this.networkUISourceCodeForEncodedPath.set(this.encodedPathFromUrl(url), uiSourceCode);
 
     const project = this.projectInternal as FileSystem;
-    const fileSystemUISourceCode =
-        project.uiSourceCodeForURL(project.fileSystemPath() + '/' + this.encodedPathFromUrl(url));
+    const fileSystemUISourceCode = project.uiSourceCodeForURL(this.fileUrlFromNetworkUrl(url));
     if (fileSystemUISourceCode) {
       await this.bind(uiSourceCode, fileSystemUISourceCode);
     }
@@ -571,7 +575,7 @@ export class NetworkPersistenceManager extends Common.ObjectWrapper.ObjectWrappe
       return;
     }
     const proj = this.projectInternal as FileSystem;
-    const path = proj.fileSystemPath() + '/' + this.encodedPathFromUrl(interceptedRequest.request.url);
+    const path = this.fileUrlFromNetworkUrl(interceptedRequest.request.url as Platform.DevToolsPath.UrlString);
     const fileSystemUISourceCode = proj.uiSourceCodeForURL(path);
     let responseHeaders: Protocol.Fetch.HeaderEntry[] = [];
     if (Root.Runtime.experiments.isEnabled(Root.Runtime.ExperimentName.HEADER_OVERRIDES)) {

package/front_end/models/persistence/PersistenceActions.ts

@@ -5,7 +5,6 @@
 import * as Common from '../../core/common/common.js';
 import * as Host from '../../core/host/host.js';
 import * as i18n from '../../core/i18n/i18n.js';
-import type * as Platform from '../../core/platform/platform.js';
 import * as SDK from '../../core/sdk/sdk.js';
 
 import type * as TextUtils from '../text_utils/text_utils.js';
@@ -93,9 +92,7 @@ export class ContextMenuProvider implements UI.ContextMenu.Provider {
     const binding = uiSourceCode && PersistenceImpl.instance().binding(uiSourceCode);
     const fileURL = binding ? binding.fileSystem.contentURL() : contentProvider.contentURL();
     if (fileURL.startsWith('file://')) {
-      // TODO(crbug.com/1253323): Cast to UrlString will be removed when migration to branded types is complete.
-      const path = Common.ParsedURL.ParsedURL.urlToRawPathString(
-          fileURL as Platform.DevToolsPath.UrlString, Host.Platform.isWin());
+      const path = Common.ParsedURL.ParsedURL.urlToRawPathString(fileURL, Host.Platform.isWin());
       contextMenu.revealSection().appendItem(
           i18nString(UIStrings.openInContainingFolder),
           () => Host.InspectorFrontendHost.InspectorFrontendHostInstance.showItemInFolder(path));

package/front_end/models/persistence/PlatformFileSystem.ts

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import type * as Common from '../../core/common/common.js';
+import type * as Platform from '../../core/platform/platform.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import type * as TextUtils from '../text_utils/text_utils.js';
 
@@ -26,16 +27,16 @@ export class PlatformFileSystem {
     return Promise.resolve(null);
   }
 
-  initialFilePaths(): string[] {
+  initialFilePaths(): Platform.DevToolsPath.EncodedPathString[] {
     return [];
   }
 
-  initialGitFolders(): string[] {
+  initialGitFolders(): Platform.DevToolsPath.EncodedPathString[] {
     return [];
   }
 
-  path(): string {
-    return this.pathInternal;
+  path(): Platform.DevToolsPath.UrlString {
+    return this.pathInternal as Platform.DevToolsPath.UrlString;
   }
 
   embedderPath(): string {
@@ -110,7 +111,7 @@ export class PlatformFileSystem {
     throw new Error('Not implemented');
   }
 
-  tooltipForURL(_url: string): string {
+  tooltipForURL(_url: Platform.DevToolsPath.UrlString): string {
     throw new Error('Not implemented');
   }
 

package/front_end/{panels/sources/SourceMapNamesResolver.ts → models/source_map_scopes/NamesResolver.ts}

@@ -1,13 +1,13 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2022 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 import * as Platform from '../../core/platform/platform.js';
 import * as SDK from '../../core/sdk/sdk.js';
-import * as Bindings from '../../models/bindings/bindings.js';
-import * as Formatter from '../../models/formatter/formatter.js';
-import * as TextUtils from '../../models/text_utils/text_utils.js';
-import type * as Workspace from '../../models/workspace/workspace.js';
+import * as Bindings from '../bindings/bindings.js';
+import * as Formatter from '../formatter/formatter.js';
+import * as TextUtils from '../text_utils/text_utils.js';
+import type * as Workspace from '../workspace/workspace.js';
 import * as Protocol from '../../generated/protocol.js';
 
 interface CachedScopeMap {

package/front_end/models/source_map_scopes/source_map_scopes.ts

@@ -0,0 +1,7 @@
+// Copyright 2022 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import * as NamesResolver from './NamesResolver.js';
+
+export {NamesResolver};

package/front_end/models/text_utils/ContentProvider.ts

@@ -29,9 +29,10 @@
  */
 
 import type * as Common from '../../core/common/common.js';
+import type * as Platform from '../../core/platform/platform.js';
 
 export abstract class ContentProvider {
-  abstract contentURL(): string;
+  abstract contentURL(): Platform.DevToolsPath.UrlString;
   abstract contentType(): Common.ResourceType.ResourceType;
   abstract contentEncoded(): Promise<boolean>;
   abstract requestContent(): Promise<DeferredContent>;

package/front_end/models/text_utils/StaticContentProvider.ts

@@ -3,18 +3,20 @@
 // found in the LICENSE file.
 
 import type * as Common from '../../core/common/common.js';
+import type * as Platform from '../../core/platform/platform.js';
 
 import type {ContentProvider, DeferredContent, SearchMatch} from './ContentProvider.js';
 import {performSearchInContent} from './TextUtils.js';
 
 export class StaticContentProvider implements ContentProvider {
-  private readonly contentURLInternal: string;
+  private readonly contentURLInternal: Platform.DevToolsPath.UrlString;
   private readonly contentTypeInternal: Common.ResourceType.ResourceType;
   private readonly lazyContent: () => Promise<DeferredContent>;
 
   constructor(
       contentURL: string, contentType: Common.ResourceType.ResourceType, lazyContent: () => Promise<DeferredContent>) {
-    this.contentURLInternal = contentURL;
+    // TODO(crbug.com/1253323): Cast to UrlString will be removed when migration to branded types is complete.
+    this.contentURLInternal = contentURL as Platform.DevToolsPath.UrlString;
     this.contentTypeInternal = contentType;
     this.lazyContent = lazyContent;
   }
@@ -28,8 +30,7 @@ export class StaticContentProvider implements ContentProvider {
     return new StaticContentProvider(contentURL, contentType, lazyContent);
   }
 
-  // TODO(crbug.com/1253323): Cast to PawPathString will be removed when migration to branded types is complete.
-  contentURL(): string {
+  contentURL(): Platform.DevToolsPath.UrlString {
     return this.contentURLInternal;
   }