chrome-devtools-frontend 1.0.954826 → 1.0.956060

package/front_end/ui/legacy/theme_support/theme_support_impl.ts

@@ -34,7 +34,6 @@
  */
 
 import * as Common from '../../../core/common/common.js';
-import * as Platform from '../../../core/platform/platform.js';
 
 import inspectorSyntaxHighlightStyles from '../inspectorSyntaxHighlight.css.legacy.js';
 import inspectorSyntaxHighlightDarkStyles from '../inspectorSyntaxHighlightDark.css.legacy.js';
@@ -45,33 +44,13 @@ const themeValuesCache = new Map<CSSStyleDeclaration, Map<string, string>>();
 
 export class ThemeSupport {
   private readonly themeNameInternal: string;
-  private themableProperties: Set<string>;
-  private readonly cachedThemePatches: Map<string, string>;
-  private readonly setting: Common.Settings.Setting<string>;
   private readonly customSheets: Set<string>;
   private readonly computedRoot: () => symbol | CSSStyleDeclaration;
-  private injectingStyleSheet?: boolean;
 
   private constructor(setting: Common.Settings.Setting<string>) {
     const systemPreferredTheme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'default';
     this.themeNameInternal = setting.get() === 'systemPreferred' ? systemPreferredTheme : setting.get();
-    this.themableProperties = new Set([
-      'color',
-      'box-shadow',
-      'text-shadow',
-      'outline-color',
-      'background-image',
-      'background-color',
-      'border-left-color',
-      'border-right-color',
-      'border-top-color',
-      'border-bottom-color',
-      '-webkit-border-image',
-      'fill',
-      'stroke',
-    ]);
-    this.cachedThemePatches = new Map();
-    this.setting = setting;
+
     this.customSheets = new Set();
     this.computedRoot = Common.Lazy.lazy(() => window.getComputedStyle(document.documentElement));
   }
@@ -139,12 +118,10 @@ export class ThemeSupport {
   }
 
   injectHighlightStyleSheets(element: Element|ShadowRoot): void {
-    this.injectingStyleSheet = true;
     this.appendStyle(element, inspectorSyntaxHighlightStyles);
     if (this.themeNameInternal === 'dark') {
       this.appendStyle(element, inspectorSyntaxHighlightDarkStyles);
     }
-    this.injectingStyleSheet = false;
   }
 
   /**
@@ -174,195 +151,11 @@ export class ThemeSupport {
   }
 
   applyTheme(document: Document): void {
-    if (!this.hasTheme() || this.isForcedColorsMode()) {
-      return;
-    }
-
-    if (this.themeNameInternal === 'dark') {
-      document.documentElement.classList.add('-theme-with-dark-background');
-    }
-
-    const styleSheets = document.styleSheets;
-    const result = [];
-    for (let i = 0; i < styleSheets.length; ++i) {
-      const href = styleSheets[i].href;
-      if (!href) {
-        continue;
-      }
-      result.push(this.patchForTheme(href, (styleSheets[i] as CSSStyleSheet)));
-    }
-    result.push('/*# sourceURL=inspector.css.theme */');
-
-    const styleElement = document.createElement('style');
-    styleElement.textContent = result.join('\n');
-    document.head.appendChild(styleElement);
-  }
-
-  themeStyleSheet(id: string, text: string): string {
-    if (!this.hasTheme() || this.injectingStyleSheet || this.isForcedColorsMode()) {
-      return '';
-    }
-
-    let patch = this.cachedThemePatches.get(id);
-    if (!patch) {
-      const styleElement = document.createElement('style');
-      styleElement.textContent = text;
-      document.body.appendChild(styleElement);
-
-      const {sheet} = styleElement;
-      if (!sheet) {
-        throw new Error('No sheet in stylesheet object');
-      }
-      patch = this.patchForTheme(id, sheet);
-      document.body.removeChild(styleElement);
-    }
-    return patch;
-  }
-
-  private patchForTheme(id: string, styleSheet: CSSStyleSheet): string {
-    const cached = this.cachedThemePatches.get(id);
-    if (cached) {
-      return cached;
-    }
-
-    try {
-      const rules = styleSheet.cssRules;
-      const result = [];
-      for (let j = 0; j < rules.length; ++j) {
-        const rule = rules[j];
-        if (rule instanceof CSSImportRule) {
-          result.push(this.patchForTheme(rule.styleSheet.href || '', rule.styleSheet));
-          continue;
-        }
-
-        if (!(rule instanceof CSSStyleRule)) {
-          continue;
-        }
-
-        const output: string[] = [];
-        const style = rule.style;
-        const selectorText = rule.selectorText;
-        for (let i = 0; style && i < style.length; ++i) {
-          this.patchProperty(selectorText, style, style[i], output);
-        }
-        if (output.length) {
-          result.push(rule.selectorText + '{' + output.join('') + '}');
-        }
-      }
-
-      const fullText = result.join('\n');
-      this.cachedThemePatches.set(id, fullText);
-      return fullText;
-    } catch (e) {
-      this.setting.set('default');
-      return '';
-    }
-  }
-
-  /**
-   * Theming API is primarily targeted at making dark theme look good.
-   * - If rule has ".-theme-preserve" in selector, it won't be affected.
-   * - One can create specializations for dark themes via body.-theme-with-dark-background selector in host context.
-   */
-  private patchProperty(selectorText: string, style: CSSStyleDeclaration, name: string, output: string[]): void {
-    if (!this.themableProperties.has(name)) {
-      return;
-    }
-
-    const value = style.getPropertyValue(name);
-    if (!value || value === 'none' || value === 'inherit' || value === 'initial' || value === 'transparent') {
-      return;
-    }
-    if (name === 'background-image' && value.indexOf('gradient') === -1) {
-      return;
-    }
-
-    if (selectorText.indexOf('-theme-') !== -1) {
+    if (!this.hasTheme() || this.isForcedColorsMode() || this.themeNameInternal !== 'dark') {
       return;
     }
 
-    let colorUsage = ThemeSupport.ColorUsage.Unknown;
-    if (name.indexOf('background') === 0 || name.indexOf('border') === 0) {
-      colorUsage |= ThemeSupport.ColorUsage.Background;
-    }
-    if (name.indexOf('background') === -1) {
-      colorUsage |= ThemeSupport.ColorUsage.Foreground;
-    }
-
-    output.push(name);
-    output.push(':');
-    if (/^var\(.*\)$/.test(value)) {
-      // Don't translate CSS variables.
-      output.push(value);
-    } else {
-      const items = value.replace(Common.Color.Regex, '\0$1\0').split('\0');
-      for (const item of items) {
-        output.push(this.patchColorText(item, (colorUsage as number)));
-      }
-    }
-    if (style.getPropertyPriority(name)) {
-      output.push(' !important');
-    }
-    output.push(';');
-  }
-
-  /**
-   * This legacy function has been supeseded by CSS custom properties. Wherever possible, please use
-   * the values declared in global stylesheets.
-   *
-   * @deprecated
-   */
-  patchColorText(text: string, colorUsage: number): string {
-    const color = Common.Color.Color.parse(text);
-    if (!color) {
-      return text;
-    }
-    const outColor = this.patchColor(color, colorUsage);
-    let outText = outColor.asString(null);
-    if (!outText) {
-      outText = outColor.asString(outColor.hasAlpha() ? Common.Color.Format.RGBA : Common.Color.Format.RGB);
-    }
-    return outText || text;
-  }
-
-  /**
-   * This legacy function has been supeseded by CSS custom properties. Wherever possible, please use
-   * the values declared in global stylesheets.
-   *
-   * @deprecated
-   */
-  patchColor(color: Common.Color.Color, colorUsage: number): Common.Color.Color {
-    const hsla = color.hsla();
-    this.patchHSLA(hsla, colorUsage);
-
-    const rgba: number[] = [];
-    Common.Color.Color.hsl2rgb(hsla, rgba);
-    return new Common.Color.Color(rgba, color.format());
-  }
-
-  private patchHSLA(hsla: number[], colorUsage: number): void {
-    const hue = hsla[0];
-    const sat = hsla[1];
-    let lit: number = hsla[2];
-    const alpha = hsla[3];
-
-    switch (this.themeNameInternal) {
-      case 'dark': {
-        const minCap = colorUsage & ThemeSupport.ColorUsage.Background ? 0.14 : 0;
-        const maxCap = colorUsage & ThemeSupport.ColorUsage.Foreground ? 0.9 : 1;
-        lit = 1 - lit;
-        if (lit < minCap * 2) {
-          lit = minCap + lit / 2;
-        } else if (lit > 2 * maxCap - 1) {
-          lit = maxCap - 1 / 2 + lit / 2;
-        }
-        break;
-      }
-    }
-    hsla[0] = Platform.NumberUtilities.clamp(hue, 0, 1);
-    hsla[1] = Platform.NumberUtilities.clamp(sat, 0, 1);
-    hsla[2] = Platform.NumberUtilities.clamp(lit, 0, 1);
-    hsla[3] = Platform.NumberUtilities.clamp(alpha, 0, 1);
+    document.documentElement.classList.add('-theme-with-dark-background');
   }
 }
 export namespace ThemeSupport {

package/front_end/ui/legacy/toolbar.css

@@ -294,6 +294,7 @@ select.toolbar-item:disabled {
   opacity: 50%;
 }
 
+button.toolbar-item:focus-visible,
 select.toolbar-item:focus-visible {
   background: var(--color-background-elevation-2);
   border-radius: 2px;

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.954826"
+  "version": "1.0.956060"
 }

package/scripts/component_server/server.js

@@ -150,8 +150,8 @@ function createServerIndexFile(componentNames) {
       <meta charset="UTF-8" />
       <meta name="viewport" content="width=device-width" />
       <title>DevTools components</title>
-      <link rel="stylesheet" href="/front_end/ui/legacy/themeColors.css" />
-      <link rel="stylesheet" href="/front_end/ui/components/docs/component_docs_styles.css" />
+      <link rel="stylesheet" href="${sharedResourcesBase}front_end/ui/legacy/themeColors.css" />
+      <link rel="stylesheet" href="${sharedResourcesBase}front_end/ui/components/docs/component_docs_styles.css" />
     </head>
     <body id="index-page">
       <h1>DevTools components</h1>

package/scripts/eslint_rules/tests/check_license_header_test.js

@@ -9,6 +9,8 @@ const ruleTester = new (require('eslint').RuleTester)({
   parser: require.resolve('@typescript-eslint/parser'),
 });
 
+const CURRENT_YEAR = new Date().getFullYear();
+
 ruleTester.run('check_license_header', rule, {
   valid: [
     {
@@ -116,7 +118,7 @@ main()
       code: 'import * as Action from \'./Action.js\';',
       filename: 'front_end/ui/ui.js',
       errors: [{message: 'Missing license header'}],
-      output: `// Copyright 2021 The Chromium Authors. All rights reserved.
+      output: `// Copyright ${CURRENT_YEAR} The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -131,7 +133,7 @@ import * as Action from './Action.js';
       filename: 'front_end/ui/ui.js',
       errors: [{message: 'Incorrect line license header'}],
       output: `
-// Copyright 2021 The Chromium Authors. All rights reserved.
+// Copyright ${CURRENT_YEAR} The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -147,7 +149,7 @@ import * as Action from './Action.js';
 (async function() {})();`,
       filename: 'test/webtests/http/tests/devtools/a11y-axe-core/sources/call-stack-a11y-test.js',
       errors: [{message: 'Incorrect line license header'}],
-      output: `// Copyright 2021 The Chromium Authors. All rights reserved.
+      output: `// Copyright ${CURRENT_YEAR} The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -168,7 +170,7 @@ import * as Action from './Action.js';
       filename: 'front_end/ui/ui.js',
       errors: [{message: 'Incorrect line license header'}],
       output: `
-// Copyright 2021 The Chromium Authors. All rights reserved.
+// Copyright ${CURRENT_YEAR} The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -191,7 +193,7 @@ import * as Action from './Action.js';
       filename: 'front_end/ui/ui.js',
       errors: [{message: 'Incorrect block license header'}],
       output: `
-// Copyright 2021 The Chromium Authors. All rights reserved.
+// Copyright ${CURRENT_YEAR} The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -225,7 +227,7 @@ interface String {
       filename: 'front_end/legacy/legacy-defs.d.ts',
       errors: [{message: 'Missing license header'}],
       output: `
-// Copyright 2021 The Chromium Authors. All rights reserved.
+// Copyright ${CURRENT_YEAR} The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -258,7 +260,7 @@ main()
       errors: [{message: 'Missing license header'}],
       output: `#!/usr/bin/env node
 
-// Copyright 2021 The Chromium Authors. All rights reserved.
+// Copyright ${CURRENT_YEAR} The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -279,7 +281,7 @@ main()
       errors: [{message: 'Incorrect line license header'}],
       output: `#!/usr/bin/env node
 
-// Copyright 2021 The Chromium Authors. All rights reserved.
+// Copyright ${CURRENT_YEAR} The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 

package/front_end/global_typings/intl_display_names.d.ts

@@ -1,111 +0,0 @@
-declare namespace Intl {
-  /**
-   * An object with properties reflecting the locale
-   * and styles options computed during initialization
-   * of the `Intl.DisplayNames` object
-   *
-   * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DisplayNames/resolvedOptions#Description).
-   *
-   * [Specification](https://tc39.es/ecma402/#sec-intl-displaynames-constructor)
-   */
-  interface DisplayNamesOptions {
-    localeMatcher: RelativeTimeFormatLocaleMatcher;
-    style: RelativeTimeFormatStyle;
-    type: 'language'|'region'|'script'|'currency';
-    fallback: 'code'|'none';
-  }
-
-  interface DisplayNames {
-    /**
-       * Receives a code and returns a string based on the locale and options provided when instantiating
-       * [`Intl.DisplayNames()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DisplayNames)
-       *
-       * @param code The `code` to provide depends on the `type`:
-       *  - If the type is "region", code should be either an [ISO-3166 two letters region code](https://www.iso.org/iso-3166-country-codes.html),
-       *    or a [three digits UN M49 Geographic Regions](https://unstats.un.org/unsd/methodology/m49/).
-       *  - If the type is "script", code should be an [ISO-15924 four letters script code](https://unicode.org/iso15924/iso15924-codes.html).
-       *  - If the type is "language", code should be a `languageCode` ["-" `scriptCode`] ["-" `regionCode` ] *("-" `variant` )
-       *    subsequence of the unicode_language_id grammar in [UTS 35's Unicode Language and Locale Identifiers grammar](https://unicode.org/reports/tr35/#Unicode_language_identifier).
-       *    `languageCode` is either a two letters ISO 639-1 language code or a three letters ISO 639-2 language code.
-       *  - If the type is "currency", code should be a [3-letter ISO 4217 currency code](https://www.iso.org/iso-4217-currency-codes.html).
-       *
-       * @returns A language-specific formatted string.
-       *
-       * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DisplayNames/of).
-       *
-       * [Specification](https://tc39.es/ecma402/#sec-Intl.DisplayNames.prototype.of).
-       */
-    of(code: string): string;
-    /**
-       * Returns a new object with properties reflecting the locale and style formatting options computed during the construction of the current
-       * [`Intl/DisplayNames`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DisplayNames) object.
-       *
-       * @returns An object with properties reflecting the locale and formatting options computed during the construction of the
-       *  given [`Intl/DisplayNames`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DisplayNames) object.
-       *
-       * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DisplayNames/resolvedOptions).
-       *
-       * [Specification](https://tc39.es/ecma402/#sec-Intl.DisplayNames.prototype.resolvedOptions)
-       */
-    resolvedOptions(): DisplayNamesOptions;
-  }
-
-  /**
-   * The [`Intl.DisplayNames()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DisplayNames)
-   * object enables the consistent translation of language, region and script display names.
-   *
-   * Part of [Intl object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl)
-   * namespace and the [ECMAScript Internationalization API](https://www.ecma-international.org/publications/standards/Ecma-402.htm).
-   *
-   * [Compatibility](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DisplayNames#browser_compatibility).
-   */
-  const DisplayNames: {
-    prototype: DisplayNames;
-
-    /**
-       * Constructor creates [`Intl.DisplayNames`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DisplayNames)
-       * objects that enable the consistent translation of language, region and script display names.
-       *
-       * @param locales A string with a BCP 47 language tag, or an array of such strings.
-       *   For the general form and interpretation of the `locales` argument, see the [Intl](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#locale_identification_and_negotiation)
-       *   page. The following Unicode extension key is allowed:
-       *   - `nu` The numbering system to be used. Possible values include: `"arab"`, `"arabext"`, `"bali"`, `"beng"`, `"deva"`, `"fullwide"`, `"gujr"`, `"guru"`, `"hanidec"`, `"khmr"`, `"knda"`, `"laoo"`, `"latn"`, `"limb"`, `"mlym"`, `"mong"`, `"mymr"`, `"orya"`, `"tamldec"`, `"telu"`, `"thai"`, `"tibt"`.
-       *
-       * @param options An object with some or all of the following properties:
-       *   - `localeMatcher` The locale matching algorithm to use. Possible values are `"lookup"` and `"best fit"`; the default is `"best fit"`.
-       *     For information about this option, see the [Intl](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#locale_identification_and_negotiation) page.
-       *   - `style` The formatting style to use, the default is `"long"`. `"narrow"` `"short"` `"long"`
-       *   - `type` The type to use. `"language"` `"region"` `"script"` `"currency"`
-       *   - `fallback` The fallback to use, the default is `"code"`. `"code"` `"none"`
-       *
-       * @returns [Intl.DisplayNames](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DisplayNames) object.
-       *
-       * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DisplayNames/DisplayNames).
-       *
-       * [Specification](https://tc39.es/ecma402/#sec-intl-displaynames-constructor).
-       */
-    new (locales?: UnicodeBCP47LocaleIdentifier|UnicodeBCP47LocaleIdentifier[], options?: Partial<DisplayNamesOptions>):
-        DisplayNames;
-
-    /**
-       * Returns an array containing those of the provided locales that are supported in display names without having to fall back to the runtime's default locale.
-       *
-       * @param locales A string with a BCP 47 language tag, or an array of such strings.
-       *   For the general form and interpretation of the `locales` argument, see the [Intl](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#locale_identification_and_negotiation)
-       *   page.
-       *
-       * @param options An object that may have the following property:
-       *   - `localeMatcher` The locale matching algorithm to use. Possible values are `"lookup"` and `"best fit"`; the default is `"best fit"`.
-       *     For information about this option, see the [Intl](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#locale_identification_and_negotiation) page.
-       *
-       * @returns An array of strings representing a subset of the given locale tags that are supported in display names without having to fall back to the runtime's default locale.
-       *
-       * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DisplayNames/supportedLocalesOf).
-       *
-       * [Specification](https://tc39.es/ecma402/#sec-Intl.DisplayNames.supportedLocalesOf).
-       */
-    supportedLocalesOf(
-        locales: UnicodeBCP47LocaleIdentifier|UnicodeBCP47LocaleIdentifier[],
-        options: {localeMatcher: RelativeTimeFormatLocaleMatcher}): UnicodeBCP47LocaleIdentifier[];
-  };
-}