chrome-devtools-frontend 1.0.953776 → 1.0.954086

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

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import * as StringUtilities from './string-utilities.js';
-
 export const clamp = (num: number, min: number, max: number): number => {
   let clampedNumber = num;
   if (num < min) {
@@ -20,22 +18,22 @@ export const mod = (m: number, n: number): number => {
 
 export const bytesToString = (bytes: number): string => {
   if (bytes < 1000) {
-    return StringUtilities.vsprintf('%.0f\xA0B', [bytes]);
+    return `${bytes.toFixed(0)}\xA0B`;
   }
 
   const kilobytes = bytes / 1000;
   if (kilobytes < 100) {
-    return StringUtilities.vsprintf('%.1f\xA0kB', [kilobytes]);
+    return `${kilobytes.toFixed(1)}\xA0kB`;
   }
   if (kilobytes < 1000) {
-    return StringUtilities.vsprintf('%.0f\xA0kB', [kilobytes]);
+    return `${kilobytes.toFixed(0)}\xA0kB`;
   }
 
   const megabytes = kilobytes / 1000;
   if (megabytes < 100) {
-    return StringUtilities.vsprintf('%.1f\xA0MB', [megabytes]);
+    return `${megabytes.toFixed(1)}\xA0MB`;
   }
-  return StringUtilities.vsprintf('%.0f\xA0MB', [megabytes]);
+  return `${megabytes.toFixed(0)}\xA0MB`;
 };
 
 export const toFixedIfFloating = (value: string): string => {

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

@@ -206,25 +206,6 @@ export const format = function<T, U>(
   return {formattedResult: result, unusedSubstitutions: unusedSubstitutions};
 };
 
-export const standardFormatters = {
-  d: function(substitution: unknown): number {
-    return (!isNaN(substitution as number) ? substitution as number : 0);
-  },
-
-  f: function(substitution: unknown, token: FormatterToken): string {
-    if (substitution && typeof substitution === 'number' && token.precision !== undefined && token.precision > -1) {
-      substitution = substitution.toFixed(token.precision);
-    }
-    const precision =
-        (token.precision !== undefined && token.precision > -1) ? Number(0).toFixed(token.precision) : '0';
-    return !isNaN(substitution as number) ? substitution as string : precision;
-  },
-
-  s: function(substitution: unknown): string {
-    return substitution as string;
-  },
-};
-
 const toHexadecimal = (charCode: number, padToLength: number): string => {
   return charCode.toString(16).toUpperCase().padStart(padToLength, '0');
 };
@@ -285,12 +266,51 @@ export const formatAsJSLiteral = (content: string): string => {
   return `${quote}${escapedContent}${quote}`;
 };
 
-export const vsprintf = function(formatString: string, substitutions: unknown[]): string {
-  return format(formatString, substitutions, standardFormatters, '', (a, b) => a + b).formattedResult;
-};
-
-export const sprintf = function(format: string, ...varArg: unknown[]): string {
-  return vsprintf(format, varArg);
+/**
+ * This implements a subset of the sprintf() function described in the Single UNIX
+ * Specification. It supports the %s, %f, %d, and %% formatting specifiers, and
+ * understands the %m$d notation to select the m-th parameter for this substitution,
+ * as well as the optional precision for %s, %f, and %d.
+ *
+ * @param fmt format string.
+ * @param args parameters to the format string.
+ * @returns the formatted output string.
+ */
+export const sprintf = (fmt: string, ...args: unknown[]): string => {
+  let argIndex = 0;
+  const RE = /%(?:(\d+)\$)?(?:\.(\d*))?([%dfs])/g;
+  return fmt.replaceAll(RE, (_: string, index?: string, precision?: string, specifier?: string): string => {
+    if (specifier === '%') {
+      return '%';
+    }
+    if (index !== undefined) {
+      argIndex = parseInt(index, 10) - 1;
+      if (argIndex < 0) {
+        throw new RangeError(`Invalid parameter index ${argIndex + 1}`);
+      }
+    }
+    if (argIndex >= args.length) {
+      throw new RangeError(`Expected at least ${argIndex + 1} format parameters, but only ${args.length} where given.`);
+    }
+    if (specifier === 's') {
+      const argValue = String(args[argIndex++]);
+      if (precision !== undefined) {
+        return argValue.substring(0, Number(precision));
+      }
+      return argValue;
+    }
+    let argValue = Number(args[argIndex++]);
+    if (isNaN(argValue)) {
+      argValue = 0;
+    }
+    if (specifier === 'd') {
+      return String(Math.floor(argValue)).padStart(Number(precision), '0');
+    }
+    if (precision !== undefined) {
+      return argValue.toFixed(Number(precision));
+    }
+    return String(argValue);
+  });
 };
 
 export const toBase64 = (inputString: string): string => {

package/front_end/core/sdk/ResourceTreeModel.ts

@@ -616,7 +616,12 @@ export class ResourceTreeFrame {
   backForwardCacheDetails: {
     restoredFromCache: boolean|undefined,
     explanations: Protocol.Page.BackForwardCacheNotRestoredExplanation[],
-  } = {restoredFromCache: undefined, explanations: []};
+    explanationsTree: Protocol.Page.BackForwardCacheNotRestoredExplanationTree|undefined,
+  } = {
+    restoredFromCache: undefined,
+    explanations: [],
+    explanationsTree: undefined,
+  };
 
   constructor(
       model: ResourceTreeModel, parentFrame: ResourceTreeFrame|null, frameId: Protocol.Page.FrameId,
@@ -688,7 +693,11 @@ export class ResourceTreeFrame {
     this.#secureContextType = framePayload.secureContextType;
     this.#crossOriginIsolatedContextType = framePayload.crossOriginIsolatedContextType;
     this.#gatedAPIFeatures = framePayload.gatedAPIFeatures;
-    this.backForwardCacheDetails = {restoredFromCache: undefined, explanations: []};
+    this.backForwardCacheDetails = {
+      restoredFromCache: undefined,
+      explanations: [],
+      explanationsTree: undefined,
+    };
 
     const mainResource = this.resourcesMap.get(this.#urlInternal);
     this.resourcesMap.clear();
@@ -963,6 +972,7 @@ export class ResourceTreeFrame {
   setBackForwardCacheDetails(event: Protocol.Page.BackForwardCacheNotUsedEvent): void {
     this.backForwardCacheDetails.restoredFromCache = false;
     this.backForwardCacheDetails.explanations = event.notRestoredExplanations;
+    this.backForwardCacheDetails.explanationsTree = event.notRestoredExplanationsTree;
   }
 
   getResourcesMap(): Map<string, Resource> {

package/front_end/generated/InspectorBackendCommands.js

@@ -2262,7 +2262,9 @@ export function registerCommands(inspectorBackend) {
   inspectorBackend.registerEvent(
       'Page.javascriptDialogOpening', ['url', 'message', 'type', 'hasBrowserHandler', 'defaultPrompt']);
   inspectorBackend.registerEvent('Page.lifecycleEvent', ['frameId', 'loaderId', 'name', 'timestamp']);
-  inspectorBackend.registerEvent('Page.backForwardCacheNotUsed', ['loaderId', 'frameId', 'notRestoredExplanations']);
+  inspectorBackend.registerEvent(
+      'Page.backForwardCacheNotUsed',
+      ['loaderId', 'frameId', 'notRestoredExplanations', 'notRestoredExplanationsTree']);
   inspectorBackend.registerEvent('Page.loadEventFired', ['timestamp']);
   inspectorBackend.registerEvent('Page.navigatedWithinDocument', ['frameId', 'url']);
   inspectorBackend.registerEvent('Page.screencastFrame', ['data', 'metadata', 'sessionId']);

package/front_end/generated/protocol.d.ts

@@ -10719,6 +10719,21 @@ declare namespace Protocol {
       reason: BackForwardCacheNotRestoredReason;
     }
 
+    export interface BackForwardCacheNotRestoredExplanationTree {
+      /**
+       * URL of each frame
+       */
+      url: string;
+      /**
+       * Not restored reasons of each frame
+       */
+      explanations: BackForwardCacheNotRestoredExplanation[];
+      /**
+       * Array of children frame
+       */
+      children: BackForwardCacheNotRestoredExplanationTree[];
+    }
+
     export interface AddScriptToEvaluateOnLoadRequest {
       scriptSource: string;
     }
@@ -11708,6 +11723,10 @@ declare namespace Protocol {
        * Array of reasons why the page could not be cached. This must not be empty.
        */
       notRestoredExplanations: BackForwardCacheNotRestoredExplanation[];
+      /**
+       * Tree structure of reasons why the page could not be cached for each frame.
+       */
+      notRestoredExplanationsTree?: BackForwardCacheNotRestoredExplanationTree;
     }
 
     export interface LoadEventFiredEvent {

package/front_end/models/extensions/ExtensionServer.ts

@@ -1145,12 +1145,11 @@ export class ExtensionStatus {
   E_FAILED: (...args: unknown[]) => Record;
 
   constructor() {
-    function makeStatus(code: string, description: string): Record {
-      const details = Array.prototype.slice.call(arguments, 2);
+    function makeStatus(code: string, description: string, ...details: unknown[]): Record {
       const status: Record = {code, description, details};
       if (code !== 'OK') {
         status.isError = true;
-        console.error('Extension server error: ' + Platform.StringUtilities.vsprintf(description, details));
+        console.error('Extension server error: ' + Platform.StringUtilities.sprintf(description, ...details));
       }
       return status;
     }

package/front_end/panels/elements/components/AdornerSettingsPane.ts

@@ -4,6 +4,7 @@
 
 import * as i18n from '../../../core/i18n/i18n.js';
 import * as ComponentHelpers from '../../../ui/components/helpers/helpers.js';
+import * as Input from '../../../ui/components/input/input.js';
 import * as LitHtml from '../../../ui/lit-html/lit-html.js';
 import adornerSettingsPaneStyles from './adornerSettingsPane.css.js';
 
@@ -48,7 +49,7 @@ export class AdornerSettingsPane extends HTMLElement {
   #settings: AdornerSettingsMap = new Map();
 
   connectedCallback(): void {
-    this.#shadow.adoptedStyleSheets = [adornerSettingsPaneStyles];
+    this.#shadow.adoptedStyleSheets = [Input.checkboxStyles, adornerSettingsPaneStyles];
   }
 
   set data(data: AdornerSettingsPaneData) {

package/front_end/panels/elements/components/LayoutPane.ts

@@ -13,6 +13,7 @@ import {LayoutElement} from './LayoutPaneUtils.js';
 import type {NodeTextData} from './NodeText.js';
 import {NodeText} from './NodeText.js';
 import layoutPaneStyles from '../layoutPane.css.js';
+import * as Input from '../../../ui/components/input/input.js';
 // eslint-disable-next-line rulesdir/es_modules_import
 import inspectorCommonStyles from '../../../ui/legacy/inspectorCommon.css.js';
 
@@ -103,6 +104,7 @@ export class LayoutPane extends HTMLElement {
   constructor() {
     super();
     this.#shadow.adoptedStyleSheets = [
+      Input.checkboxStyles,
       layoutPaneStyles,
       inspectorCommonStyles,
     ];

package/front_end/panels/elements/layoutPane.css

@@ -181,7 +181,3 @@ that uses the dimensions to draw an outline around the element. */
 .node-text-container:hover {
   background-color: var(--item-hover-color);
 }
-
-:host-context(.-theme-with-dark-background) input[type="checkbox"] {
-  filter: invert(80%);
-}

package/front_end/panels/settings/emulation/components/UserAgentClientHintsForm.ts

@@ -10,6 +10,7 @@ import * as LitHtml from '../../../../ui/lit-html/lit-html.js';
 import userAgentClientHintsFormStyles from './userAgentClientHintsForm.css.js';
 
 import type * as Protocol from '../../../../generated/protocol.js';
+import * as Input from '../../../../ui/components/input/input.js';
 import * as IconButton from '../../../../ui/components/icon_button/icon_button.js';
 import type * as UI from '../../../../ui/legacy/legacy.js';
 import * as EmulationUtils from '../utils/utils.js';
@@ -193,7 +194,7 @@ export class UserAgentClientHintsForm extends HTMLElement {
   #brandsModifiedAriaMessage: string = '';
 
   connectedCallback(): void {
-    this.#shadow.adoptedStyleSheets = [userAgentClientHintsFormStyles];
+    this.#shadow.adoptedStyleSheets = [Input.checkboxStyles, userAgentClientHintsFormStyles];
   }
 
   set value(data: UserAgentClientHintsFormData) {

package/front_end/ui/components/linear_memory_inspector/ValueInterpreterSettings.ts

@@ -5,6 +5,7 @@
 import * as i18n from '../../../core/i18n/i18n.js';
 import * as LitHtml from '../../lit-html/lit-html.js';
 import * as ComponentHelpers from '../helpers/helpers.js';
+import * as Input from '../input/input.js';
 
 import {ValueType, valueTypeToLocalizedString} from './ValueInterpreterDisplayUtils.js';
 import valueInterpreterSettingsStyles from './valueInterpreterSettings.css.js';
@@ -65,7 +66,7 @@ export class ValueInterpreterSettings extends HTMLElement {
   #valueTypes: Set<ValueType> = new Set();
 
   connectedCallback(): void {
-    this.#shadow.adoptedStyleSheets = [valueInterpreterSettingsStyles];
+    this.#shadow.adoptedStyleSheets = [Input.checkboxStyles, valueInterpreterSettingsStyles];
   }
 
   set data(data: ValueInterpreterSettingsData) {

package/package.json

@@ -53,5 +53,5 @@
     "unittest": "scripts/test/run_unittests.py --no-text-coverage",
     "watch": "third_party/node/node.py --output scripts/watch_build.js"
   },
-  "version": "1.0.953776"
+  "version": "1.0.954086"
 }