chrome-devtools-frontend 1.0.1675430 → 1.0.1678416

package/front_end/core/sdk/NetworkManager.ts

@@ -134,6 +134,13 @@ const FULL_FIDELITY_RESEND_TYPES = new Set([
   Common.ResourceType.resourceTypes.SourceMapStyleSheet,
 ]);
 
+/** Resource types eligible for resend but with reduced fidelity. */
+const PARTIAL_FIDELITY_RESEND_TYPES = new Set([
+  Common.ResourceType.resourceTypes.Document,
+  Common.ResourceType.resourceTypes.Prefetch,
+  Common.ResourceType.resourceTypes.Ping,
+]);
+
 const CONNECTION_TYPES = new Map([
   ['2g', Protocol.Network.ConnectionType.Cellular2g],
   ['3g', Protocol.Network.ConnectionType.Cellular3g],
@@ -211,11 +218,18 @@ export class NetworkManager extends SDKModel<EventTypes> {
     return requestToManagerMap.get(request) || null;
   }
 
-  static canResendRequest(request: NetworkRequest): boolean {
+  static canResendRequest(request: NetworkRequest, fullFidelity: boolean): boolean {
     if (!requestToManagerMap.get(request) || !request.backendRequestId() || request.isRedirect()) {
       return false;
     }
-    return FULL_FIDELITY_RESEND_TYPES.has(request.resourceType());
+    const type = request.resourceType();
+    if (FULL_FIDELITY_RESEND_TYPES.has(type)) {
+      return true;
+    }
+    if (!fullFidelity && PARTIAL_FIDELITY_RESEND_TYPES.has(type)) {
+      return true;
+    }
+    return false;
   }
 
   static replayRequest(request: NetworkRequest): void {

package/front_end/core/sdk/OverlayModel.ts

@@ -14,6 +14,16 @@ import {DeferredDOMNode, DOMModel, type DOMNode, DOMNodeEvents, Events as DOMMod
 import {OverlayPersistentHighlighter} from './OverlayPersistentHighlighter.js';
 import type {RemoteObject} from './RemoteObject.js';
 import {SDKModel} from './SDKModel.js';
+import {
+  apcaSettingDescriptor,
+  showAdHighlightsSettingDescriptor,
+  showDebugBordersSettingDescriptor,
+  showFPSCounterSettingDescriptor,
+  showLayoutShiftRegionsSettingDescriptor,
+  showMetricsRulersSettingDescriptor,
+  showPaintRectsSettingDescriptor,
+  showScrollBottleneckRectsSettingDescriptor,
+} from './SDKSettings.js';
 import {Capability, type Target} from './Target.js';
 import type {TargetManager} from './TargetManager.js';
 
@@ -126,12 +136,12 @@ export class OverlayModel extends SDKModel<EventTypes> implements ProtocolProxyA
     this.#defaultHighlighter = new DefaultHighlighter(this);
     this.#highlighter = this.#defaultHighlighter;
 
-    this.#showPaintRectsSetting = settings.moduleSetting<boolean>('show-paint-rects');
-    this.#showLayoutShiftRegionsSetting = settings.moduleSetting<boolean>('show-layout-shift-regions');
-    this.#showAdHighlightsSetting = settings.moduleSetting<boolean>('show-ad-highlights');
-    this.#showDebugBordersSetting = settings.moduleSetting<boolean>('show-debug-borders');
-    this.#showFPSCounterSetting = settings.moduleSetting<boolean>('show-fps-counter');
-    this.#showScrollBottleneckRectsSetting = settings.moduleSetting<boolean>('show-scroll-bottleneck-rects');
+    this.#showPaintRectsSetting = settings.resolve(showPaintRectsSettingDescriptor);
+    this.#showLayoutShiftRegionsSetting = settings.resolve(showLayoutShiftRegionsSettingDescriptor);
+    this.#showAdHighlightsSetting = settings.resolve(showAdHighlightsSettingDescriptor);
+    this.#showDebugBordersSetting = settings.resolve(showDebugBordersSettingDescriptor);
+    this.#showFPSCounterSetting = settings.resolve(showFPSCounterSettingDescriptor);
+    this.#showScrollBottleneckRectsSetting = settings.resolve(showScrollBottleneckRectsSettingDescriptor);
 
     if (!target.suspended()) {
       void this.overlayAgent.invoke_enable();
@@ -563,7 +573,7 @@ export class OverlayModel extends SDKModel<EventTypes> implements ProtocolProxyA
   private buildHighlightConfig(mode: string|undefined = 'all', showDetailedToolip: boolean|undefined = false):
       Protocol.Overlay.HighlightConfig {
     const settings = this.target().targetManager().settings;
-    const showRulers = settings.moduleSetting('show-metrics-rulers').get();
+    const showRulers = settings.resolve(showMetricsRulersSettingDescriptor).get();
     const highlightConfig: Protocol.Overlay.HighlightConfig = {
       showInfo: mode === 'all' || mode === 'container-outline',
       showRulers,
@@ -573,8 +583,8 @@ export class OverlayModel extends SDKModel<EventTypes> implements ProtocolProxyA
       gridHighlightConfig: {},
       flexContainerHighlightConfig: {},
       flexItemHighlightConfig: {},
-      contrastAlgorithm: settings.moduleSetting('apca').get() ? Protocol.Overlay.ContrastAlgorithm.Apca :
-                                                                Protocol.Overlay.ContrastAlgorithm.Aa,
+      contrastAlgorithm: settings.resolve(apcaSettingDescriptor).get() ? Protocol.Overlay.ContrastAlgorithm.Apca :
+                                                                         Protocol.Overlay.ContrastAlgorithm.Aa,
     };
 
     if (mode === 'all' || mode === 'content') {

package/front_end/core/sdk/OverlayPersistentHighlighter.ts

@@ -8,6 +8,12 @@ import * as Platform from '../platform/platform.js';
 
 import type {DOMModel} from './DOMModel.js';
 import {OverlayColorGenerator} from './OverlayColorGenerator.js';
+import {
+  extendGridLinesSettingDescriptor,
+  showGridAreasSettingDescriptor,
+  showGridLineLabelsSettingDescriptor,
+  showGridTrackSizesSettingDescriptor,
+} from './SDKSettings.js';
 
 export const enum HighlightType {
   FLEX = 'FLEX',
@@ -57,10 +63,10 @@ export class OverlayPersistentHighlighter {
 
     this.#persistentHighlightSetting =
         settings.createLocalSetting<PersistentHighlightSettingItem[]>('persistent-highlight-setting', []);
-    this.#showGridLineLabelsSetting = settings.moduleSetting<string>('show-grid-line-labels');
-    this.#extendGridLinesSetting = settings.moduleSetting<boolean>('extend-grid-lines');
-    this.#showGridAreasSetting = settings.moduleSetting<boolean>('show-grid-areas');
-    this.#showGridTrackSizesSetting = settings.moduleSetting<boolean>('show-grid-track-sizes');
+    this.#showGridLineLabelsSetting = settings.resolve(showGridLineLabelsSettingDescriptor);
+    this.#extendGridLinesSetting = settings.resolve(extendGridLinesSettingDescriptor);
+    this.#showGridAreasSetting = settings.resolve(showGridAreasSettingDescriptor);
+    this.#showGridTrackSizesSetting = settings.resolve(showGridTrackSizesSettingDescriptor);
 
     this.#showGridLineLabelsSetting.addChangeListener(this.onSettingChange, this);
     this.#extendGridLinesSetting.addChangeListener(this.onSettingChange, this);

package/front_end/core/sdk/ResourceTreeModel.ts

@@ -247,6 +247,18 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
     }
   }
 
+  navigatedWithinDocument(frameId: Protocol.Page.FrameId, url: string): void {
+    const frame = this.framesInternal.get(frameId);
+    if (!frame) {
+      return;
+    }
+    frame.navigatedWithinDocument(url as Platform.DevToolsPath.UrlString);
+    if (frame.isMainFrame()) {
+      this.target().setInspectedURL(frame.url);
+    }
+    this.dispatchEventToListeners(Events.FrameNavigatedWithinDocument, frame);
+  }
+
   frameDetached(frameId: Protocol.Page.FrameId, isSwap: boolean): void {
     // Do nothing unless cached resource tree is processed - it will overwrite everything.
     if (!this.#cachedResourcesProcessed) {
@@ -584,6 +596,7 @@ export enum Events {
   /* eslint-disable @typescript-eslint/naming-convention -- Used by web_tests. */
   FrameAdded = 'FrameAdded',
   FrameNavigated = 'FrameNavigated',
+  FrameNavigatedWithinDocument = 'FrameNavigatedWithinDocument',
   FrameDetached = 'FrameDetached',
   FrameResized = 'FrameResized',
   FrameWillNavigate = 'FrameWillNavigate',
@@ -607,6 +620,7 @@ export enum Events {
 export interface EventTypes {
   [Events.FrameAdded]: ResourceTreeFrame;
   [Events.FrameNavigated]: ResourceTreeFrame;
+  [Events.FrameNavigatedWithinDocument]: ResourceTreeFrame;
   [Events.FrameDetached]: {frame: ResourceTreeFrame, isSwap: boolean};
   [Events.FrameResized]: void;
   [Events.FrameWillNavigate]: ResourceTreeFrame;
@@ -736,6 +750,10 @@ export class ResourceTreeFrame {
     }
   }
 
+  navigatedWithinDocument(url: Platform.DevToolsPath.UrlString): void {
+    this.#url = url;
+  }
+
   resourceTreeModel(): ResourceTreeModel {
     return this.#model;
   }
@@ -1096,7 +1114,8 @@ export class PageDispatcher implements ProtocolProxyApi.PageDispatcher {
   frameStartedNavigating({}: Protocol.Page.FrameStartedNavigatingEvent): void {
   }
 
-  navigatedWithinDocument({}: Protocol.Page.NavigatedWithinDocumentEvent): void {
+  navigatedWithinDocument({frameId, url}: Protocol.Page.NavigatedWithinDocumentEvent): void {
+    this.#resourceTreeModel.navigatedWithinDocument(frameId, url);
   }
 
   frameResized(): void {

package/front_end/core/sdk/SDKSettings.ts

@@ -36,3 +36,120 @@ export const pauseOnCaughtExceptionSettingDescriptor: Common.Settings.SettingDes
   type: Common.Settings.SettingType.BOOLEAN,
   defaultValue: false,
 };
+
+export const pauseOnUncaughtExceptionSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'pause-on-uncaught-exception',
+  type: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: false,
+};
+
+export const javaScriptDisabledSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'java-script-disabled',
+  type: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: false,
+  storageType: Common.Settings.SettingStorageType.SESSION,
+};
+
+export const disableAsyncStackTracesSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'disable-async-stack-traces',
+  type: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: false,
+};
+
+export const breakpointsActiveSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'breakpoints-active',
+  type: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: true,
+  storageType: Common.Settings.SettingStorageType.SESSION,
+};
+
+export const showMetricsRulersSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'show-metrics-rulers',
+  type: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: false,
+  storageType: Common.Settings.SettingStorageType.SYNCED,
+};
+
+export const apcaSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'apca',
+  type: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: false,
+  storageType: Common.Settings.SettingStorageType.SYNCED,
+};
+
+export const showGridAreasSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'show-grid-areas',
+  type: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: false,
+  storageType: Common.Settings.SettingStorageType.SYNCED,
+};
+
+export const showGridTrackSizesSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'show-grid-track-sizes',
+  type: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: false,
+  storageType: Common.Settings.SettingStorageType.SYNCED,
+};
+
+export const extendGridLinesSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'extend-grid-lines',
+  type: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: false,
+  storageType: Common.Settings.SettingStorageType.SYNCED,
+};
+
+export const showGridLineLabelsSettingDescriptor: Common.Settings.SettingDescriptor<string> = {
+  name: 'show-grid-line-labels',
+  type: Common.Settings.SettingType.ENUM,
+  defaultValue: 'lineNumbers',
+  storageType: Common.Settings.SettingStorageType.SYNCED,
+};
+
+export const showPaintRectsSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'show-paint-rects',
+  type: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: false,
+  storageType: Common.Settings.SettingStorageType.SESSION,
+};
+
+export const showLayoutShiftRegionsSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'show-layout-shift-regions',
+  type: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: false,
+  storageType: Common.Settings.SettingStorageType.SESSION,
+};
+
+export const showAdHighlightsSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'show-ad-highlights',
+  type: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: false,
+  storageType: Common.Settings.SettingStorageType.SESSION,
+};
+
+export const showDebugBordersSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'show-debug-borders',
+  type: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: false,
+  storageType: Common.Settings.SettingStorageType.SESSION,
+};
+
+export const showFPSCounterSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'show-fps-counter',
+  type: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: false,
+  storageType: Common.Settings.SettingStorageType.SESSION,
+};
+
+export const showScrollBottleneckRectsSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'show-scroll-bottleneck-rects',
+  type: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: false,
+  storageType: Common.Settings.SettingStorageType.SESSION,
+};
+
+export const emulatePageFocusSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'emulate-page-focus',
+  type: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: false,
+  storageType: Common.Settings.SettingStorageType.LOCAL,
+};

