chrome-devtools-frontend 1.0.1666631 → 1.0.1667564

package/front_end/entrypoints/main/MainImpl.ts

@@ -522,7 +522,7 @@ export class MainImpl {
 
   async #showAppUI(appProvider: Object): Promise<void> {
     MainImpl.time('Main._showAppUI');
-    const app = (appProvider as UI.AppProvider.AppProvider).createApp();
+    const app = (appProvider as UI.AppProvider.AppProvider).createApp(this.#universe);
     // It is important to kick controller lifetime after apps are instantiated.
     UI.DockController.DockController.instance().initialize();
     ThemeSupport.ThemeSupport.instance().fetchColorsAndApplyHostTheme();
@@ -856,7 +856,10 @@ export class MainMenuItem implements UI.Toolbar.Provider {
     const button = this.#item.element;
 
     function setDockSide(side: UI.DockController.DockState): void {
-      void dockController.once(UI.DockController.Events.AFTER_DOCK_SIDE_CHANGED).then(() => button.focus());
+      if (dockController.dockSide() !== UI.DockController.DockState.UNDOCKED &&
+          side !== UI.DockController.DockState.UNDOCKED) {
+        void dockController.once(UI.DockController.Events.AFTER_DOCK_SIDE_CHANGED).then(() => button.focus());
+      }
       dockController.setDockSide(side);
       contextMenu.discard();
     }

package/front_end/entrypoints/main/SimpleApp.ts

@@ -2,11 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import type * as Foundation from '../../foundation/foundation.js';
 import * as UI from '../../ui/legacy/legacy.js';
 
 export class SimpleApp implements UI.App.App {
+  readonly #universe: Foundation.Universe.Universe;
+  constructor(universe: Foundation.Universe.Universe) {
+    this.#universe = universe;
+  }
+
   presentUI(document: Document): void {
-    const rootView = new UI.RootView.RootView();
+    const rootView = new UI.RootView.RootView(this.#universe);
     UI.InspectorView.InspectorView.instance().show(rootView.element);
     rootView.attachToDocument(document);
     rootView.focus();
@@ -14,7 +20,7 @@ export class SimpleApp implements UI.App.App {
 }
 
 export class SimpleAppProvider implements UI.AppProvider.AppProvider {
-  createApp(): UI.App.App {
-    return new SimpleApp();
+  createApp(universe: Foundation.Universe.Universe): UI.App.App {
+    return new SimpleApp(universe);
   }
 }

package/front_end/foundation/Universe.ts

@@ -137,6 +137,7 @@ export class Universe {
 
     this.fileSystemWorkspaceBinding =
         new Persistence.FileSystemWorkspaceBinding.FileSystemWorkspaceBinding(isolatedFileSystemManager, workspace);
+    context.set(Persistence.FileSystemWorkspaceBinding.FileSystemWorkspaceBinding, this.fileSystemWorkspaceBinding);
 
     const ignoreListManager = new Workspace.IgnoreListManager.IgnoreListManager(settings, targetManager);
     context.set(Workspace.IgnoreListManager.IgnoreListManager, ignoreListManager);
@@ -216,6 +217,7 @@ export class Universe {
     context.set(AiAssistance.AiHistoryStorage.AiHistoryStorage, aiHistoryStorage);
 
     this.autofillManager = new AutofillManager.AutofillManager.AutofillManager(targetManager, frameManager);
+    context.set(AutofillManager.AutofillManager.AutofillManager, this.autofillManager);
   }
 
   get automaticFileSystemManager(): Persistence.AutomaticFileSystemManager.AutomaticFileSystemManager {
@@ -347,4 +349,8 @@ export class Universe {
   get workspaceDiff(): WorkspaceDiff.WorkspaceDiff.WorkspaceDiffImpl {
     return this.context.get(WorkspaceDiff.WorkspaceDiff.WorkspaceDiffImpl);
   }
+
+  get<T>(ctor: Root.DevToolsContext.ConstructorT<T>): T {
+    return this.context.get(ctor);
+  }
 }

package/front_end/models/ai_assistance/contexts/PerformanceTraceContext.ts

@@ -7,6 +7,7 @@ import type {UrlString} from '../../../core/platform/DevToolsPath.js';
 import type * as Platform from '../../../core/platform/platform.js';
 import * as SDK from '../../../core/sdk/sdk.js';
 import * as Tracing from '../../../services/tracing/tracing.js';
+import * as Bindings from '../../bindings/bindings.js';
 import * as SourceMapScopes from '../../source_map_scopes/source_map_scopes.js';
 import * as Trace from '../../trace/trace.js';
 import {
@@ -28,52 +29,63 @@ import {AgentFocus} from '../performance/AIContext.js';
  * the context data for the LLM prompt and user-facing accordion disclosures.
  */
 export class PerformanceTraceContext extends ConversationContext<AgentFocus> {
-  static fromParsedTrace(parsedTrace: Trace.TraceModel.ParsedTrace,
-                         targetManager: SDK.TargetManager.TargetManager = SDK.TargetManager.TargetManager.instance(),
-                         freshRecordingTracker:
-                             Tracing.FreshRecording.Tracker = Tracing.FreshRecording.Tracker.instance()):
-      PerformanceTraceContext {
+  static fromParsedTrace(
+      parsedTrace: Trace.TraceModel.ParsedTrace,
+      targetManager: SDK.TargetManager.TargetManager = SDK.TargetManager.TargetManager.instance(),
+      freshRecordingTracker: Tracing.FreshRecording.Tracker = Tracing.FreshRecording.Tracker.instance(),
+      debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding =
+          Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance()): PerformanceTraceContext {
     return new PerformanceTraceContext(
         AgentFocus.fromParsedTrace(parsedTrace),
         targetManager,
         freshRecordingTracker,
+        debuggerWorkspaceBinding,
     );
   }
 
   static fromInsight(parsedTrace: Trace.TraceModel.ParsedTrace, insight: Trace.Insights.Types.InsightModel,
                      targetManager: SDK.TargetManager.TargetManager = SDK.TargetManager.TargetManager.instance(),
-                     freshRecordingTracker: Tracing.FreshRecording.Tracker = Tracing.FreshRecording.Tracker.instance()):
+                     freshRecordingTracker: Tracing.FreshRecording.Tracker = Tracing.FreshRecording.Tracker.instance(),
+                     debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding =
+                         Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance()):
       PerformanceTraceContext {
     return new PerformanceTraceContext(
         AgentFocus.fromInsight(parsedTrace, insight),
         targetManager,
         freshRecordingTracker,
+        debuggerWorkspaceBinding,
     );
   }
 
   static fromCallTree(callTree: AICallTree,
                       targetManager: SDK.TargetManager.TargetManager = SDK.TargetManager.TargetManager.instance(),
-                      freshRecordingTracker:
-                          Tracing.FreshRecording.Tracker = Tracing.FreshRecording.Tracker.instance()):
+                      freshRecordingTracker: Tracing.FreshRecording.Tracker = Tracing.FreshRecording.Tracker.instance(),
+                      debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding =
+                          Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance()):
       PerformanceTraceContext {
     return new PerformanceTraceContext(
         AgentFocus.fromCallTree(callTree),
         targetManager,
         freshRecordingTracker,
+        debuggerWorkspaceBinding,
     );
   }
 
   readonly #focus: AgentFocus;
   readonly #targetManager: SDK.TargetManager.TargetManager;
   readonly #freshRecordingTracker: Tracing.FreshRecording.Tracker;
+  readonly #debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding;
 
   constructor(focus: AgentFocus,
               targetManager: SDK.TargetManager.TargetManager = SDK.TargetManager.TargetManager.instance(),
-              freshRecordingTracker: Tracing.FreshRecording.Tracker = Tracing.FreshRecording.Tracker.instance()) {
+              freshRecordingTracker: Tracing.FreshRecording.Tracker = Tracing.FreshRecording.Tracker.instance(),
+              debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding =
+                  Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance()) {
     super();
     this.#focus = focus;
     this.#targetManager = targetManager;
     this.#freshRecordingTracker = freshRecordingTracker;
+    this.#debuggerWorkspaceBinding = debuggerWorkspaceBinding;
   }
 
   /**
@@ -95,7 +107,8 @@ export class PerformanceTraceContext extends ConversationContext<AgentFocus> {
         return null;
       }
       return await SourceMapScopes.FunctionCodeResolver.getFunctionCodeFromLocation(
-          target, url, line, column, {contextLength: 200, contextLineLength: 5, appendProfileData: true});
+          target, url, line, column, this.#debuggerWorkspaceBinding,
+          {contextLength: 200, contextLineLength: 5, appendProfileData: true});
     };
     return formatter;
   }

package/front_end/models/computed_style/ComputedStyleModel.ts

@@ -15,7 +15,7 @@ export class ComputedStyleModel extends Common.ObjectWrapper.ObjectWrapper<Event
   #node: SDK.DOMModel.DOMNode|null = null;
   #cssModel: SDK.CSSModel.CSSModel|null = null;
   private eventListeners: Common.EventTarget.EventDescriptor[] = [];
-  private frameResizedTimer?: number;
+  private frameResizedTimer?: ReturnType<typeof setTimeout>;
   private computedStylePromise?: Promise<ComputedStyle|null>;
 
   constructor(node?: SDK.DOMModel.DOMNode|null) {
@@ -49,10 +49,9 @@ export class ComputedStyleModel extends Common.ObjectWrapper.ObjectWrapper<Event
     this.node = null;
     this.#cssModel = null;
     this.computedStylePromise = undefined;
-    if (this.frameResizedTimer) {
+
       clearTimeout(this.frameResizedTimer);
       this.frameResizedTimer = undefined;
-    }
   }
 
   private updateModel(cssModel: SDK.CSSModel.CSSModel|null): void {
@@ -111,14 +110,12 @@ export class ComputedStyleModel extends Common.ObjectWrapper.ObjectWrapper<Event
   private onFrameResized(): void {
     function refreshContents(this: ComputedStyleModel): void {
       this.onCSSModelChanged(null);
-      delete this.frameResizedTimer;
+      this.frameResizedTimer = undefined;
     }
 
-    if (this.frameResizedTimer) {
       clearTimeout(this.frameResizedTimer);
-    }
 
-    this.frameResizedTimer = window.setTimeout(refreshContents.bind(this), 100);
+      this.frameResizedTimer = globalThis.setTimeout(refreshContents.bind(this), 100);
   }
 
   private elementNode(): SDK.DOMModel.DOMNode|null {

package/front_end/models/crux-manager/CrUXManager.ts

@@ -311,6 +311,10 @@ export class CrUXManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     this.dispatchEventToListeners(Events.FIELD_DATA_CHANGED, this.#pageResult);
   }
 
+  setMainDocumentURL(url: string): void {
+    this.#mainDocumentUrl = url;
+  }
+
   #normalizeUrl(inputUrl: string): URL {
     const normalizedUrl = new URL(inputUrl);
     normalizedUrl.hash = '';

package/front_end/models/extensions/ExtensionAPI.ts

@@ -1554,7 +1554,7 @@ self.injectedExtensionAPI = function(
   }
 
   let keyboardEventRequestQueue: KeyboardEventInit&Array<{eventType: string}> = [];
-  let forwardTimer: number|null = null;
+  let forwardTimer: ReturnType<typeof setTimeout>|undefined;
   function forwardKeyboardEvent(event: KeyboardEvent): void {
     // Check if the event should be forwarded.
     // This is a workaround for crbug.com/923338.
@@ -1601,12 +1601,12 @@ self.injectedExtensionAPI = function(
     };
     keyboardEventRequestQueue.push(requestPayload);
     if (!forwardTimer) {
-      forwardTimer = window.setTimeout(forwardEventQueue, 0);
+      forwardTimer = globalThis.setTimeout(forwardEventQueue, 0);
     }
   }
 
   function forwardEventQueue(): void {
-    forwardTimer = null;
+    forwardTimer = undefined;
     extensionServer.sendRequest(
         {command: PrivateAPI.Commands.ForwardKeyboardEvent, entries: keyboardEventRequestQueue});
     keyboardEventRequestQueue = [];

package/front_end/models/heap_snapshot/HeapSnapshotProxy.ts

@@ -17,7 +17,7 @@ export class HeapSnapshotWorkerProxy extends Common.ObjectWrapper.ObjectWrapper<
   callbacks = new Map<number, (...args: any[]) => void>();
   readonly previousCallbacks = new Set<number>();
   readonly worker: PlatformApi.HostRuntime.Worker;
-  interval?: number;
+  interval?: ReturnType<typeof setInterval>;
   readonly workerUrl?: string;
 
   constructor(
@@ -129,7 +129,7 @@ export class HeapSnapshotWorkerProxy extends Common.ObjectWrapper.ObjectWrapper<
       return;
     }
     this.checkLongRunningCalls();
-    this.interval = window.setInterval(this.checkLongRunningCalls.bind(this), 300);
+    this.interval = globalThis.setInterval(this.checkLongRunningCalls.bind(this), 300);
   }
 
   checkLongRunningCalls(): void {

package/front_end/models/live-metrics/LiveMetrics.ts

@@ -10,6 +10,7 @@ import * as Root from '../../core/root/root.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import type * as Protocol from '../../generated/protocol.js';
 import * as EmulationModel from '../../models/emulation/emulation.js';
+import * as CrUXManager from '../crux-manager/crux-manager.js';
 
 import * as Spec from './web-vitals-injected/spec/spec.js';
 
@@ -55,6 +56,7 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
   #interactions: InteractionMap = new Map();
   #interactionsByGroupId = new Map<Spec.InteractionEntryGroupId, Interaction[]>();
   #layoutShifts: LayoutShift[] = [];
+  #navigationType?: Spec.NavigationType;
   #lastEmulationChangeTime?: number;
   #mutex = new Common.Mutex.Mutex();
   readonly #targetManager: SDK.TargetManager.TargetManager;
@@ -69,6 +71,9 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     this.#targetManager.addModelListener(SDK.ResourceTreeModel.ResourceTreeModel,
                                          SDK.ResourceTreeModel.Events.PrimaryPageChanged, this.#onPrimaryPageChanged,
                                          this);
+    Common.Settings.Settings.instance()
+        .moduleSetting('timeline-enable-soft-navigations')
+        .addChangeListener(this.#onSettingChanged, this);
   }
 
   #onPrimaryPageChanged(
@@ -106,6 +111,10 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     return Root.DevToolsContext.globalInstance().get(LiveMetrics);
   }
 
+  get navigationType(): Spec.NavigationType|undefined {
+    return this.#navigationType;
+  }
+
   get lcpValue(): LcpValue|undefined {
     return this.#lcpValue;
   }
@@ -243,6 +252,7 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
       inp: this.#inpValue,
       interactions: this.#interactions,
       layoutShifts: this.#layoutShifts,
+      navigationType: this.#navigationType,
     });
   }
 
@@ -252,6 +262,7 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     this.#inpValue = status.inp;
     this.#interactions = status.interactions;
     this.#layoutShifts = status.layoutShifts;
+    this.#navigationType = status.navigationType;
     this.#sendStatusUpdate();
   }
 
@@ -399,6 +410,11 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
       }
       case 'reset': {
         this.#clearMetrics();
+        this.#navigationType = webVitalsEvent.navigationType;
+        if (webVitalsEvent.url) {
+          CrUXManager.CrUXManager.instance().setMainDocumentURL(webVitalsEvent.url);
+          void CrUXManager.CrUXManager.instance().refresh();
+        }
         break;
       }
     }
@@ -413,6 +429,7 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     this.#interactions.clear();
     this.#interactionsByGroupId.clear();
     this.#layoutShifts = [];
+    this.#navigationType = undefined;
   }
 
   #isPrimaryFrameExecutionContext(executionContextId: Protocol.Runtime.ExecutionContextId): boolean {
@@ -509,6 +526,46 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     this.#target = undefined;
   }
 
+  async #injectScript(): Promise<void> {
+    // Extra check in case the target was removed while we were initializing.
+    // It's possible to be halfway-through enabling when the target is removed
+    // eg try loading 'devtools://devtools/bundled/devtools_app.html?ws=127.0.0.1:99/blah'
+    if (!this.#target) {
+      return;
+    }
+
+    // If DevTools is closed and reopened, the live metrics context from the previous
+    // session will persist. We should ensure any old live metrics contexts are killed
+    // before starting a new one.
+    await this.#killAllLiveMetricContexts();
+
+    // Remove any old instances of the script
+    if (this.#scriptIdentifier) {
+      await this.#target.pageAgent().invoke_removeScriptToEvaluateOnNewDocument({
+        identifier: this.#scriptIdentifier,
+      });
+    }
+
+    const softNavsSettingValue =
+        Common.Settings.Settings.instance().moduleSetting('timeline-enable-soft-navigations').get();
+    const source = `window.devToolsReportSoftNavs = ${softNavsSettingValue};\n` + await InjectedScript.get();
+
+    // Inject the script
+    const {identifier} = await this.#target.pageAgent().invoke_addScriptToEvaluateOnNewDocument({
+      source,
+      worldName: LIVE_METRICS_WORLD_NAME,
+      runImmediately: true,
+    });
+    this.#scriptIdentifier = identifier;
+  }
+
+  async #onSettingChanged(): Promise<void> {
+    if (!this.#target || !this.#enabled) {
+      return;
+    }
+    await this.#injectScript();
+  }
+
   async enable(): Promise<void> {
     if (this.#enabled) {
       return;
@@ -563,25 +620,7 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
       executionContextName: LIVE_METRICS_WORLD_NAME,
     });
 
-    // If DevTools is closed and reopened, the live metrics context from the previous
-    // session will persist. We should ensure any old live metrics contexts are killed
-    // before starting a new one.
-    await this.#killAllLiveMetricContexts();
-
-    const source = await InjectedScript.get();
-
-    // Extra check in case the target was removed while we were initializing.
-    // It's possible to be halfway-through enabling when the target is removed
-    // eg try loading 'devtools://devtools/bundled/devtools_app.html?ws=127.0.0.1:99/blah'
-    if (!this.#target) {
-      return;
-    }
-    const {identifier} = await this.#target?.pageAgent().invoke_addScriptToEvaluateOnNewDocument({
-      source,
-      worldName: LIVE_METRICS_WORLD_NAME,
-      runImmediately: true,
-    });
-    this.#scriptIdentifier = identifier;
+    await this.#injectScript();
 
     this.#deviceModeModel?.addEventListener(
         EmulationModel.DeviceModeModel.Events.UPDATED, this.#onEmulationChanged, this);
@@ -687,6 +726,7 @@ export interface StatusEvent {
   inp?: InpValue;
   interactions: InteractionMap;
   layoutShifts: LayoutShift[];
+  navigationType?: Spec.NavigationType;
 }
 
 interface EventTypes {

package/front_end/models/live-metrics/web-vitals-injected/README.md

@@ -1,5 +1,5 @@
 # Using the `web-vitals` library
 
-[`web-vitals`](https://github.com/GoogleChrome/web-vitals-extension) is a Google-maintained library that measures CWV metrics using their canonical definition. We use it to ensure we are using consistent implementations for measuring CWV across Google. It can also measure performance metrics of the current page *after* the they happen (See [`PerformanceObserver` buffered setting](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceObserver/observe#buffered)). See [go/cpq:rpp-metric-observations](http://go/cpq:rpp-metric-observations) for more information.
+[`web-vitals`](https://github.com/GoogleChrome/web-vitals) is a Google-maintained library that measures CWV metrics using their canonical definition. We use it to ensure we are using consistent implementations for measuring CWV across Google. It can also measure performance metrics of the current page *after* the they happen (See [`PerformanceObserver` buffered setting](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceObserver/observe#buffered)). See [go/cpq:rpp-metric-observations](http://go/cpq:rpp-metric-observations) for more information.
 
 The web-vitals library needs to be run in the target page (although it can be used in an isolated execution context). We therefore need to create a JS binary that can be injected via `Page.evaluate`/`Page.addScriptToEvaluateOnNewDocument`. See `BUILD.gn` and `rollup.config.mjs` for how we bundle the JS binary.

package/front_end/models/live-metrics/web-vitals-injected/spec/spec.ts

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import type {INPAttribution} from '../../../../third_party/web-vitals/web-vitals.js';
+import type {INPAttribution, Metric} from '../../../../third_party/web-vitals/web-vitals.js';
 import type * as Trace from '../../../trace/trace.js';
 
 export const EVENT_BINDING_NAME = '__chromium_devtools_metrics_reporter';
@@ -99,6 +99,7 @@ export interface InteractionEntryEvent {
   eventName: string;
   entryGroupId: InteractionEntryGroupId;
   startTime: number;
+  navigationId: number;
   nextPaintTime?: number;
   duration: Trace.Types.Timing.Milli;
   subparts: InpSubparts;
@@ -106,6 +107,8 @@ export interface InteractionEntryEvent {
   longAnimationFrameEntries: PerformanceLongAnimationFrameTimingJSON[];
 }
 
+export type NavigationType = Metric['navigationType'];
+
 export interface LayoutShiftEvent {
   name: 'LayoutShift';
   score: number;
@@ -115,6 +118,8 @@ export interface LayoutShiftEvent {
 
 export interface ResetEvent {
   name: 'reset';
+  url?: string;
+  navigationType?: NavigationType;
 }
 
 export type WebVitalsEvent =

package/front_end/models/live-metrics/web-vitals-injected/web-vitals-injected.ts

@@ -15,6 +15,7 @@ declare const window: Window&{
   getNodeForIndex: (index: number) => Node | undefined,
   [Spec.INTERNAL_KILL_SWITCH]: () => void,
   [Spec.EVENT_BINDING_NAME]: (payload: string) => void,
+  devToolsReportSoftNavs?: boolean,
 };
 
 const eventListenerCleanupController = new AbortController();
@@ -174,10 +175,15 @@ function initialize(): void {
   // callback before any others.
   WebVitals.onBFCacheRestore(() => {
     startedHidden = false;
-    sendEventToDevTools({name: 'reset'});
+    sendEventToDevTools({name: 'reset', navigationType: 'back-forward-cache'});
   });
 
+  let lastLcpNavigationId: number|undefined;
   onLCP(metric => {
+    if (lastLcpNavigationId && metric.navigationId && metric.navigationId !== lastLcpNavigationId) {
+      sendEventToDevTools({name: 'reset', url: window.location.href, navigationType: metric.navigationType});
+    }
+    lastLcpNavigationId = metric.navigationId;
     const event: Spec.LcpChangeEvent = {
       name: 'LCP',
       value: metric.value as Trace.Types.Timing.Milli,
@@ -195,7 +201,7 @@ function initialize(): void {
       event.nodeIndex = establishNodeIndex(element);
     }
     sendEventToDevTools(event);
-  }, {reportAllChanges: true});
+  }, {reportAllChanges: true, reportSoftNavs: window.devToolsReportSoftNavs});
 
   onCLS(metric => {
     const event: Spec.ClsChangeEvent = {
@@ -204,7 +210,7 @@ function initialize(): void {
       clusterShiftIds: metric.entries.map(Spec.getUniqueLayoutShiftId),
     };
     sendEventToDevTools(event);
-  }, {reportAllChanges: true});
+  }, {reportAllChanges: true, reportSoftNavs: window.devToolsReportSoftNavs});
 
   function onEachInteraction(interaction: WebVitals.INPMetricWithAttribution): void {
     // Multiple `InteractionEntry` events can be emitted for the same `uniqueInteractionId`
@@ -219,6 +225,7 @@ function initialize(): void {
         presentationDelay: interaction.attribution.presentationDelay as Trace.Types.Timing.Milli,
       },
       startTime: interaction.entries[0].startTime,
+      navigationId: interaction.navigationId,
       entryGroupId: interaction.entries[0].interactionId as Spec.InteractionEntryGroupId,
       nextPaintTime: interaction.attribution.nextPaintTime,
       interactionType: interaction.attribution.interactionType,
@@ -252,6 +259,7 @@ function initialize(): void {
     reportAllChanges: true,
     durationThreshold: 0,
     includeProcessedEventEntries: false,
+    reportSoftNavs: window.devToolsReportSoftNavs,
     onEachInteraction,
     generateTarget(el) {
       if (el) {

package/front_end/models/logs/LogManager.ts

@@ -84,7 +84,7 @@ export class LogManager implements SDK.TargetManager.SDKModelObserver<SDK.LogMod
       if (this.#targetManager.targetById(workerId)) {
         return;
       }
-      window.setTimeout(() => {
+      globalThis.setTimeout(() => {
         if (!this.#targetManager.targetById(workerId)) {
           consoleModel?.addMessage(consoleMessage);
         }

package/front_end/models/persistence/FileSystemWorkspaceBinding.ts

@@ -318,7 +318,7 @@ export class FileSystem extends Workspace.Workspace.ProjectStore {
         this.addFile(filePaths[i]);
       }
       if (to < filePaths.length) {
-        window.setTimeout(reportFileChunk.bind(this, to), 100);
+        globalThis.setTimeout(reportFileChunk.bind(this, to), 100);
       } else if (this.type() === 'filesystem') {
         Host.userMetrics.workspacesPopulated(performance.now() - startTime);
       }

package/front_end/models/source_map_scopes/FunctionCodeResolver.ts

@@ -216,9 +216,8 @@ function createFunctionCode(
  */
 export async function getFunctionCodeFromLocation(
     target: SDK.Target.Target, url: Platform.DevToolsPath.UrlString, line: number, column: number,
-    options?: CreateFunctionCodeOptions,
-    debuggerWorkspaceBinding =
-        Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance()): Promise<FunctionCode|null> {
+    debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding,
+    options?: CreateFunctionCodeOptions): Promise<FunctionCode|null> {
   const debuggerModel = target.model(SDK.DebuggerModel.DebuggerModel);
   if (!debuggerModel) {
     throw new Error('missing debugger model');
@@ -246,7 +245,7 @@ export async function getFunctionCodeFromLocation(
     return null;
   }
 
-  return await getFunctionCodeFromRawLocation(rawLocation, options, debuggerWorkspaceBinding);
+  return await getFunctionCodeFromRawLocation(rawLocation, debuggerWorkspaceBinding, options);
 }
 
 async function format(uiSourceCode: Workspace.UISourceCode.UISourceCode, content: string,
@@ -265,9 +264,9 @@ async function format(uiSourceCode: Workspace.UISourceCode.UISourceCode, content
  * Returns a {@link FunctionCode} for the given raw location.
  */
 export async function getFunctionCodeFromRawLocation(
-    rawLocation: SDK.DebuggerModel.Location, options?: CreateFunctionCodeOptions,
-    debuggerWorkspaceBinding =
-        Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance()): Promise<FunctionCode|null> {
+    rawLocation: SDK.DebuggerModel.Location,
+    debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding,
+    options?: CreateFunctionCodeOptions): Promise<FunctionCode|null> {
   const functionBounds = await debuggerWorkspaceBinding.functionBoundsAtRawLocation(rawLocation);
   if (!functionBounds) {
     return null;

package/front_end/models/workspace_diff/WorkspaceDiff.ts

@@ -209,7 +209,7 @@ export class UISourceCodeDiff extends Common.ObjectWrapper.ObjectWrapper<UISourc
   readonly #networkPersistenceManager: Persistence.NetworkPersistenceManager.NetworkPersistenceManager;
   readonly #settings: Common.Settings.Settings;
   #requestDiffPromise: Promise<DiffResponse|null>|null = null;
-  #pendingChanges: number|null = null;
+  #pendingChanges?: ReturnType<typeof setTimeout>;
   dispose = false;
   constructor(
       uiSourceCode: Workspace.UISourceCode.UISourceCode,
@@ -225,23 +225,22 @@ export class UISourceCodeDiff extends Common.ObjectWrapper.ObjectWrapper<UISourc
   }
 
   #uiSourceCodeChanged(): void {
-    if (this.#pendingChanges) {
       clearTimeout(this.#pendingChanges);
-      this.#pendingChanges = null;
-    }
-    this.#requestDiffPromise = null;
+      this.#pendingChanges = undefined;
 
-    const content = this.#uiSourceCode.content();
-    const delay = (!content || content.length < 65536) ? 0 : 200;
-    this.#pendingChanges = window.setTimeout(emitDiffChanged.bind(this), delay);
+      this.#requestDiffPromise = null;
 
-    function emitDiffChanged(this: UISourceCodeDiff): void {
-      if (this.dispose) {
-        return;
+      const content = this.#uiSourceCode.content();
+      const delay = (!content || content.length < 65536) ? 0 : 200;
+      this.#pendingChanges = globalThis.setTimeout(emitDiffChanged.bind(this), delay);
+
+      function emitDiffChanged(this: UISourceCodeDiff): void {
+        if (this.dispose) {
+          return;
+        }
+        this.dispatchEventToListeners(UISourceCodeDiffEvents.DIFF_CHANGED);
+        this.#pendingChanges = undefined;
       }
-      this.dispatchEventToListeners(UISourceCodeDiffEvents.DIFF_CHANGED);
-      this.#pendingChanges = null;
-    }
   }
 
   requestDiff(): Promise<DiffResponse|null> {