chrome-devtools-frontend 1.0.1656291 → 1.0.1657110

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

@@ -6,6 +6,7 @@ import * as Common from '../../core/common/common.js';
 import * as Host from '../../core/host/host.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as Platform from '../../core/platform/platform.js';
+import * as 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';
@@ -29,8 +30,6 @@ const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 
 const LIVE_METRICS_WORLD_NAME = 'DevTools Performance Metrics';
 
-let liveMetricsInstance: LiveMetrics;
-
 class InjectedScript {
   static #injectedScript?: string;
   static async get(): Promise<string> {
@@ -47,6 +46,7 @@ export type InteractionMap = Map<InteractionId, Interaction>;
 
 export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes> implements SDK.TargetManager.Observer {
   #enabled = false;
+  #isCollectingMetrics = false;
   #target?: SDK.Target.Target;
   #scriptIdentifier?: Protocol.Page.ScriptIdentifier;
   #lastResetContextId?: Protocol.Runtime.ExecutionContextId;
@@ -58,21 +58,24 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
   #layoutShifts: LayoutShift[] = [];
   #lastEmulationChangeTime?: number;
   #mutex = new Common.Mutex.Mutex();
-  #deviceModeModel = EmulationModel.DeviceModeModel.DeviceModeModel.tryInstance();
+  readonly #targetManager: SDK.TargetManager.TargetManager;
+  readonly #deviceModeModel: EmulationModel.DeviceModeModel.DeviceModeModel|null;
 
-  private constructor() {
+  constructor(targetManager: SDK.TargetManager.TargetManager,
+              deviceModeModel: EmulationModel.DeviceModeModel.DeviceModeModel|null) {
     super();
-    const targetManager = SDK.TargetManager.TargetManager.instance();
-    targetManager.observeTargets(this, {scoped: true});
-    targetManager.addModelListener(
-        SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.PrimaryPageChanged,
-        this.#onPrimaryPageChanged, this);
+    this.#targetManager = targetManager;
+    this.#deviceModeModel = deviceModeModel;
+    this.#targetManager.observeTargets(this, {scoped: true});
+    this.#targetManager.addModelListener(SDK.ResourceTreeModel.ResourceTreeModel,
+                                         SDK.ResourceTreeModel.Events.PrimaryPageChanged, this.#onPrimaryPageChanged,
+                                         this);
   }
 
   #onPrimaryPageChanged(
       event: Common.EventTarget.EventTargetEvent<
           {frame: SDK.ResourceTreeModel.ResourceTreeFrame, type: SDK.ResourceTreeModel.PrimaryPageChangeType}>): void {
-    const primaryTarget = SDK.TargetManager.TargetManager.instance().primaryPageTarget();
+    const primaryTarget = this.#targetManager.primaryPageTarget();
     if (!primaryTarget) {
       return;
     }
@@ -86,19 +89,22 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
 
   async #switchToTarget(newTarget: SDK.Target.Target): Promise<void> {
     if (this.#target) {
-      await this.disable();
+      await this.#stopCollectingMetrics();
     }
     this.#target = newTarget;
-    await this.enable();
+    await this.#startCollectingMetrics();
   }
 
   static instance(opts: {forceNew?: boolean} = {forceNew: false}): LiveMetrics {
     const {forceNew} = opts;
-    if (!liveMetricsInstance || forceNew) {
-      liveMetricsInstance = new LiveMetrics();
+    if (!Root.DevToolsContext.globalInstance().has(LiveMetrics) || forceNew) {
+      Root.DevToolsContext.globalInstance().set(
+          LiveMetrics,
+          new LiveMetrics(SDK.TargetManager.TargetManager.instance(),
+                          EmulationModel.DeviceModeModel.DeviceModeModel.tryInstance()));
     }
 
-    return liveMetricsInstance;
+    return Root.DevToolsContext.globalInstance().get(LiveMetrics);
   }
 
   get lcpValue(): LcpValue|undefined {
@@ -481,11 +487,11 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
 
   async targetAdded(target: SDK.Target.Target): Promise<void> {
     // Scoped observers can also receive events for OOPIFs and workers.
-    if (target !== SDK.TargetManager.TargetManager.instance().primaryPageTarget()) {
+    if (target !== this.#targetManager.primaryPageTarget()) {
       return;
     }
     this.#target = target;
-    await this.enable();
+    await this.#startCollectingMetrics();
   }
 
   async targetRemoved(target: SDK.Target.Target): Promise<void> {
@@ -493,11 +499,29 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     if (target !== this.#target) {
       return;
     }
-    await this.disable();
+    await this.#stopCollectingMetrics();
     this.#target = undefined;
   }
 
   async enable(): Promise<void> {
+    if (this.#enabled) {
+      return;
+    }
+    this.#enabled = true;
+    if (this.#target) {
+      await this.#startCollectingMetrics();
+    }
+  }
+
+  async disable(): Promise<void> {
+    if (!this.#enabled) {
+      return;
+    }
+    this.#enabled = false;
+    await this.#stopCollectingMetrics();
+  }
+
+  async #startCollectingMetrics(): Promise<void> {
     if (Host.InspectorFrontendHost.isUnderTest()) {
       // Enabling this impacts a lot of layout tests; we will work on fixing
       // them but for now it is easier to not run this page in layout tests.
@@ -505,7 +529,7 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
       return;
     }
 
-    if (!this.#target || this.#enabled) {
+    if (!this.#target || !this.#enabled || this.#isCollectingMetrics) {
       return;
     }
 
@@ -556,11 +580,11 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     this.#deviceModeModel?.addEventListener(
         EmulationModel.DeviceModeModel.Events.UPDATED, this.#onEmulationChanged, this);
 
-    this.#enabled = true;
+    this.#isCollectingMetrics = true;
   }
 
-  async disable(): Promise<void> {
-    if (!this.#target || !this.#enabled) {
+  async #stopCollectingMetrics(): Promise<void> {
+    if (!this.#target || !this.#isCollectingMetrics) {
       return;
     }
 
@@ -594,7 +618,7 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     this.#deviceModeModel?.removeEventListener(
         EmulationModel.DeviceModeModel.Events.UPDATED, this.#onEmulationChanged, this);
 
-    this.#enabled = false;
+    this.#isCollectingMetrics = false;
   }
 }
 

package/front_end/models/project_settings/ProjectSettingsModel.ts

@@ -4,7 +4,7 @@
 
 import * as Common from '../../core/common/common.js';
 import * as Platform from '../../core/platform/platform.js';
-import * as Root from '../../core/root/root.js';
+import type * as Root from '../../core/root/root.js';
 import * as SDK from '../../core/sdk/sdk.js';
 
 /** The security origin for all DevTools (front-end) resources. */
@@ -127,42 +127,7 @@ export class ProjectSettingsModel extends Common.ObjectWrapper.ObjectWrapper<Eve
     }
   }
 
-  /**
-   * Yields the `ProjectSettingsModel` singleton.
-   *
-   * @returns the singleton.
-   */
-  static instance({forceNew, hostConfig, pageResourceLoader, targetManager}: {
-    forceNew: boolean|null,
-    hostConfig: Root.Runtime.HostConfig|null,
-    pageResourceLoader: SDK.PageResourceLoader.PageResourceLoader|null,
-    targetManager: SDK.TargetManager.TargetManager|null,
-  }): ProjectSettingsModel {
-    if (!Root.DevToolsContext.globalInstance().has(ProjectSettingsModel) || forceNew) {
-      if (!hostConfig || !pageResourceLoader || !targetManager) {
-        throw new Error(
-            'Unable to create ProjectSettingsModel: ' +
-            'hostConfig, pageResourceLoader, and targetManager must be provided');
-      }
-      Root.DevToolsContext.globalInstance().set(
-          ProjectSettingsModel,
-          new ProjectSettingsModel(hostConfig, pageResourceLoader, targetManager),
-      );
-    }
-    return Root.DevToolsContext.globalInstance().get(ProjectSettingsModel);
-  }
-
-  /**
-   * Clears the `ProjectSettingsModel` singleton (if any);
-   */
-  static removeInstance(): void {
-    if (Root.DevToolsContext.globalInstance().has(ProjectSettingsModel)) {
-      Root.DevToolsContext.globalInstance().get(ProjectSettingsModel).#dispose();
-      Root.DevToolsContext.globalInstance().delete(ProjectSettingsModel);
-    }
-  }
-
-  #dispose(): void {
+  disposeForTest(): void {
     this.#targetManager.removeEventListener(
         SDK.TargetManager.Events.INSPECTED_URL_CHANGED,
         this.#inspectedURLChanged,

package/front_end/models/workspace/FileManager.ts

@@ -5,10 +5,9 @@
 import * as Common from '../../core/common/common.js';
 import * as Host from '../../core/host/host.js';
 import type * as Platform from '../../core/platform/platform.js';
+import * as Root from '../../core/root/root.js';
 import type * as TextUtils from '../text_utils/text_utils.js';
 
-let fileManagerInstance: FileManager|null;
-
 export interface SaveCallbackParam {
   fileSystemPath?: Platform.DevToolsPath.RawPathString|Platform.DevToolsPath.UrlString;
 }
@@ -16,7 +15,7 @@ export interface SaveCallbackParam {
 export class FileManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
   readonly #saveCallbacks = new Map<
       Platform.DevToolsPath.RawPathString|Platform.DevToolsPath.UrlString, (arg0: SaveCallbackParam|null) => void>();
-  private constructor() {
+  constructor() {
     super();
     Host.InspectorFrontendHost.InspectorFrontendHostInstance.events.addEventListener(
         Host.InspectorFrontendHostAPI.Events.SavedURL, this.savedURL, this);
@@ -28,11 +27,15 @@ export class FileManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
 
   static instance(opts: {forceNew: boolean|null} = {forceNew: null}): FileManager {
     const {forceNew} = opts;
-    if (!fileManagerInstance || forceNew) {
-      fileManagerInstance = new FileManager();
+    if (!Root.DevToolsContext.globalInstance().has(FileManager) || forceNew) {
+      Root.DevToolsContext.globalInstance().set(FileManager, new FileManager());
     }
 
-    return fileManagerInstance;
+    return Root.DevToolsContext.globalInstance().get(FileManager);
+  }
+
+  static removeInstance(): void {
+    Root.DevToolsContext.globalInstance().delete(FileManager);
   }
 
   /**

package/front_end/panels/ai_assistance/AiAssistancePanel.ts

@@ -950,7 +950,8 @@ export class AiAssistancePanel extends UI.Panel.Panel {
 
   #getAiAssistanceEnabledSetting(): Common.Settings.Setting<boolean>|undefined {
     try {
-      return Common.Settings.moduleSetting('ai-assistance-enabled') as Common.Settings.Setting<boolean>;
+      return Common.Settings.Settings.instance().moduleSetting('ai-assistance-enabled') as
+          Common.Settings.Setting<boolean>;
     } catch {
       return;
     }