package/front_end/core/sdk/Script.ts

@@ -36,7 +36,6 @@ import * as TextUtils from '../text_utils/text_utils.js';
 import {
   COND_BREAKPOINT_SOURCE_URL,
   type DebuggerModel,
-  Events,
   Location,
   LOGPOINT_SOURCE_URL,
 } from './DebuggerModel.js';
@@ -80,7 +79,6 @@ export class Script implements TextUtils.ContentProvider.ContentProvider, FrameA
   executionContextId: number;
   hash: string;
   readonly #isContentScript: boolean;
-  readonly #isLiveEdit: boolean;
   sourceMapURL?: string;
   debugSymbols: Protocol.Debugger.DebugSymbols|null;
   hasSourceURL: boolean;
@@ -92,13 +90,13 @@ export class Script implements TextUtils.ContentProvider.ContentProvider, FrameA
   readonly #embedderName: Platform.DevToolsPath.UrlString|null;
   readonly isModule: boolean|null;
   readonly buildId: string|null;
-  constructor(
-      debuggerModel: DebuggerModel, scriptId: Protocol.Runtime.ScriptId, sourceURL: Platform.DevToolsPath.UrlString,
-      startLine: number, startColumn: number, endLine: number, endColumn: number, executionContextId: number,
-      hash: string, isContentScript: boolean, isLiveEdit: boolean, sourceMapURL: string|undefined,
-      hasSourceURL: boolean, length: number, isModule: boolean|null, originStackTrace: Protocol.Runtime.StackTrace|null,
-      codeOffset: number|null, scriptLanguage: string|null, debugSymbols: Protocol.Debugger.DebugSymbols|null,
-      embedderName: Platform.DevToolsPath.UrlString|null, buildId: string|null) {
+  constructor(debuggerModel: DebuggerModel, scriptId: Protocol.Runtime.ScriptId,
+              sourceURL: Platform.DevToolsPath.UrlString, startLine: number, startColumn: number, endLine: number,
+              endColumn: number, executionContextId: number, hash: string, isContentScript: boolean,
+              sourceMapURL: string|undefined, hasSourceURL: boolean, length: number, isModule: boolean|null,
+              originStackTrace: Protocol.Runtime.StackTrace|null, codeOffset: number|null, scriptLanguage: string|null,
+              debugSymbols: Protocol.Debugger.DebugSymbols|null, embedderName: Platform.DevToolsPath.UrlString|null,
+              buildId: string|null) {
     this.debuggerModel = debuggerModel;
     this.scriptId = scriptId;
     this.sourceURL = sourceURL;
@@ -112,7 +110,6 @@ export class Script implements TextUtils.ContentProvider.ContentProvider, FrameA
     this.executionContextId = executionContextId;
     this.hash = hash;
     this.#isContentScript = isContentScript;
-    this.#isLiveEdit = isLiveEdit;
     this.sourceMapURL = sourceMapURL;
     this.debugSymbols = debugSymbols;
     this.hasSourceURL = hasSourceURL;
@@ -175,10 +172,6 @@ export class Script implements TextUtils.ContentProvider.ContentProvider, FrameA
     return this.debuggerModel.runtimeModel().executionContext(this.executionContextId);
   }
 
-  isLiveEdit(): boolean {
-    return this.#isLiveEdit;
-  }
-
   contentURL(): Platform.DevToolsPath.UrlString {
     return this.sourceURL;
   }
@@ -261,8 +254,8 @@ export class Script implements TextUtils.ContentProvider.ContentProvider, FrameA
   requestContentData(): Promise<TextUtils.ContentData.ContentDataOrError> {
     if (!this.#contentPromise) {
       const fileSizeToCache = 65535;  // We won't bother cacheing files under 64K
-      if (this.hash && !this.#isLiveEdit && this.contentLength > fileSizeToCache) {
-        // For large files that aren't live edits and have a hash, we keep a content-addressed cache
+      if (this.hash && this.contentLength > fileSizeToCache) {
+        // For large files that have a hash, we keep a content-addressed cache
         // so we don't need to load multiple copies or disassemble wasm modules multiple times.
         if (!scriptCacheInstance) {
           // Initialize script cache singleton. Add a finalizer for removing keys from the map.
@@ -331,43 +324,6 @@ export class Script implements TextUtils.ContentProvider.ContentProvider, FrameA
     return TextUtils.TextUtils.performSearchInSearchMatches(matches.result || [], query, caseSensitive, isRegex);
   }
 
-  private appendSourceURLCommentIfNeeded(source: string): string {
-    if (!this.hasSourceURL) {
-      return source;
-    }
-    return source + '\n //# sourceURL=' + this.sourceURL;
-  }
-
-  async editSource(newSource: string): Promise<{
-    changed: boolean,
-    status: Protocol.Debugger.SetScriptSourceResponseStatus,
-    exceptionDetails?: Protocol.Runtime.ExceptionDetails,
-  }> {
-    newSource = Script.trimSourceURLComment(newSource);
-    // We append correct #sourceURL to script for consistency only. It's not actually needed for things to work correctly.
-    newSource = this.appendSourceURLCommentIfNeeded(newSource);
-
-    const oldSource = TextUtils.ContentData.ContentData.textOr(await this.requestContentData(), null);
-    if (oldSource === newSource) {
-      return {changed: false, status: Protocol.Debugger.SetScriptSourceResponseStatus.Ok};
-    }
-    const response = await this.debuggerModel.target().debuggerAgent().invoke_setScriptSource(
-        {scriptId: this.scriptId, scriptSource: newSource, allowTopFrameEditing: true});
-    if (response.getError()) {
-      // Something went seriously wrong, like the V8 inspector no longer knowing about this script without
-      // shutting down the Debugger agent etc.
-      throw new Error(`Script#editSource failed for script with id ${this.scriptId}: ${response.getError()}`);
-    }
-
-    if (!response.getError() && response.status === Protocol.Debugger.SetScriptSourceResponseStatus.Ok) {
-      this.#contentPromise =
-          Promise.resolve(new TextUtils.ContentData.ContentData(newSource, /* isBase64 */ false, 'text/javascript'));
-    }
-
-    this.debuggerModel.dispatchEventToListeners(Events.ScriptSourceWasEdited, {script: this, status: response.status});
-    return {changed: true, status: response.status, exceptionDetails: response.exceptionDetails};
-  }
-
   rawLocation(lineNumber: number, columnNumber: number): Location|null {
     if (this.containsLocation(lineNumber, columnNumber)) {
       return new Location(this.debuggerModel, this.scriptId, lineNumber, columnNumber);