chrome-devtools-frontend 1.0.927127 → 1.0.928589

package/front_end/core/sdk/CSSMetadata.ts

@@ -1,3 +1,7 @@
+// Copyright 2021 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.
+
 /*
  * Copyright (C) 2010 Nikita Vasilyev. All rights reserved.
  * Copyright (C) 2010 Joseph Pecoraro. All rights reserved.
@@ -13,7 +17,7 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of Google Inc. nor the names of its
+ *     * Neither the #name of Google Inc. nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
@@ -35,58 +39,58 @@ import * as Common from '../common/common.js';
 import * as Platform from '../platform/platform.js';
 
 export class CSSMetadata {
-  private readonly values: string[];
-  private readonly longhands: Map<string, string[]>;
-  private readonly shorthands: Map<string, string[]>;
-  private readonly inherited: Set<string>;
-  private readonly svgProperties: Set<string>;
-  private readonly propertyValues: Map<string, string[]>;
-  private readonly aliasesFor: Map<string, string>;
-  private valuesSet: Set<string>;
-  private readonly nameValuePresetsInternal: string[];
-  private readonly nameValuePresetsIncludingSVG: string[];
+  readonly #values: string[];
+  readonly #longhands: Map<string, string[]>;
+  readonly #shorthands: Map<string, string[]>;
+  readonly #inherited: Set<string>;
+  readonly #svgProperties: Set<string>;
+  readonly #propertyValues: Map<string, string[]>;
+  readonly #aliasesFor: Map<string, string>;
+  #valuesSet: Set<string>;
+  readonly #nameValuePresetsInternal: string[];
+  readonly #nameValuePresetsIncludingSVG: string[];
 
   constructor(properties: CSSPropertyDefinition[], aliasesFor: Map<string, string>) {
-    this.values = [];
-    this.longhands = new Map();
-    this.shorthands = new Map();
-    this.inherited = new Set();
-    this.svgProperties = new Set();
-    this.propertyValues = new Map();
-    this.aliasesFor = aliasesFor;
+    this.#values = [];
+    this.#longhands = new Map();
+    this.#shorthands = new Map();
+    this.#inherited = new Set();
+    this.#svgProperties = new Set();
+    this.#propertyValues = new Map();
+    this.#aliasesFor = aliasesFor;
     for (let i = 0; i < properties.length; ++i) {
       const property = properties[i];
       const propertyName = property.name;
       if (!CSS.supports(propertyName, 'initial')) {
         continue;
       }
-      this.values.push(propertyName);
+      this.#values.push(propertyName);
 
       if (property.inherited) {
-        this.inherited.add(propertyName);
+        this.#inherited.add(propertyName);
       }
       if (property.svg) {
-        this.svgProperties.add(propertyName);
+        this.#svgProperties.add(propertyName);
       }
 
       const longhands = properties[i].longhands;
       if (longhands) {
-        this.longhands.set(propertyName, longhands);
+        this.#longhands.set(propertyName, longhands);
         for (let j = 0; j < longhands.length; ++j) {
           const longhandName = longhands[j];
-          let shorthands = this.shorthands.get(longhandName);
+          let shorthands = this.#shorthands.get(longhandName);
           if (!shorthands) {
             shorthands = [];
-            this.shorthands.set(longhandName, shorthands);
+            this.#shorthands.set(longhandName, shorthands);
           }
           shorthands.push(propertyName);
         }
       }
     }
-    this.values.sort(CSSMetadata.sortPrefixesToEnd);
-    this.valuesSet = new Set(this.values);
+    this.#values.sort(CSSMetadata.sortPrefixesToEnd);
+    this.#valuesSet = new Set(this.#values);
 
-    // Reads in auto-generated property names and values from blink/public/renderer/core/css/css_properties.json5
+    // Reads in auto-generated property names and #values from blink/public/renderer/core/css/css_properties.json5
     // treats _generatedPropertyValues as basis
     const propertyValueSets = new Map<string, Set<string>>();
     for (const [propertyName, basisValueObj] of Object.entries(SupportedCSSProperties.generatedPropertyValues)) {
@@ -101,7 +105,7 @@ export class CSSMetadata {
         propertyValueSets.set(propertyName, new Set(extraValueObj.values));
       }
     }
-    // finally add common keywords to value sets and convert property values
+    // finally add common keywords to value sets and convert property #values
     // into arrays since callers expect arrays
     for (const [propertyName, values] of propertyValueSets) {
       for (const commonKeyword of CommonKeywords) {
@@ -110,20 +114,20 @@ export class CSSMetadata {
         }
       }
 
-      this.propertyValues.set(propertyName, [...values]);
+      this.#propertyValues.set(propertyName, [...values]);
     }
 
-    this.nameValuePresetsInternal = [];
-    this.nameValuePresetsIncludingSVG = [];
-    for (const name of this.valuesSet) {
+    this.#nameValuePresetsInternal = [];
+    this.#nameValuePresetsIncludingSVG = [];
+    for (const name of this.#valuesSet) {
       const values = this.specificPropertyValues(name)
                          .filter(value => CSS.supports(name, value))
                          .sort(CSSMetadata.sortPrefixesToEnd);
       const presets = values.map(value => `${name}: ${value}`);
       if (!this.isSVGProperty(name)) {
-        this.nameValuePresetsInternal.push(...presets);
+        this.#nameValuePresetsInternal.push(...presets);
       }
-      this.nameValuePresetsIncludingSVG.push(...presets);
+      this.#nameValuePresetsIncludingSVG.push(...presets);
     }
   }
 
@@ -140,24 +144,24 @@ export class CSSMetadata {
   }
 
   allProperties(): string[] {
-    return this.values;
+    return this.#values;
   }
 
   nameValuePresets(includeSVG?: boolean): string[] {
-    return includeSVG ? this.nameValuePresetsIncludingSVG : this.nameValuePresetsInternal;
+    return includeSVG ? this.#nameValuePresetsIncludingSVG : this.#nameValuePresetsInternal;
   }
 
   isSVGProperty(name: string): boolean {
     name = name.toLowerCase();
-    return this.svgProperties.has(name);
+    return this.#svgProperties.has(name);
   }
 
   getLonghands(shorthand: string): string[]|null {
-    return this.longhands.get(shorthand) || null;
+    return this.#longhands.get(shorthand) || null;
   }
 
   getShorthands(longhand: string): string[]|null {
-    return this.shorthands.get(longhand) || null;
+    return this.#shorthands.get(longhand) || null;
   }
 
   isColorAwareProperty(propertyName: string): boolean {
@@ -212,7 +216,7 @@ export class CSSMetadata {
   isStringProperty(propertyName: string): boolean {
     propertyName = propertyName.toLowerCase();
     // TODO(crbug.com/1033910): Generalize this to all CSS properties
-    // that accept <string> values.
+    // that accept <string> #values.
     return propertyName === 'content';
   }
 
@@ -222,7 +226,7 @@ export class CSSMetadata {
     }
     name = name.toLowerCase();
 
-    const aliasFor = this.aliasesFor.get(name);
+    const aliasFor = this.#aliasesFor.get(name);
     if (aliasFor) {
       return aliasFor;
     }
@@ -231,7 +235,7 @@ export class CSSMetadata {
       return name;
     }
     const match = name.match(/(?:-webkit-)(.+)/);
-    if (!match || !this.valuesSet.has(match[1])) {
+    if (!match || !this.#valuesSet.has(match[1])) {
       return name;
     }
     return match[1];
@@ -243,19 +247,19 @@ export class CSSMetadata {
         propertyName.startsWith('-ms-') || propertyName.startsWith('-o-') || propertyName.startsWith('-webkit-')) {
       return true;
     }
-    return this.valuesSet.has(propertyName);
+    return this.#valuesSet.has(propertyName);
   }
 
   isPropertyInherited(propertyName: string): boolean {
     propertyName = propertyName.toLowerCase();
-    return propertyName.startsWith('--') || this.inherited.has(this.canonicalPropertyName(propertyName)) ||
-        this.inherited.has(propertyName);
+    return propertyName.startsWith('--') || this.#inherited.has(this.canonicalPropertyName(propertyName)) ||
+        this.#inherited.has(propertyName);
   }
 
   private specificPropertyValues(propertyName: string): string[] {
     const unprefixedName = propertyName.replace(/^-webkit-/, '');
-    const propertyValues = this.propertyValues;
-    // propertyValues acts like cache; missing properties are added with possible common keywords
+    const propertyValues = this.#propertyValues;
+    // #propertyValues acts like cache; missing properties are added with possible common keywords
     let keywords: (string[]|undefined) = propertyValues.get(propertyName) || propertyValues.get(unprefixedName);
     if (!keywords) {
       keywords = [];
@@ -318,7 +322,7 @@ export const URLRegex = /url\(\s*('.+?'|".+?"|[^)]+)\s*\)/g;
  *    "a a ."
  *
  * 'grid', 'grid-template', e.g.
- *    [track-name] "a a ." minmax(50px, auto) [track-name]
+ *    [track-#name] "a a ." minmax(50px, auto) [track-#name]
  */
 export const GridAreaRowRegex = /((?:\[[\w\- ]+\]\s*)*(?:"[^"]+"|'[^']+'))[^'"\[]*\[?[^'"\[]*/;
 
@@ -494,7 +498,7 @@ const angleAwareProperties = new Set<string>([
   'font-style',
 ]);
 
-// manually maintained list of property values to add into autocomplete list
+// manually maintained list of property #values to add into autocomplete list
 const extraPropertyValues = {
   'background-repeat': {values: ['repeat', 'repeat-x', 'repeat-y', 'no-repeat', 'space', 'round']},
   'content': {values: ['normal', 'close-quote', 'no-close-quote', 'no-open-quote', 'open-quote']},