chrome-devtools-frontend 1.0.923302 → 1.0.925026

package/front_end/core/platform/string-utilities.ts

@@ -239,15 +239,16 @@ const escapedReplacements = new Map([
   ['\t', '\\t'],
   ['\v', '\\v'],
   ['\'', '\\\''],
+  ['\\', '\\\\'],
   ['<!--', '<\\!--'],
   ['<script', '<\\script'],
   ['</script', '<\\/script'],
 ]);
 
 export const formatAsJSLiteral = (content: string): string => {
-  const patternsToEscape = /(\p{Control})|(\p{Surrogate})|(<(?:!--|\/?script))/gu;
-  const patternsToEscapePlusSingleQuote = /(\p{Control})|(\p{Surrogate})|(<(?:!--|\/?script)|')/gu;
-  const escapePattern = (match: string, controlChar: string, loneSurrogate: string, pattern: string): string => {
+  const patternsToEscape = /(\\|<(?:!--|\/?script))|(\p{Control})|(\p{Surrogate})/gu;
+  const patternsToEscapePlusSingleQuote = /(\\|'|<(?:!--|\/?script))|(\p{Control})|(\p{Surrogate})/gu;
+  const escapePattern = (match: string, pattern: string, controlChar: string, loneSurrogate: string): string => {
     if (controlChar) {
       if (escapedReplacements.has(controlChar)) {
         // @ts-ignore https://github.com/microsoft/TypeScript/issues/13086

package/front_end/core/sdk/EmulationModel.ts

@@ -535,7 +535,7 @@ export class DeviceOrientation {
     valid: boolean,
     errorMessage: (string|undefined),
   } {
-    return DeviceOrientation.angleRangeValidator(value, {minimum: 0, maximum: 360});
+    return DeviceOrientation.angleRangeValidator(value, {minimum: -180, maximum: 180});
   }
 
   static betaAngleValidator(value: string): {

package/front_end/core/sdk/NetworkManager.ts

@@ -246,8 +246,7 @@ export class NetworkManager extends SDKModel<EventTypes> {
     return this.dispatcher.requestForURL(url);
   }
 
-  private cacheDisabledSettingChanged(event: Common.EventTarget.EventTargetEvent): void {
-    const enabled = (event.data as boolean);
+  private cacheDisabledSettingChanged({data: enabled}: Common.EventTarget.EventTargetEvent<boolean>): void {
     this.networkAgent.invoke_setCacheDisabled({cacheDisabled: enabled});
   }
 

package/front_end/core/sdk/ResourceTreeModel.ts

@@ -439,9 +439,8 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
     return {primaryIcon: response.primaryIcon || null};
   }
 
-  async getAppId(): Promise<string|undefined> {
-    const response = await this.agent.invoke_getAppId();
-    return response.appId;
+  async getAppId(): Promise<Protocol.Page.GetAppIdResponse> {
+    return this.agent.invoke_getAppId();
   }
 
   private executionContextComparator(a: ExecutionContext, b: ExecutionContext): number {

package/front_end/core/sdk/RuntimeModel.ts

@@ -192,8 +192,7 @@ export class RuntimeModel extends SDKModel<EventTypes> {
     this.agent.invoke_runIfWaitingForDebugger();
   }
 
-  private customFormattersStateChanged(event: Common.EventTarget.EventTargetEvent): void {
-    const enabled = (event.data as boolean);
+  private customFormattersStateChanged({data: enabled}: Common.EventTarget.EventTargetEvent<boolean>): void {
     this.agent.invoke_setCustomObjectFormatterEnabled({enabled});
   }
 
@@ -487,7 +486,7 @@ export interface QueryObjectRequestedEvent {
 
 export type EventTypes = {
   [Events.BindingCalled]: Protocol.Runtime.BindingCalledEvent,
-  [Events.ExecutionContextCreated]: Protocol.Runtime.ExecutionContextDescription,
+  [Events.ExecutionContextCreated]: ExecutionContext,
   [Events.ExecutionContextDestroyed]: ExecutionContext,
   [Events.ExecutionContextChanged]: ExecutionContext,
   [Events.ExecutionContextOrderChanged]: RuntimeModel,

package/front_end/core/sdk/SourceMap.ts

@@ -62,6 +62,7 @@ export interface SourceMap {
       TextUtils.ContentProvider.ContentProvider;
   embeddedContentByURL(sourceURL: string): string|null;
   findEntry(lineNumber: number, columnNumber: number): SourceMapEntry|null;
+  findReverseRanges(sourceURL: string, lineNumber: number, columnNumber: number): TextUtils.TextRange.TextRange[];
   sourceLineMapping(sourceURL: string, lineNumber: number, columnNumber: number): SourceMapEntry|null;
   mappings(): SourceMapEntry[];
   mapsOrigin(): boolean;
@@ -225,37 +226,71 @@ export class TextSourceMap implements SourceMap {
   }
 
   sourceLineMapping(sourceURL: string, lineNumber: number, columnNumber: number): SourceMapEntry|null {
-    const mappings = this.reversedMappings(sourceURL);
-    const first = Platform.ArrayUtilities.lowerBound(mappings, lineNumber, lineComparator);
-    const last = Platform.ArrayUtilities.upperBound(mappings, lineNumber, lineComparator);
-    if (first >= mappings.length || mappings[first].sourceLineNumber !== lineNumber) {
+    const mappings = this.mappings();
+    const reverseMappings = this.reversedMappings(sourceURL);
+    const first = Platform.ArrayUtilities.lowerBound(reverseMappings, lineNumber, lineComparator);
+    const last = Platform.ArrayUtilities.upperBound(reverseMappings, lineNumber, lineComparator);
+    if (first >= reverseMappings.length || mappings[reverseMappings[first]].sourceLineNumber !== lineNumber) {
       return null;
     }
-    const columnMappings = mappings.slice(first, last);
+    const columnMappings = reverseMappings.slice(first, last);
     if (!columnMappings.length) {
       return null;
     }
     const index = Platform.ArrayUtilities.lowerBound(
-        columnMappings, columnNumber, (columnNumber, mapping) => columnNumber - mapping.sourceColumnNumber);
-    return index >= columnMappings.length ? columnMappings[columnMappings.length - 1] : columnMappings[index];
+        columnMappings, columnNumber, (columnNumber, i) => columnNumber - mappings[i].sourceColumnNumber);
+    return index >= columnMappings.length ? mappings[columnMappings[columnMappings.length - 1]] :
+                                            mappings[columnMappings[index]];
 
-    function lineComparator(lineNumber: number, mapping: SourceMapEntry): number {
-      return lineNumber - mapping.sourceLineNumber;
+    function lineComparator(lineNumber: number, i: number): number {
+      return lineNumber - mappings[i].sourceLineNumber;
     }
   }
 
-  findReverseEntries(sourceURL: string, lineNumber: number, columnNumber: number): SourceMapEntry[] {
-    const mappings = this.reversedMappings(sourceURL);
+  private findReverseIndices(sourceURL: string, lineNumber: number, columnNumber: number): number[] {
+    const mappings = this.mappings();
+    const reverseMappings = this.reversedMappings(sourceURL);
     const endIndex = Platform.ArrayUtilities.upperBound(
-        mappings, undefined,
-        (unused, entry) => lineNumber - entry.sourceLineNumber || columnNumber - entry.sourceColumnNumber);
+        reverseMappings, undefined,
+        (unused, i) => lineNumber - mappings[i].sourceLineNumber || columnNumber - mappings[i].sourceColumnNumber);
     let startIndex = endIndex;
-    while (startIndex > 0 && mappings[startIndex - 1].sourceLineNumber === mappings[endIndex - 1].sourceLineNumber &&
-           mappings[startIndex - 1].sourceColumnNumber === mappings[endIndex - 1].sourceColumnNumber) {
+    while (startIndex > 0 &&
+           mappings[reverseMappings[startIndex - 1]].sourceLineNumber ===
+               mappings[reverseMappings[endIndex - 1]].sourceLineNumber &&
+           mappings[reverseMappings[startIndex - 1]].sourceColumnNumber ===
+               mappings[reverseMappings[endIndex - 1]].sourceColumnNumber) {
       --startIndex;
     }
 
-    return mappings.slice(startIndex, endIndex);
+    return reverseMappings.slice(startIndex, endIndex);
+  }
+
+  findReverseEntries(sourceURL: string, lineNumber: number, columnNumber: number): SourceMapEntry[] {
+    const mappings = this.mappings();
+    return this.findReverseIndices(sourceURL, lineNumber, columnNumber).map(i => mappings[i]);
+  }
+
+  findReverseRanges(sourceURL: string, lineNumber: number, columnNumber: number): TextUtils.TextRange.TextRange[] {
+    const mappings = this.mappings();
+    const indices = this.findReverseIndices(sourceURL, lineNumber, columnNumber);
+    const ranges: TextUtils.TextRange.TextRange[] = [];
+
+    for (let i = 0; i < indices.length; ++i) {
+      const startIndex = indices[i];
+
+      // Merge adjacent ranges.
+      let endIndex = startIndex + 1;
+      while (i + 1 < indices.length && endIndex === indices[i + 1]) {
+        ++endIndex;
+        ++i;
+      }
+      const endLine = endIndex < mappings.length ? mappings[endIndex].lineNumber : Infinity;
+      const endColumn = endIndex < mappings.length ? mappings[endIndex].columnNumber : 0;
+      ranges.push(new TextUtils.TextRange.TextRange(
+          mappings[startIndex].lineNumber, mappings[startIndex].columnNumber, endLine, endColumn));
+    }
+
+    return ranges;
   }
 
   mappings(): SourceMapEntry[] {
@@ -267,19 +302,22 @@ export class TextSourceMap implements SourceMap {
     return /** @type {!Array<!SourceMapEntry>} */ this.mappingsInternal as SourceMapEntry[];
   }
 
-  private reversedMappings(sourceURL: string): SourceMapEntry[] {
+  private reversedMappings(sourceURL: string): number[] {
     const info = this.sourceInfos.get(sourceURL);
     if (!info) {
       return [];
     }
     const mappings = this.mappings();
     if (info.reverseMappings === null) {
-      info.reverseMappings = mappings.filter(mapping => mapping.sourceURL === sourceURL).sort(sourceMappingComparator);
+      const indexes = Array(mappings.length).fill(0).map((_, i) => i);
+      info.reverseMappings = indexes.filter(i => mappings[i].sourceURL === sourceURL).sort(sourceMappingComparator);
     }
 
     return info.reverseMappings;
 
-    function sourceMappingComparator(a: SourceMapEntry, b: SourceMapEntry): number {
+    function sourceMappingComparator(indexA: number, indexB: number): number {
+      const a = mappings[indexA];
+      const b = mappings[indexB];
       if (a.sourceLineNumber !== b.sourceLineNumber) {
         return a.sourceLineNumber - b.sourceLineNumber;
       }
@@ -415,25 +453,30 @@ export class TextSourceMap implements SourceMap {
           lineNumber: number,
           columnNumber: number,
         },
-        mapping: SourceMapEntry): number {
-      if (position.lineNumber !== mapping.sourceLineNumber) {
-        return position.lineNumber - mapping.sourceLineNumber;
+        mappingIndex: number): number {
+      if (position.lineNumber !== mappings[mappingIndex].sourceLineNumber) {
+        return position.lineNumber - mappings[mappingIndex].sourceLineNumber;
       }
 
-      return position.columnNumber - mapping.sourceColumnNumber;
+      return position.columnNumber - mappings[mappingIndex].sourceColumnNumber;
     }
 
-    const mappings = this.reversedMappings(url);
-    if (!mappings.length) {
+    const reverseMappings = this.reversedMappings(url);
+    const mappings = this.mappings();
+    if (!reverseMappings.length) {
       return null;
     }
     const startIndex = Platform.ArrayUtilities.lowerBound(
-        mappings, {lineNumber: textRange.startLine, columnNumber: textRange.startColumn}, comparator);
+        reverseMappings, {lineNumber: textRange.startLine, columnNumber: textRange.startColumn}, comparator);
     const endIndex = Platform.ArrayUtilities.upperBound(
-        mappings, {lineNumber: textRange.endLine, columnNumber: textRange.endColumn}, comparator);
+        reverseMappings, {lineNumber: textRange.endLine, columnNumber: textRange.endColumn}, comparator);
+
+    if (endIndex >= reverseMappings.length) {
+      return null;
+    }
 
-    const startMapping = mappings[startIndex];
-    const endMapping = mappings[endIndex];
+    const startMapping = mappings[reverseMappings[startIndex]];
+    const endMapping = mappings[reverseMappings[endIndex]];
     return new TextUtils.TextRange.TextRange(
         startMapping.lineNumber, startMapping.columnNumber, endMapping.lineNumber, endMapping.columnNumber);
   }
@@ -483,9 +526,9 @@ export namespace TextSourceMap {
 
   export class SourceInfo {
     content: string|null;
-    reverseMappings: SourceMapEntry[]|null;
+    reverseMappings: number[]|null;
 
-    constructor(content: string|null, reverseMappings: SourceMapEntry[]|null) {
+    constructor(content: string|null, reverseMappings: number[]|null) {
       this.content = content;
       this.reverseMappings = reverseMappings;
     }

package/front_end/core/sdk/TargetManager.ts

@@ -17,10 +17,11 @@ let targetManagerInstance: TargetManager|undefined;
 export class TargetManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
   private targetsInternal: Set<Target>;
   private readonly observers: Set<Observer>;
-  private modelListeners: Platform.MapUtilities.Multimap<string|symbol, {
+  private modelListeners: Platform.MapUtilities.Multimap<string|symbol|number, {
     modelClass: new(arg1: Target) => SDKModel,
     thisObject: (Object|undefined),
-    listener: (arg0: Common.EventTarget.EventTargetEvent) => void,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    listener: Common.EventTarget.EventListener<any, any>,
   }>;
   // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -124,18 +125,18 @@ export class TargetManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes
     }
   }
 
-  addModelListener(
-      modelClass: new(arg1: Target) => SDKModel, eventType: string|symbol,
-      listener: (arg0: Common.EventTarget.EventTargetEvent) => void, thisObject?: Object): void {
+  addModelListener<Events, T extends keyof Events>(
+      modelClass: new(arg1: Target) => SDKModel<Events>, eventType: T,
+      listener: Common.EventTarget.EventListener<Events, T>, thisObject?: Object): void {
     for (const model of this.models(modelClass)) {
       model.addEventListener(eventType, listener, thisObject);
     }
     this.modelListeners.set(eventType, {modelClass: modelClass, thisObject: thisObject, listener: listener});
   }
 
-  removeModelListener(
-      modelClass: new(arg1: Target) => SDKModel, eventType: string|symbol,
-      listener: (arg0: Common.EventTarget.EventTargetEvent) => void, thisObject?: Object): void {
+  removeModelListener<Events, T extends keyof Events>(
+      modelClass: new(arg1: Target) => SDKModel<Events>, eventType: T,
+      listener: Common.EventTarget.EventListener<Events, T>, thisObject?: Object): void {
     if (!this.modelListeners.has(eventType)) {
       return;
     }

package/front_end/core/sdk/TracingManager.ts

@@ -10,7 +10,7 @@ import {Capability} from './Target.js';
 import {SDKModel} from './SDKModel.js';
 import type {ObjectSnapshot} from './TracingModel.js';
 
-export class TracingManager extends SDKModel {
+export class TracingManager extends SDKModel<void> {
   private readonly tracingAgent: ProtocolProxyApi.TracingApi;
   private activeClient: TracingManagerClient|null;
   private eventBufferSize: number|null;

package/front_end/entrypoints/main/MainImpl.ts

@@ -555,7 +555,7 @@ export class MainImpl {
       if (Common.Settings.Settings.instance().moduleSetting(setting).get()) {
         promises.push(PerfUI.LiveHeapProfile.LiveHeapProfile.instance().run());
       } else {
-        const changeListener = async(event: Common.EventTarget.EventTargetEvent): Promise<void> => {
+        const changeListener = async(event: Common.EventTarget.EventTargetEvent<unknown>): Promise<void> => {
           if (!event.data) {
             return;
           }

package/front_end/entrypoints/node_main/NodeMain.ts

@@ -47,7 +47,7 @@ export class NodeMainImpl implements Common.Runnable.Runnable {
 
 Common.Runnable.registerEarlyInitializationRunnable(NodeMainImpl.instance);
 
-export class NodeChildTargetManager extends SDK.SDKModel.SDKModel implements ProtocolProxyApi.TargetDispatcher {
+export class NodeChildTargetManager extends SDK.SDKModel.SDKModel<void> implements ProtocolProxyApi.TargetDispatcher {
   private readonly targetManager: SDK.TargetManager.TargetManager;
   private readonly parentTarget: SDK.Target.Target;
   private readonly targetAgent: ProtocolProxyApi.TargetApi;

package/front_end/generated/InspectorBackendCommands.js

@@ -1568,7 +1568,8 @@ export function registerCommands(inspectorBackend) {
     SchemefulSameSiteLax: 'SchemefulSameSiteLax',
     SchemefulSameSiteUnspecifiedTreatedAsLax: 'SchemefulSameSiteUnspecifiedTreatedAsLax',
     SamePartyFromCrossPartyContext: 'SamePartyFromCrossPartyContext',
-    SamePartyConflictsWithOtherAttributes: 'SamePartyConflictsWithOtherAttributes'
+    SamePartyConflictsWithOtherAttributes: 'SamePartyConflictsWithOtherAttributes',
+    NameValuePairExceedsMaxSize: 'NameValuePairExceedsMaxSize'
   });
   inspectorBackend.registerEnum('Network.CookieBlockedReason', {
     SecureOnly: 'SecureOnly',
@@ -1583,7 +1584,8 @@ export function registerCommands(inspectorBackend) {
     SchemefulSameSiteStrict: 'SchemefulSameSiteStrict',
     SchemefulSameSiteLax: 'SchemefulSameSiteLax',
     SchemefulSameSiteUnspecifiedTreatedAsLax: 'SchemefulSameSiteUnspecifiedTreatedAsLax',
-    SamePartyFromCrossPartyContext: 'SamePartyFromCrossPartyContext'
+    SamePartyFromCrossPartyContext: 'SamePartyFromCrossPartyContext',
+    NameValuePairExceedsMaxSize: 'NameValuePairExceedsMaxSize'
   });
   inspectorBackend.registerEnum('Network.AuthChallengeSource', {Server: 'Server', Proxy: 'Proxy'});
   inspectorBackend.registerEnum(
@@ -1950,7 +1952,6 @@ export function registerCommands(inspectorBackend) {
     ChDeviceMemory: 'ch-device-memory',
     ChDownlink: 'ch-downlink',
     ChEct: 'ch-ect',
-    ChLang: 'ch-lang',
     ChPrefersColorScheme: 'ch-prefers-color-scheme',
     ChRtt: 'ch-rtt',
     ChUa: 'ch-ua',
@@ -2015,7 +2016,8 @@ export function registerCommands(inspectorBackend) {
     WrongVersion: 'WrongVersion',
     FeatureDisabled: 'FeatureDisabled',
     TokenDisabled: 'TokenDisabled',
-    FeatureDisabledForUser: 'FeatureDisabledForUser'
+    FeatureDisabledForUser: 'FeatureDisabledForUser',
+    UnknownTrial: 'UnknownTrial'
   });
   inspectorBackend.registerEnum('Page.OriginTrialStatus', {
     Enabled: 'Enabled',
@@ -2173,6 +2175,8 @@ export function registerCommands(inspectorBackend) {
     ContentWebBluetooth: 'ContentWebBluetooth',
     ContentWebUSB: 'ContentWebUSB',
     ContentMediaSession: 'ContentMediaSession',
+    ContentMediaSessionService: 'ContentMediaSessionService',
+    ContentMediaPlay: 'ContentMediaPlay',
     EmbedderPopupBlockerTabHelper: 'EmbedderPopupBlockerTabHelper',
     EmbedderSafeBrowsingTriggeredPopupBlocker: 'EmbedderSafeBrowsingTriggeredPopupBlocker',
     EmbedderSafeBrowsingThreatDetails: 'EmbedderSafeBrowsingThreatDetails',
@@ -2273,7 +2277,7 @@ export function registerCommands(inspectorBackend) {
   inspectorBackend.registerCommand('Page.getAppManifest', [], ['url', 'errors', 'data', 'parsed']);
   inspectorBackend.registerCommand('Page.getInstallabilityErrors', [], ['installabilityErrors']);
   inspectorBackend.registerCommand('Page.getManifestIcons', [], ['primaryIcon']);
-  inspectorBackend.registerCommand('Page.getAppId', [], ['appId']);
+  inspectorBackend.registerCommand('Page.getAppId', [], ['appId', 'recommendedId']);
   inspectorBackend.registerCommand('Page.getCookies', [], ['cookies']);
   inspectorBackend.registerCommand('Page.getFrameTree', [], ['frameTree']);
   inspectorBackend.registerCommand(

package/front_end/generated/protocol-mapping.d.ts

@@ -2162,6 +2162,7 @@ export namespace ProtocolMapping {
     'Page.getManifestIcons': {paramsType: []; returnType: Protocol.Page.GetManifestIconsResponse;};
     /**
      * Returns the unique (PWA) app id.
+     * Only returns values if the feature flag 'WebAppEnableManifestId' is enabled
      */
     'Page.getAppId': {paramsType: []; returnType: Protocol.Page.GetAppIdResponse;};
     /**

package/front_end/generated/protocol-proxy-api.d.ts

@@ -2420,6 +2420,7 @@ declare namespace ProtocolProxyApi {
 
     /**
      * Returns the unique (PWA) app id.
+     * Only returns values if the feature flag 'WebAppEnableManifestId' is enabled
      */
     invoke_getAppId(): Promise<Protocol.Page.GetAppIdResponse>;
 

package/front_end/generated/protocol.d.ts

@@ -600,6 +600,9 @@ declare namespace Protocol {
     }
   }
 
+  /**
+   * The domain is deprecated as AppCache is being removed (see crbug.com/582750).
+   */
   export namespace ApplicationCache {
 
     /**
@@ -7528,6 +7531,7 @@ declare namespace Protocol {
       SchemefulSameSiteUnspecifiedTreatedAsLax = 'SchemefulSameSiteUnspecifiedTreatedAsLax',
       SamePartyFromCrossPartyContext = 'SamePartyFromCrossPartyContext',
       SamePartyConflictsWithOtherAttributes = 'SamePartyConflictsWithOtherAttributes',
+      NameValuePairExceedsMaxSize = 'NameValuePairExceedsMaxSize',
     }
 
     /**
@@ -7547,6 +7551,7 @@ declare namespace Protocol {
       SchemefulSameSiteLax = 'SchemefulSameSiteLax',
       SchemefulSameSiteUnspecifiedTreatedAsLax = 'SchemefulSameSiteUnspecifiedTreatedAsLax',
       SamePartyFromCrossPartyContext = 'SamePartyFromCrossPartyContext',
+      NameValuePairExceedsMaxSize = 'NameValuePairExceedsMaxSize',
     }
 
     /**
@@ -9841,7 +9846,6 @@ declare namespace Protocol {
       ChDeviceMemory = 'ch-device-memory',
       ChDownlink = 'ch-downlink',
       ChEct = 'ch-ect',
-      ChLang = 'ch-lang',
       ChPrefersColorScheme = 'ch-prefers-color-scheme',
       ChRtt = 'ch-rtt',
       ChUa = 'ch-ua',
@@ -9929,6 +9933,7 @@ declare namespace Protocol {
       FeatureDisabled = 'FeatureDisabled',
       TokenDisabled = 'TokenDisabled',
       FeatureDisabledForUser = 'FeatureDisabledForUser',
+      UnknownTrial = 'UnknownTrial',
     }
 
     /**
@@ -10552,6 +10557,8 @@ declare namespace Protocol {
       ContentWebBluetooth = 'ContentWebBluetooth',
       ContentWebUSB = 'ContentWebUSB',
       ContentMediaSession = 'ContentMediaSession',
+      ContentMediaSessionService = 'ContentMediaSessionService',
+      ContentMediaPlay = 'ContentMediaPlay',
       EmbedderPopupBlockerTabHelper = 'EmbedderPopupBlockerTabHelper',
       EmbedderSafeBrowsingTriggeredPopupBlocker = 'EmbedderSafeBrowsingTriggeredPopupBlocker',
       EmbedderSafeBrowsingThreatDetails = 'EmbedderSafeBrowsingThreatDetails',
@@ -10737,9 +10744,13 @@ declare namespace Protocol {
 
     export interface GetAppIdResponse extends ProtocolResponseWithError {
       /**
-       * Only returns a value if the feature flag 'WebAppEnableManifestId' is enabled
+       * App id, either from manifest's id attribute or computed from start_url
        */
       appId?: string;
+      /**
+       * Recommendation for manifest's id attribute to match current id computed from start_url
+       */
+      recommendedId?: string;
     }
 
     export interface GetCookiesResponse extends ProtocolResponseWithError {

package/front_end/legacy_test_runner/application_test_runner/application_test_runner.js

@@ -8,7 +8,6 @@ import '../console_test_runner/console_test_runner.js';
 import '../../panels/sources/sources-legacy.js';
 import '../sources_test_runner/sources_test_runner.js';
 
-import './AppcacheTestRunner.js';
 import './CacheStorageTestRunner.js';
 import './IndexedDBTestRunner.js';
 import './ResourceTreeTestRunner.js';

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
  */