chrome-devtools-frontend 1.0.1603822 → 1.0.1604514

package/front_end/core/host/GcaTypes.ts

@@ -168,40 +168,40 @@ export enum Mode {
   NONE = 3,
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface GenerateContentRequest {
   model?: string;
-  aicode?: AiCodeConfig;
+  aicode: AiCodeConfig;
   contents: Content[];
-  system_instruction?: Content;
+  systemInstruction?: Content;
   tools?: Tool[];
-  tool_config?: ToolConfig;
+  toolConfig?: ToolConfig;
   labels?: Record<string, string>;
-  safety_settings?: SafetySetting[];
-  generation_config?: GenerationConfig;
-  session_id?: string;
+  safetySettings?: SafetySetting[];
+  generationConfig?: GenerationConfig;
+  sessionId?: string;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
 export interface AiCodeConfig {
   experience: string;
   files?: SourceFile[];
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface SourceFile {
-  inclusion_reason?: InclusionReason[];
-  file_uri: string;
-  programming_language?: string;
+  inclusionReason?: InclusionReason[];
+  fileUri: string;
+  programmingLanguage?: string;
+  segments?: FileSegment[];
+}
+
+export interface FileSegment {
+  content: string;
+  isSelected: boolean;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface FileEdit {
-  file_uri: string;
+  fileUri: string;
   content: string;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
 export type Role = 'user'|'model';
 
@@ -210,34 +210,28 @@ export interface Content {
   role: Role;
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface Part {
   text?: string;
-  inline_data?: Blob;
-  file_data?: FileData;
-  function_call?: FunctionCall;
-  function_response?: FunctionResponse;
-  executable_code?: ExecutableCode;
-  code_execution_result?: CodeExecutionResult;
-  video_metadata?: VideoMetadata;
+  inlineData?: Blob;
+  fileData?: FileData;
+  functionCall?: FunctionCall;
+  functionResponse?: FunctionResponse;
+  executableCode?: ExecutableCode;
+  codeExecutionResult?: CodeExecutionResult;
+  videoMetadata?: VideoMetadata;
   thought?: boolean;
-  thought_signature?: string;  // bytes as base64 string
+  thoughtSignature?: string;  // bytes as base64 string
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface Blob {
-  mime_type: string;
+  mimeType: string;
   data: string;  // bytes as base64 string
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface FileData {
-  mime_type: string;
-  file_uri: string;
+  mimeType: string;
+  fileUri: string;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
 export interface FunctionCall {
   name: string;
@@ -261,30 +255,25 @@ export interface CodeExecutionResult {
   output: string;
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface Tool {
-  function_declarations?: FunctionDeclaration[];
-  google_search?: {
-    time_range_filter?: {
-      start_time?: string,  // Timestamp
-      end_time?: string,    // Timestamp
+  functionDeclarations?: FunctionDeclaration[];
+  googleSearch?: {
+    timeRangeFilter?: {
+      startTime?: string,  // Timestamp
+      endTime?: string,    // Timestamp
     },
   };
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface FunctionDeclaration {
   name: string;
   description: string;
   parameters?: Schema;
-  parameters_json_schema?: unknown;  // google.protobuf.Value
+  parametersJsonSchema?: unknown;  // google.protobuf.Value
   response?: Schema;
-  response_json_schema?: unknown;  // google.protobuf.Value
+  responseJsonSchema?: unknown;  // google.protobuf.Value
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface Schema {
   type?: Type;
   format?: string;
@@ -296,25 +285,20 @@ export interface Schema {
   required?: string[];
   minimum?: number;
   maximum?: number;
-  min_length?: number;
-  max_length?: number;
+  minLength?: number;
+  maxLength?: number;
   pattern?: string;
   example?: unknown;  // google.protobuf.Value
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface ToolConfig {
-  function_calling_config?: FunctionCallingConfig;
+  functionCallingConfig?: FunctionCallingConfig;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface FunctionCallingConfig {
   mode: Mode;
-  allowed_function_names?: string[];
+  allowedFunctionNames?: string[];
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
 export interface SafetySetting {
   category: HarmCategory;
@@ -322,52 +306,44 @@ export interface SafetySetting {
   method?: HarmBlockMethod;
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface GenerationConfig {
-  candidate_count?: number;
-  stop_sequences?: string[];
-  max_output_tokens?: number;
+  candidateCount?: number;
+  stopSequences?: string[];
+  maxOutputTokens?: number;
   temperature?: number;
-  top_p?: number;
-  top_k?: number;
+  topP?: number;
+  topK?: number;
   seed?: number;
-  response_mime_type?: string;
-  response_schema?: Schema;
-  response_json_schema?: unknown;  // google.protobuf.Value
-  presence_penalty?: number;
-  frequency_penalty?: number;
-  thinking_config?: ThinkingConfig;
+  responseMimeType?: string;
+  responseSchema?: Schema;
+  responseJsonSchema?: unknown;  // google.protobuf.Value
+  presencePenalty?: number;
+  frequencyPenalty?: number;
+  thinkingConfig?: ThinkingConfig;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface ThinkingConfig {
-  include_thoughts?: boolean;
-  thinking_budget?: number;
+  includeThoughts?: boolean;
+  thinkingBudget?: number;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface GenerateContentResponse {
   candidates: Candidate[];
-  prompt_feedback: PromptFeedback;
-  usage_metadata: UsageMetadata;
-  model_version: string;
-  response_id: string;
+  promptFeedback: PromptFeedback;
+  usageMetadata: UsageMetadata;
+  modelVersion: string;
+  responseId: string;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface Candidate {
   index: number;
   content: Content;
-  finish_reason: FinishReason;
-  safety_ratings: SafetyRating[];
-  citation_metadata: CitationMetadata;
-  grounding_metadata: GroundingMetadata;
-  aicode_output: AiCodeOutput;
+  finishReason: FinishReason;
+  safetyRatings: SafetyRating[];
+  citationMetadata: CitationMetadata;
+  groundingMetadata: GroundingMetadata;
+  aicodeOutput: AiCodeOutput;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
 export interface SafetyRating {
   category: HarmCategory;
@@ -379,142 +355,118 @@ export interface CitationMetadata {
   citations: Citation[];
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface Citation {
-  start_index: number;
-  end_index: number;
+  startIndex: number;
+  endIndex: number;
   uri: string;
   license: string;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface GroundingMetadata {
-  web_search_queries?: string[];
-  search_entry_point?: {
-    rendered_content?: string,
-    sdk_blob?: string,  // bytes as base64 string
+  webSearchQueries?: string[];
+  searchEntryPoint?: {
+    renderedContent?: string,
+    sdkBlob?: string,  // bytes as base64 string
   };
-  grounding_chunks?: Array<{
+  groundingChunks?: Array<{
     web?: {
       uri?: string,
       title?: string,
     },
   }>;
-  grounding_supports?: Array<{
+  groundingSupports?: Array<{
     segment?: {
-      part_index?: number,
-      start_index?: number,
-      end_index?: number,
+      partIndex?: number,
+      startIndex?: number,
+      endIndex?: number,
       text?: string,
     },
-    grounding_chunk_indices?: number[],
-    confidence_scores?: number[],
+    groundingChunkIndices?: number[],
+    confidenceScores?: number[],
   }>;
-  retrieval_metadata?: {
-    google_search_dynamic_retrieval_score?: number,
+  retrievalMetadata?: {
+    googleSearchDynamicRetrievalScore?: number,
   };
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
 export interface AiCodeOutput {
   contents: DerivedContent[];
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface DerivedContent {
-  start_index?: number;
-  end_index?: number;
+  startIndex?: number;
+  endIndex?: number;
   file?: OutputSourceFile;
-  code_block?: CodeBlock;
-  text_block?: TextBlock;
-  prediction_metadata?: PredictionMetadata;
+  codeBlock?: CodeBlock;
+  textBlock?: TextBlock;
+  predictionMetadata?: PredictionMetadata;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface OutputSourceFile {
-  file_uri: string;
+  fileUri: string;
   content: string;
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface CodeBlock {
   content: string;
-  programming_language: string;
+  programmingLanguage: string;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
 export interface TextBlock {
   content: string;
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface PredictionMetadata {
   score: number;
-  classifier_score: number;
+  classifierScore: number;
 }
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface PromptFeedback {
-  block_reason: BlockReason;
-  safety_ratings: SafetyRating[];
-  block_reason_message: string;
+  blockReason: BlockReason;
+  safetyRatings: SafetyRating[];
+  blockReasonMessage: string;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface UsageMetadata {
-  prompt_token_count: number;
-  candidates_token_count: number;
-  total_token_count: number;
-  thoughts_token_count: number;
-  cached_content_token_count: number;
+  promptTokenCount: number;
+  candidatesTokenCount: number;
+  totalTokenCount: number;
+  thoughtsTokenCount: number;
+  cachedContentTokenCount: number;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface VideoMetadata {
-  start_offset?: string;  // Duration
-  end_offset?: string;    // Duration
+  startOffset?: string;  // Duration
+  endOffset?: string;    // Duration
   fps?: number;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface SendTelemetryRequest {
-  feedback_metrics: FeedbackMetric[];
+  feedbackMetrics: FeedbackMetric[];
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface FeedbackMetric {
-  event_time: string;  // Timestamp
-  response_id: string;
-  suggestion_offered?: SuggestionOffered;
-  suggestion_interaction?: SuggestionInteraction;
+  eventTime: string;  // Timestamp
+  responseId: string;
+  suggestionOffered?: SuggestionOffered;
+  suggestionInteraction?: SuggestionInteraction;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface SuggestionOffered {
   method?: Method;
   status?: SuggestionStatus;
-  first_message_latency?: string;  // Duration
-  response_latency?: string;       // Duration
+  firstMessageLatency?: string;  // Duration
+  responseLatency?: string;      // Duration
   displayed?: boolean;
-  e2e_latency?: string;       // Duration
-  display_duration?: string;  // Duration
-  programming_language?: string;
+  e2eLatency?: string;       // Duration
+  displayDuration?: string;  // Duration
+  programmingLanguage?: string;
 }
-/* eslint-enable @typescript-eslint/naming-convention */
 
-/* eslint-disable @typescript-eslint/naming-convention */
 export interface SuggestionInteraction {
   interaction?: InteractionType;
-  accepted_lines?: number;
-  accepted_characters?: number;
-  accepted_comment_lines?: number;
-  candidate_index?: number;
+  acceptedLines?: number;
+  acceptedCharacters?: number;
+  acceptedCommentLines?: number;
+  candidateIndex?: number;
 }
-/* eslint-enable @typescript-eslint/naming-convention */

package/front_end/core/protocol_client/DevToolsCDPConnection.ts

@@ -112,7 +112,7 @@ export class DevToolsCDPConnection implements CDPConnection {
       if ('error' in response && response.error) {
         callback?.(response.error, null);
       } else if ('result' in response) {
-        callback?.(null, response.result as Object | null);
+        callback?.(null, response.result);
       }
     });
   }

package/front_end/core/sdk/DOMModel.ts

@@ -190,7 +190,7 @@ export class DOMNode extends Common.ObjectWrapper.ObjectWrapper<DOMNodeEventType
   /**
    * Set if a DOMNode is ad related.
    */
-  #isAdRelatedInternal = false;
+  #adProvenance?: Protocol.Network.AdProvenance;
 
   constructor(domModel: DOMModel) {
     super();
@@ -292,7 +292,7 @@ export class DOMNode extends Common.ObjectWrapper.ObjectWrapper<DOMNodeEventType
     this.setPseudoElements(payload.pseudoElements);
 
     if (payload.adProvenance) {
-      this.#isAdRelatedInternal = true;
+      this.#adProvenance = payload.adProvenance;
     }
 
     if (this.#nodeType === Node.ELEMENT_NODE) {
@@ -331,21 +331,24 @@ export class DOMNode extends Common.ObjectWrapper.ObjectWrapper<DOMNodeEventType
     return this.#topLayerIndex;
   }
 
-  isAdRelatedNode(): boolean {
-    // For iframes, we rely on `AdFrameType` to preserve legacy behavior and
-    // prevent regressions.
-    //
-    // TODO(yaoxia): Deprecate the iframe-specific logic and consolidate
-    // everything to use `#isAdRelatedInternal`.
-    if (this.isIframe() && this.#frameOwnerFrameId) {
-      const frame = FrameManager.instance().getFrame(this.#frameOwnerFrameId);
-      if (!frame) {
-        return false;
-      }
-      return frame.adFrameType() !== Protocol.Page.AdFrameType.None;
+  adProvenance(): Protocol.Network.AdProvenance|undefined {
+    if (this.#adProvenance !== undefined) {
+      return this.#adProvenance;
+    }
+
+    // AdProvenance can be unavailable for deeply nested OOPIF ad iframes
+    // (crbug.com/421202278). We rely on `AdFrameType` as a fallback.
+    if (!this.isIframe() || !this.#frameOwnerFrameId) {
+      return undefined;
     }
 
-    return this.#isAdRelatedInternal;
+    const frame = FrameManager.instance().getFrame(this.#frameOwnerFrameId);
+    if (frame && frame.adFrameType() !== Protocol.Page.AdFrameType.None) {
+      // The frame is ad-related, but provenance information is unavailable.
+      return {};
+    }
+
+    return undefined;
   }
 
   isRootNode(): boolean {
@@ -425,8 +428,8 @@ export class DOMNode extends Common.ObjectWrapper.ObjectWrapper<DOMNodeEventType
     }
   }
 
-  setIsAdRelated(isAdRelated: boolean): void {
-    this.#isAdRelatedInternal = isAdRelated;
+  setIsAdRelated(adProvenance?: Protocol.Network.AdProvenance): void {
+    this.#adProvenance = adProvenance;
     this.dispatchEventToListeners(DOMNodeEvents.AD_RELATED_STATE_UPDATED);
   }
 
@@ -1476,8 +1479,8 @@ export class DOMModel extends SDKModel<EventTypes> {
     return this.target().model(OverlayModel) as OverlayModel;
   }
 
-  static cancelSearch(): void {
-    for (const domModel of TargetManager.instance().models(DOMModel)) {
+  static cancelSearch(targetManager: TargetManager = TargetManager.instance()): void {
+    for (const domModel of targetManager.models(DOMModel)) {
       domModel.cancelSearch();
     }
   }
@@ -1832,12 +1835,11 @@ export class DOMModel extends SDKModel<EventTypes> {
   }
 
   adRelatedStateUpdated(nodeId: Protocol.DOM.NodeId, adProvenance?: Protocol.Network.AdProvenance): void {
-    const isAdRelated = adProvenance !== undefined;
     const node = this.nodeForId(nodeId);
-    if (!node || node.isAdRelatedNode() === isAdRelated) {
+    if (!node) {
       return;
     }
-    node.setIsAdRelated(isAdRelated);
+    node.setIsAdRelated(adProvenance);
   }
 
   affectedByStartingStylesFlagUpdated(nodeId: Protocol.DOM.NodeId, affectedByStartingStyles: boolean): void {

package/front_end/core/sdk/EmulationModel.ts

@@ -4,7 +4,6 @@
 
 import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
 import * as Protocol from '../../generated/protocol.js';
-import * as Common from '../common/common.js';
 
 import {CSSModel} from './CSSModel.js';
 import {MultitargetNetworkManager} from './NetworkManager.js';
@@ -50,7 +49,8 @@ export class EmulationModel extends SDKModel<EmulationModelEventTypes> implement
       }, this);
     }
 
-    const disableJavascriptSetting = Common.Settings.Settings.instance().moduleSetting('java-script-disabled');
+    const settings = this.target().targetManager().settings;
+    const disableJavascriptSetting = settings.moduleSetting('java-script-disabled');
     disableJavascriptSetting.addChangeListener(
         async () =>
             await this.#emulationAgent.invoke_setScriptExecutionDisabled({value: disableJavascriptSetting.get()}));
@@ -58,14 +58,14 @@ export class EmulationModel extends SDKModel<EmulationModelEventTypes> implement
       void this.#emulationAgent.invoke_setScriptExecutionDisabled({value: true});
     }
 
-    const touchSetting = Common.Settings.Settings.instance().moduleSetting('emulation.touch');
+    const touchSetting = settings.moduleSetting('emulation.touch');
     touchSetting.addChangeListener(() => {
       const settingValue = touchSetting.get();
 
       void this.overrideEmulateTouch(settingValue === 'force');
     });
 
-    const idleDetectionSetting = Common.Settings.Settings.instance().moduleSetting('emulation.idle-detection');
+    const idleDetectionSetting = settings.moduleSetting('emulation.idle-detection');
     idleDetectionSetting.addChangeListener(async () => {
       const settingValue = idleDetectionSetting.get();
       if (settingValue === 'none') {
@@ -80,7 +80,7 @@ export class EmulationModel extends SDKModel<EmulationModelEventTypes> implement
       await this.setIdleOverride(emulationParams);
     });
 
-    const cpuPressureDetectionSetting = Common.Settings.Settings.instance().moduleSetting('emulation.cpu-pressure');
+    const cpuPressureDetectionSetting = settings.moduleSetting('emulation.cpu-pressure');
     cpuPressureDetectionSetting.addChangeListener(async () => {
       const settingValue = cpuPressureDetectionSetting.get();
 
@@ -98,21 +98,19 @@ export class EmulationModel extends SDKModel<EmulationModelEventTypes> implement
       await this.setPressureStateOverride(settingValue);
     });
 
-    const mediaTypeSetting = Common.Settings.Settings.instance().moduleSetting<string>('emulated-css-media');
-    const mediaFeatureColorGamutSetting =
-        Common.Settings.Settings.instance().moduleSetting<string>('emulated-css-media-feature-color-gamut');
+    const mediaTypeSetting = settings.moduleSetting<string>('emulated-css-media');
+    const mediaFeatureColorGamutSetting = settings.moduleSetting<string>('emulated-css-media-feature-color-gamut');
     const mediaFeaturePrefersColorSchemeSetting =
-        Common.Settings.Settings.instance().moduleSetting<string>('emulated-css-media-feature-prefers-color-scheme');
-    const mediaFeatureForcedColorsSetting =
-        Common.Settings.Settings.instance().moduleSetting('emulated-css-media-feature-forced-colors');
+        settings.moduleSetting<string>('emulated-css-media-feature-prefers-color-scheme');
+    const mediaFeatureForcedColorsSetting = settings.moduleSetting('emulated-css-media-feature-forced-colors');
     const mediaFeaturePrefersContrastSetting =
-        Common.Settings.Settings.instance().moduleSetting<string>('emulated-css-media-feature-prefers-contrast');
+        settings.moduleSetting<string>('emulated-css-media-feature-prefers-contrast');
     const mediaFeaturePrefersReducedDataSetting =
-        Common.Settings.Settings.instance().moduleSetting<string>('emulated-css-media-feature-prefers-reduced-data');
-    const mediaFeaturePrefersReducedTransparencySetting = Common.Settings.Settings.instance().moduleSetting<string>(
-        'emulated-css-media-feature-prefers-reduced-transparency');
+        settings.moduleSetting<string>('emulated-css-media-feature-prefers-reduced-data');
+    const mediaFeaturePrefersReducedTransparencySetting =
+        settings.moduleSetting<string>('emulated-css-media-feature-prefers-reduced-transparency');
     const mediaFeaturePrefersReducedMotionSetting =
-        Common.Settings.Settings.instance().moduleSetting<string>('emulated-css-media-feature-prefers-reduced-motion');
+        settings.moduleSetting<string>('emulated-css-media-feature-prefers-reduced-motion');
     // Note: this uses a different format than what the CDP API expects,
     // because we want to update these values per media type/feature
     // without having to search the `features` array (inefficient) or
@@ -161,7 +159,7 @@ export class EmulationModel extends SDKModel<EmulationModelEventTypes> implement
     });
     void this.updateCssMedia();
 
-    const autoDarkModeSetting = Common.Settings.Settings.instance().moduleSetting('emulate-auto-dark-mode');
+    const autoDarkModeSetting = settings.moduleSetting('emulate-auto-dark-mode');
     autoDarkModeSetting.addChangeListener(() => {
       const enabled = autoDarkModeSetting.get();
       mediaFeaturePrefersColorSchemeSetting.setDisabled(enabled);
@@ -174,13 +172,13 @@ export class EmulationModel extends SDKModel<EmulationModelEventTypes> implement
       void this.emulateAutoDarkMode(true);
     }
 
-    const visionDeficiencySetting = Common.Settings.Settings.instance().moduleSetting('emulated-vision-deficiency');
+    const visionDeficiencySetting = settings.moduleSetting('emulated-vision-deficiency');
     visionDeficiencySetting.addChangeListener(() => this.emulateVisionDeficiency(visionDeficiencySetting.get()));
     if (visionDeficiencySetting.get()) {
       void this.emulateVisionDeficiency(visionDeficiencySetting.get());
     }
 
-    const osTextScaleSetting = Common.Settings.Settings.instance().moduleSetting('emulated-os-text-scale');
+    const osTextScaleSetting = settings.moduleSetting('emulated-os-text-scale');
     osTextScaleSetting.addChangeListener(() => {
       void this.emulateOSTextScale(parseFloat(osTextScaleSetting.get()) || undefined);
     });
@@ -188,15 +186,15 @@ export class EmulationModel extends SDKModel<EmulationModelEventTypes> implement
       void this.emulateOSTextScale(parseFloat(osTextScaleSetting.get()) || undefined);
     }
 
-    const localFontsDisabledSetting = Common.Settings.Settings.instance().moduleSetting('local-fonts-disabled');
+    const localFontsDisabledSetting = settings.moduleSetting('local-fonts-disabled');
     localFontsDisabledSetting.addChangeListener(() => this.setLocalFontsDisabled(localFontsDisabledSetting.get()));
     if (localFontsDisabledSetting.get()) {
       this.setLocalFontsDisabled(localFontsDisabledSetting.get());
     }
 
-    const avifFormatDisabledSetting = Common.Settings.Settings.instance().moduleSetting('avif-format-disabled');
-    const jpegXlFormatDisabledSetting = Common.Settings.Settings.instance().moduleSetting('jpeg-xl-format-disabled');
-    const webpFormatDisabledSetting = Common.Settings.Settings.instance().moduleSetting('webp-format-disabled');
+    const avifFormatDisabledSetting = settings.moduleSetting('avif-format-disabled');
+    const jpegXlFormatDisabledSetting = settings.moduleSetting('jpeg-xl-format-disabled');
+    const webpFormatDisabledSetting = settings.moduleSetting('webp-format-disabled');
 
     const updateDisabledImageFormats = (): void => {
       const types = [];