chrome-devtools-frontend 1.0.971140 → 1.0.973253

package/front_end/models/bindings/BreakpointManager.ts

@@ -32,6 +32,7 @@
 
 import * as Common from '../../core/common/common.js';
 import * as SDK from '../../core/sdk/sdk.js';
+import type * as Platform from '../../core/platform/platform.js';
 import type * as Protocol from '../../generated/protocol.js';
 import type * as TextUtils from '../text_utils/text_utils.js';
 import * as Workspace from '../workspace/workspace.js';
@@ -305,7 +306,7 @@ export type EventTypes = {
 
 export class Breakpoint implements SDK.TargetManager.SDKModelObserver<SDK.DebuggerModel.DebuggerModel> {
   readonly breakpointManager: BreakpointManager;
-  urlInternal: string;
+  urlInternal: Platform.DevToolsPath.UrlString;
   readonly #lineNumberInternal: number;
   readonly #columnNumberInternal: number|undefined;
   readonly #uiLocations: Set<Workspace.UISourceCode.UILocation>;
@@ -317,8 +318,9 @@ export class Breakpoint implements SDK.TargetManager.SDKModelObserver<SDK.Debugg
   readonly #modelBreakpoints: Map<SDK.DebuggerModel.DebuggerModel, ModelBreakpoint>;
 
   constructor(
-      breakpointManager: BreakpointManager, primaryUISourceCode: Workspace.UISourceCode.UISourceCode, url: string,
-      lineNumber: number, columnNumber: number|undefined, condition: string, enabled: boolean) {
+      breakpointManager: BreakpointManager, primaryUISourceCode: Workspace.UISourceCode.UISourceCode,
+      url: Platform.DevToolsPath.UrlString, lineNumber: number, columnNumber: number|undefined, condition: string,
+      enabled: boolean) {
     this.breakpointManager = breakpointManager;
     this.urlInternal = url;
     this.#lineNumberInternal = lineNumber;
@@ -398,7 +400,7 @@ export class Breakpoint implements SDK.TargetManager.SDKModelObserver<SDK.Debugg
     }
   }
 
-  url(): string {
+  url(): Platform.DevToolsPath.UrlString {
     return this.urlInternal;
   }
 
@@ -791,7 +793,7 @@ export class ModelBreakpoint {
 }
 
 interface Position {
-  url: string;
+  url: Platform.DevToolsPath.UrlString;
   scriptId: Protocol.Runtime.ScriptId;
   scriptHash: string;
   lineNumber: number;

package/front_end/models/bindings/CSSWorkspaceBinding.ts

@@ -123,24 +123,10 @@ export class CSSWorkspaceBinding implements SDK.TargetManager.SDKModelObserver<S
 
   propertyUILocation(cssProperty: SDK.CSSProperty.CSSProperty, forName: boolean): Workspace.UISourceCode.UILocation
       |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) {
+    const rawLocation = this.propertyRawLocation(cssProperty, forName);
+    if (!rawLocation) {
       return null;
     }
-
-    const range = forName ? cssProperty.nameRange() : cssProperty.valueRange();
-    if (!range) {
-      return null;
-    }
-
-    const lineNumber = range.startLine;
-    const columnNumber = range.startColumn;
-    const rawLocation = new SDK.CSSModel.CSSLocation(
-        header, header.lineNumberInSource(lineNumber), header.columnNumberInSource(lineNumber, columnNumber));
     return this.rawLocationToUILocation(rawLocation);
   }
 

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/SASSSourceMapping.ts

@@ -31,6 +31,7 @@
 import * as Common from '../../core/common/common.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import type * as Protocol from '../../generated/protocol.js';
+import type * as Platform from '../../core/platform/platform.js';
 import * as Workspace from '../workspace/workspace.js';
 
 import {ContentProviderBasedProject} from './ContentProviderBasedProject.js';
@@ -78,7 +79,7 @@ export class SASSSourceMapping implements SourceMapping {
     for (const sourceURL of sourceMap.sourceURLs()) {
       let binding = bindings.get(sourceURL);
       if (!binding) {
-        binding = new Binding(project, sourceURL);
+        binding = new Binding(project, sourceURL as Platform.DevToolsPath.UrlString);
         bindings.set(sourceURL, binding);
       }
       binding.addSourceMap(sourceMap, header.frameId);
@@ -163,11 +164,11 @@ const uiSourceCodeToBinding = new WeakMap<Workspace.UISourceCode.UISourceCode, B
 
 class Binding {
   readonly #project: ContentProviderBasedProject;
-  readonly #url: string;
+  readonly #url: Platform.DevToolsPath.UrlString;
   referringSourceMaps: SDK.SourceMap.TextSourceMap[];
   uiSourceCode: Workspace.UISourceCode.UISourceCode|null;
 
-  constructor(project: ContentProviderBasedProject, url: string) {
+  constructor(project: ContentProviderBasedProject, url: Platform.DevToolsPath.UrlString) {
     this.#project = project;
     this.#url = url;
 

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/har/HARFormat.ts

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import type * as Platform from '../../core/platform/platform.js';
+
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 class HARBase {
@@ -197,7 +199,7 @@ export class HAREntry extends HARBase {
 
 class HARRequest extends HARBase {
   method: string;
-  url: string;
+  url: Platform.DevToolsPath.UrlString;
   httpVersion: string;
   cookies: HARCookie[];
   headers: HARHeader[];
@@ -209,7 +211,7 @@ class HARRequest extends HARBase {
   constructor(data: any) {
     super(data);
     this.method = String(data['method']);
-    this.url = String(data['url']);
+    this.url = String(data['url']) as Platform.DevToolsPath.UrlString;
     this.httpVersion = String(data['httpVersion']);
     this.cookies = Array.isArray(data['cookies']) ? data['cookies'].map(cookie => new HARCookie(cookie)) : [];
     this.headers = Array.isArray(data['headers']) ? data['headers'].map(header => new HARHeader(header)) : [];

package/front_end/models/har/Importer.ts

@@ -38,7 +38,6 @@ export class Importer {
           lineNumber: initiatorEntry.lineNumber,
         };
       }
-
       const request = SDK.NetworkRequest.NetworkRequest.createWithoutBackendRequest(
           'har-' + requests.length, entry.request.url, documentURL, initiator);
       const page = pageref ? pages.get(pageref) : undefined;

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/FileSystemWorkspaceBinding.ts

@@ -79,9 +79,9 @@ export class FileSystemWorkspaceBinding {
     return fileSystem.supportsAutomapping();
   }
 
-  static completeURL(project: Workspace.Workspace.Project, relativePath: string): string {
+  static completeURL(project: Workspace.Workspace.Project, relativePath: string): Platform.DevToolsPath.UrlString {
     const fsProject = project as FileSystem;
-    return fsProject.fileSystemBaseURL + relativePath;
+    return Common.ParsedURL.ParsedURL.concatenate(fsProject.fileSystemBaseURL, relativePath);
   }
 
   static fileSystemPath(projectId: string): string {
@@ -155,7 +155,7 @@ export class FileSystemWorkspaceBinding {
 
 export class FileSystem extends Workspace.Workspace.ProjectStore {
   readonly fileSystemInternal: PlatformFileSystem;
-  readonly fileSystemBaseURL: string;
+  readonly fileSystemBaseURL: Platform.DevToolsPath.UrlString;
   private readonly fileSystemParentURL: string;
   private readonly fileSystemWorkspaceBinding: FileSystemWorkspaceBinding;
   private readonly fileSystemPathInternal: string;
@@ -171,7 +171,7 @@ export class FileSystem extends Workspace.Workspace.ProjectStore {
     super(workspace, id, Workspace.Workspace.projectTypes.FileSystem, displayName);
 
     this.fileSystemInternal = isolatedFileSystem;
-    this.fileSystemBaseURL = this.fileSystemInternal.path() + '/';
+    this.fileSystemBaseURL = Common.ParsedURL.ParsedURL.concatenate(this.fileSystemInternal.path(), '/');
     this.fileSystemParentURL = this.fileSystemBaseURL.substr(0, fileSystemPath.lastIndexOf('/') + 1);
     this.fileSystemWorkspaceBinding = fileSystemWorkspaceBinding;
     this.fileSystemPathInternal = fileSystemPath;
@@ -414,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';
@@ -83,7 +81,6 @@ export class IsolatedFileSystem extends PlatformFileSystem {
 
   constructor(
       manager: IsolatedFileSystemManager, path: string, embedderPath: string, domFileSystem: FileSystem, type: string) {
-    // TODO(crbug.com/1253323): Cast to UrlString will be removed when migration to branded types is complete.
     super(path, type);
     this.manager = manager;
     this.embedderPathInternal = embedderPath;
@@ -169,17 +166,18 @@ export class IsolatedFileSystem extends PlatformFileSystem {
               continue;
             }
             this.initialFilePathsInternal.add(Common.ParsedURL.ParsedURL.rawPathToEncodedPathString(
-                entry.fullPath.substr(1) as Platform.DevToolsPath.RawPathString));
+                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(Common.ParsedURL.ParsedURL.rawPathToEncodedPathString(
-                  parentFolder as Platform.DevToolsPath.RawPathString));
+              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;
@@ -233,7 +231,7 @@ export class IsolatedFileSystem extends PlatformFileSystem {
       return null;
     }
     return Common.ParsedURL.ParsedURL.rawPathToEncodedPathString(
-        fileEntry.fullPath.substr(1) as Platform.DevToolsPath.RawPathString);
+        Common.ParsedURL.ParsedURL.substr(fileEntry.fullPath as Platform.DevToolsPath.RawPathString, 1));
 
     function createFileCandidate(
         this: IsolatedFileSystem, name: string, newFileIndex?: number): Promise<FileEntry|null> {
@@ -559,10 +557,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/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

@@ -35,8 +35,8 @@ export class PlatformFileSystem {
     return [];
   }
 
-  path(): string {
-    return this.pathInternal;
+  path(): Platform.DevToolsPath.UrlString {
+    return this.pathInternal as Platform.DevToolsPath.UrlString;
   }
 
   embedderPath(): string {
@@ -111,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,17 +3,19 @@
 // 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>) {
+      contentURL: Platform.DevToolsPath.UrlString, contentType: Common.ResourceType.ResourceType,
+      lazyContent: () => Promise<DeferredContent>) {
     this.contentURLInternal = contentURL;
     this.contentTypeInternal = contentType;
     this.lazyContent = lazyContent;
@@ -25,11 +27,11 @@ export class StaticContentProvider implements ContentProvider {
       content: string,
       isEncoded: boolean,
     }> => Promise.resolve({content, isEncoded: false});
-    return new StaticContentProvider(contentURL, contentType, lazyContent);
+    // TODO(crbug.com/1253323): Cast to UrlString will be removed when migration to branded types is complete.
+    return new StaticContentProvider(contentURL as Platform.DevToolsPath.UrlString, 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;
   }
 

package/front_end/models/workspace/UISourceCode.ts

@@ -56,7 +56,7 @@ export class UISourceCode extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
   private projectInternal: Project;
   private urlInternal: string;
   private readonly originInternal: string;
-  private readonly parentURLInternal: string;
+  private readonly parentURLInternal: Platform.DevToolsPath.UrlString;
   private nameInternal: string;
   private contentTypeInternal: Common.ResourceType.ResourceType;
   private requestContentPromise: Promise<TextUtils.ContentProvider.DeferredContent>|null;
@@ -81,7 +81,7 @@ export class UISourceCode extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     const parsedURL = Common.ParsedURL.ParsedURL.fromString(url);
     if (parsedURL) {
       this.originInternal = parsedURL.securityOrigin();
-      this.parentURLInternal = this.originInternal + parsedURL.folderPathComponents;
+      this.parentURLInternal = this.originInternal + parsedURL.folderPathComponents as Platform.DevToolsPath.UrlString;
       if (parsedURL.queryParams) {
         // in case file name contains query params, it doesn't look like a normal file name anymore
         // so it can as well remain encoded
@@ -92,7 +92,7 @@ export class UISourceCode extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
       }
     } else {
       this.originInternal = '';
-      this.parentURLInternal = '';
+      this.parentURLInternal = '' as Platform.DevToolsPath.UrlString;
       this.nameInternal = url;
     }
 
@@ -122,11 +122,11 @@ export class UISourceCode extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     return this.projectInternal.mimeType(this);
   }
 
-  url(): string {
-    return this.urlInternal;
+  url(): Platform.DevToolsPath.UrlString {
+    return this.urlInternal as Platform.DevToolsPath.UrlString;
   }
 
-  parentURL(): string {
+  parentURL(): Platform.DevToolsPath.UrlString {
     return this.parentURLInternal;
   }
 
@@ -189,7 +189,7 @@ export class UISourceCode extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
         WorkspaceImplEvents.UISourceCodeRenamed, {oldURL: oldURL, uiSourceCode: this});
   }
 
-  contentURL(): string {
+  contentURL(): Platform.DevToolsPath.UrlString {
     return this.url();
   }
 

package/front_end/models/workspace/WorkspaceImpl.ts

@@ -29,7 +29,6 @@
  */
 
 import * as Common from '../../core/common/common.js';
-import type * as Platform from '../../core/platform/platform.js';
 import type * as TextUtils from '../text_utils/text_utils.js';
 
 import type {UISourceCodeMetadata} from './UISourceCode.js';
@@ -177,8 +176,7 @@ export abstract class ProjectStore implements Project {
   renameUISourceCode(uiSourceCode: UISourceCode, newName: string): void {
     const oldPath = uiSourceCode.url();
     const newPath = uiSourceCode.parentURL() ?
-        Common.ParsedURL.ParsedURL.urlFromParentUrlAndName(
-            uiSourceCode.parentURL() as Platform.DevToolsPath.UrlString, newName) :
+        Common.ParsedURL.ParsedURL.urlFromParentUrlAndName(uiSourceCode.parentURL(), newName) :
         encodeURIComponent(newName);
     const value = this.uiSourceCodesMap.get(oldPath) as {
       uiSourceCode: UISourceCode,