chrome-devtools-frontend 1.0.1035963 → 1.0.1036501

package/AUTHORS

@@ -17,6 +17,7 @@ Alexey Rodionov <fluorescent.hallucinogen@gmail.com>
 Ankit Mishra <ankit.mishra131990@gmail.com>
 Anna Agoha <annaagoha@gmail.com>
 Anthony Xie <anthonyxie64@gmail.com>
+Boris Verkhovskiy <boris.verk@gmail.com>
 Carl Espe <carl@cpespe.com>
 Conner Turner <cturner@zyme.xyz>
 Daniel bellfield <dnlbellfield@gmail.com>

package/front_end/models/persistence/NetworkPersistenceManager.ts

@@ -622,19 +622,27 @@ export class NetworkPersistenceManager extends Common.ObjectWrapper.ObjectWrappe
     }
   }
 
-  mergeHeaders(baseHeaders: Protocol.Fetch.HeaderEntry[], overrideHeaders: Protocol.Network.Headers):
+  mergeHeaders(baseHeaders: Protocol.Fetch.HeaderEntry[], overrideHeaders: Protocol.Fetch.HeaderEntry[]):
       Protocol.Fetch.HeaderEntry[] {
-    const result: Protocol.Fetch.HeaderEntry[] = [];
-    const headerMap = new Map<string, string>();
-    for (const header of baseHeaders) {
-      headerMap.set(header.name, header.value);
+    const headerMap = new Platform.MapUtilities.Multimap<string, string>();
+    for (const {name, value} of overrideHeaders) {
+      headerMap.set(name.toLowerCase(), value);
     }
-    for (const [headerName, headerValue] of Object.entries(overrideHeaders)) {
-      headerMap.set(headerName, headerValue);
+
+    const overriddenHeaderNames = new Set(headerMap.keysArray());
+    for (const {name, value} of baseHeaders) {
+      const lowerCaseName = name.toLowerCase();
+      if (!overriddenHeaderNames.has(lowerCaseName)) {
+        headerMap.set(lowerCaseName, value);
+      }
+    }
+
+    const result: Protocol.Fetch.HeaderEntry[] = [];
+    for (const headerName of headerMap.keysArray()) {
+      for (const headerValue of headerMap.get(headerName)) {
+        result.push({name: headerName, value: headerValue});
+      }
     }
-    headerMap.forEach((headerValue, headerName) => {
-      result.push({name: headerName, value: headerValue});
-    });
     return result;
   }
 
@@ -766,20 +774,23 @@ export type EventTypes = {
 
 export interface HeaderOverride {
   applyTo: string;
-  headers: Protocol.Network.Headers;
+  headers: Protocol.Fetch.HeaderEntry[];
 }
 
 interface HeaderOverrideWithRegex {
   applyToRegex: RegExp;
-  headers: Protocol.Network.Headers;
+  headers: Protocol.Fetch.HeaderEntry[];
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function isHeaderOverride(arg: any): arg is HeaderOverride {
-  if (!(arg && arg.applyTo && typeof (arg.applyTo === 'string') && arg.headers && Object.keys(arg.headers).length)) {
+  if (!(arg && arg.applyTo && typeof arg.applyTo === 'string' && arg.headers && arg.headers.length &&
+        Array.isArray(arg.headers))) {
     return false;
   }
-  return Object.values(arg.headers).every(value => typeof value === 'string');
+  return arg.headers.every(
+      (header: Protocol.Fetch.HeaderEntry) =>
+          header.name && typeof header.name === 'string' && header.value && typeof header.value === 'string');
 }
 
 export function escapeRegex(pattern: string): string {

package/front_end/panels/elements/CSSRuleValidator.ts

@@ -142,7 +142,7 @@ export class AlignContentValidator extends CSSRuleValidator {
     if (this.#isRuleValid(computedStyles)) {
       return;
     }
-    const reasonPropertyDeclaration = buildPropertyText('flex-wrap');
+    const reasonPropertyDeclaration = buildPropertyDefinitionText('flex-wrap', 'nowrap');
     const affectedPropertyDeclarationCode = buildPropertyText('align-content');
 
     return new Hint(

package/front_end/panels/elements/StylePropertiesSection.ts

@@ -298,6 +298,18 @@ export class StylePropertiesSection {
     this.parentsComputedStyles = parentsComputedStyles;
   }
 
+  updateAuthoringHint(): void {
+    let child = this.propertiesTreeOutline.firstChild();
+    while (child) {
+      if (child instanceof StylePropertyTreeElement) {
+        child.setComputedStyles(this.computedStyles);
+        child.setParentsComputedStyles(this.parentsComputedStyles);
+        child.updateAuthoringHint();
+      }
+      child = child.nextSibling;
+    }
+  }
+
   setSectionIdx(sectionIdx: number): void {
     this.sectionIdx = sectionIdx;
     this.onpopulate();

package/front_end/panels/elements/StylePropertyTreeElement.ts

@@ -761,7 +761,7 @@ export class StylePropertyTreeElement extends UI.TreeOutline.TreeElement {
     }
   }
 
-  private updateAuthoringHint(): void {
+  updateAuthoringHint(): void {
     if (!Root.Runtime.experiments.isEnabled(Root.Runtime.ExperimentName.CSS_AUTHORING_HINTS)) {
       return;
     }

package/front_end/panels/elements/StylesSidebarPane.ts

@@ -785,6 +785,7 @@ export class StylesSidebarPane extends Common.ObjectWrapper.eventMixin<EventType
     for (const section of this.allSections()) {
       section.setComputedStyles(computedStyles);
       section.setParentsComputedStyles(parentsComputedStyles);
+      section.updateAuthoringHint();
     }
   }
 

package/front_end/panels/network/NetworkLogView.ts

@@ -1662,7 +1662,7 @@ export class NetworkLogView extends Common.ObjectWrapper.eventMixin<EventTypes,
   }
 
   private async copyCurlCommand(request: SDK.NetworkRequest.NetworkRequest, platform: string): Promise<void> {
-    const command = await this.generateCurlCommand(request, platform);
+    const command = await NetworkLogView.generateCurlCommand(request, platform);
     Host.InspectorFrontendHost.InspectorFrontendHostInstance.copyText(command);
   }
 
@@ -2092,7 +2092,7 @@ export class NetworkLogView extends Common.ObjectWrapper.eventMixin<EventTypes,
     return commands.join(' ;\n');
   }
 
-  private async generateCurlCommand(request: SDK.NetworkRequest.NetworkRequest, platform: string): Promise<string> {
+  static async generateCurlCommand(request: SDK.NetworkRequest.NetworkRequest, platform: string): Promise<string> {
     let command: string[] = [];
     // Most of these headers are derived from the URL and are automatically added by cURL.
     // The |Accept-Encoding| header is ignored to prevent decompression errors. crbug.com/1015321
@@ -2115,7 +2115,7 @@ export class NetworkLogView extends Common.ObjectWrapper.eventMixin<EventTypes,
          gets to MS Crt parser safely.
 
          The % character is special because MS Crt parser will try and look for
-         ENV variables and fill them in it's place. We cannot escape them with %
+         ENV variables and fill them in its place. We cannot escape them with %
          and cannot escape them with ^ (because it's cmd.exe's escape not MS Crt
          parser); So we can get cmd.exe parser to escape the character after it,
          if it is followed by a valid beginning character of an ENV variable.
@@ -2191,7 +2191,14 @@ export class NetworkLogView extends Common.ObjectWrapper.eventMixin<EventTypes,
       if (ignoredHeaders.has(name.toLowerCase())) {
         continue;
       }
-      command.push('-H ' + escapeString(name + ': ' + header.value));
+      if (header.value.trim()) {
+        command.push('-H ' + escapeString(name + ': ' + header.value));
+      } else {
+        // A header passed with -H with no value or only whitespace as its
+        // value tells curl to not set the header at all. To post an empty
+        // header, you have to terminate it with a semicolon.
+        command.push('-H ' + escapeString(name + ';'));
+      }
     }
     command = command.concat(data);
     command.push('--compressed');
@@ -2205,7 +2212,8 @@ export class NetworkLogView extends Common.ObjectWrapper.eventMixin<EventTypes,
   private async generateAllCurlCommand(requests: SDK.NetworkRequest.NetworkRequest[], platform: string):
       Promise<string> {
     const nonBlobRequests = this.filterOutBlobRequests(requests);
-    const commands = await Promise.all(nonBlobRequests.map(request => this.generateCurlCommand(request, platform)));
+    const commands =
+        await Promise.all(nonBlobRequests.map(request => NetworkLogView.generateCurlCommand(request, platform)));
     if (platform === 'win') {
       return commands.join(' &\r\n');
     }

package/front_end/panels/sources/components/HeadersView.ts

@@ -9,6 +9,7 @@ import * as Buttons from '../../../ui/components/buttons/buttons.js';
 import * as ComponentHelpers from '../../../ui/components/helpers/helpers.js';
 import * as UI from '../../../ui/legacy/legacy.js';
 import * as LitHtml from '../../../ui/lit-html/lit-html.js';
+import type * as Protocol from '../../../generated/protocol.js';
 
 import HeadersViewStyles from './HeadersView.css.js';
 
@@ -81,23 +82,8 @@ export class HeadersView extends UI.View.SimpleView {
       parsingError = true;
     }
 
-    // Header overrides are stored as the key-value pairs of a JSON object on
-    // disk. For the editor we want them as an array instead, so that we can
-    // access/add/remove entries by their index.
-    const arrayOfHeaderOverrideArrays: HeaderOverride[] = headerOverrides.map(headerOverride => {
-      return {
-        applyTo: headerOverride.applyTo,
-        headers: Object.entries(headerOverride.headers).map(([headerName, headerValue]) => {
-          return {
-            name: headerName,
-            value: headerValue,
-          };
-        }),
-      };
-    });
-
     this.#headersViewComponent.data = {
-      headerOverrides: arrayOfHeaderOverrideArrays,
+      headerOverrides,
       uiSourceCode: this.#uiSourceCode,
       parsingError,
     };
@@ -128,18 +114,8 @@ export class HeadersView extends UI.View.SimpleView {
   }
 }
 
-type Header = {
-  name: string,
-  value: string,
-};
-
-type HeaderOverride = {
-  applyTo: string,
-  headers: Header[],
-};
-
 export interface HeadersViewComponentData {
-  headerOverrides: HeaderOverride[];
+  headerOverrides: Persistence.NetworkPersistenceManager.HeaderOverride[];
   uiSourceCode: Workspace.UISourceCode.UISourceCode;
   parsingError: boolean;
 }
@@ -148,7 +124,7 @@ export class HeadersViewComponent extends HTMLElement {
   static readonly litTagName = LitHtml.literal`devtools-sources-headers-view`;
   readonly #shadow = this.attachShadow({mode: 'open'});
   readonly #boundRender = this.#render.bind(this);
-  #headerOverrides: HeaderOverride[] = [];
+  #headerOverrides: Persistence.NetworkPersistenceManager.HeaderOverride[] = [];
   #uiSourceCode: Workspace.UISourceCode.UISourceCode|null = null;
   #parsingError = false;
   #focusElement: {blockIndex: number, headerIndex?: number}|null = null;
@@ -213,7 +189,7 @@ export class HeadersViewComponent extends HTMLElement {
     selection?.removeAllRanges();
   }
 
-  #generateNextHeaderName(headers: Header[]): string {
+  #generateNextHeaderName(headers: Protocol.Fetch.HeaderEntry[]): string {
     const takenNames = new Set<string>(headers.map(header => header.name));
     let idx = 1;
     while (takenNames.has('headerName' + idx)) {
@@ -270,17 +246,7 @@ export class HeadersViewComponent extends HTMLElement {
   }
 
   #onHeadersChanged(): void {
-    // In the editor header overrides are represented by items in an array, so
-    // that we can access/add/remove entries by their index. On disk, they are
-    // stored as key-value pairs of a JSON object instead.
-    const arrayOfHeaderOverrideObjects: Persistence.NetworkPersistenceManager.HeaderOverride[] =
-        this.#headerOverrides.map(headerOverride => {
-          return {
-            applyTo: headerOverride.applyTo,
-            headers: headerOverride.headers.reduce((a, v) => ({...a, [v.name]: v.value}), {}),
-          };
-        });
-    this.#uiSourceCode?.setWorkingCopy(JSON.stringify(arrayOfHeaderOverrideObjects, null, 2));
+    this.#uiSourceCode?.setWorkingCopy(JSON.stringify(this.#headerOverrides, null, 2));
   }
 
   #render(): void {
@@ -355,7 +321,8 @@ export class HeadersViewComponent extends HTMLElement {
     // clang-format on
   }
 
-  #renderHeaderRow(header: Header, blockIndex: number, headerIndex: number): LitHtml.TemplateResult {
+  #renderHeaderRow(header: Protocol.Fetch.HeaderEntry, blockIndex: number, headerIndex: number):
+      LitHtml.TemplateResult {
     // clang-format off
     return LitHtml.html`
       <div class="row padded" data-block-index=${blockIndex} data-header-index=${headerIndex}>

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

@@ -95,15 +95,17 @@ export class LinearMemoryHighlightChipList extends HTMLElement {
             <span class="value">${expressionName}</span><span class="separator">: </span><span>${expressionType}</span>
           </span>
         </button>
-        <button class="delete-highlight-button" title=${
-            i18nString(UIStrings.deleteHighlight)} @click=${():void => this.#onDeleteHighlightClick(highlightInfo)}>
-          <${IconButton.Icon.Icon.litTagName} .data=${{
-            iconName: 'close-icon',
-            color: 'black',
-            width: '7px',
-            } as IconButton.Icon.IconData}>
-          </${IconButton.Icon.Icon.litTagName}>
-        </button>
+        <div class="delete-highlight-container">
+          <button class="delete-highlight-button" title=${
+              i18nString(UIStrings.deleteHighlight)} @click=${():void => this.#onDeleteHighlightClick(highlightInfo)}>
+            <${IconButton.Icon.Icon.litTagName} .data=${{
+              iconName: 'close-icon',
+              color: 'var(--color-text-primary)',
+              width: '7px',
+              } as IconButton.Icon.IconData}>
+            </${IconButton.Icon.Icon.litTagName}>
+          </button>
+        </div>
       </div>
     `;
     // clang-format off

package/front_end/ui/components/linear_memory_inspector/linearMemoryHighlightChipList.css

@@ -5,81 +5,99 @@
  */
 
 .highlight-chip-list {
-  min-height: 24px;
+  min-height: 20px;
   display: flex;
   flex-wrap: wrap;
   justify-content: left;
   align-items: center;
   background-color: var(--color-background);
-  color: var(--color-text-primary);
+  margin: 8px 0;
+  gap: 8px;
+  row-gap: 6px;
 }
 
 .highlight-chip {
-  background: transparent;
-  color: var(--color-text-primary);
-  border: 1px solid var(--color-background-elevation-2);
-  height: 15px;
-  margin-right: 5px;
-  padding: 1px;
+  background: var(--color-background);
+  border: 1px solid var(--color-button-secondary-border);
+  height: 18px;
   border-radius: 4px;
-  margin-bottom: 1px;
-  display: flex;
+  flex: 0 0 auto;
+  max-width: 250px;
+  position: relative;
+  padding: 0 6px;
 }
 
 .highlight-chip:hover {
   background-color: var(--color-background-elevation-1);
 }
 
+.delete-highlight-container {
+  display: none;
+  height: 100%;
+  position: absolute;
+  right: 0;
+  top: 0;
+  border-radius: 4px;
+  width: 24px;
+  align-items: center;
+  justify-content: center;
+}
+
 .delete-highlight-button {
-  width: 15px;
-  height: 15px;
-  border: none;
-  padding: 0;
   cursor: pointer;
-  background: none;
-  border-radius: 50%;
+  width: 13px;
+  height: 13px;
+  border: none;
+  background-color: transparent;
   display: flex;
-  justify-content: center;
   align-items: center;
-  margin: 0 2px;
+  justify-content: center;
 }
 
 .delete-highlight-button:hover {
   background-color: var(--color-details-hairline);
+  border-radius: 50%;
 }
 
-.highlight-chip > .delete-highlight-button {
-  visibility: hidden;
+.highlight-chip:hover > .delete-highlight-container {
+  display: flex;
+  /* To avoid issues with stacking semi-transparent colors, we use a hardcoded solid color here. */
+  background: linear-gradient(90deg, transparent 0%, rgb(241 243 244) 25%); /* stylelint-disable-line plugin/use_theme_colors */
 }
 
-.highlight-chip:hover > .delete-highlight-button {
-  visibility: visible;
+:host-context(.-theme-with-dark-background) .highlight-chip:hover > .delete-highlight-container {
+  display: flex;
+  /* To avoid issues with stacking semi-transparent colors, we use a hardcoded solid color here. */
+  background: linear-gradient(90deg, transparent 0%, rgb(41 42 45) 25%); /* stylelint-disable-line plugin/use_theme_colors */
 }
 
 .jump-to-highlight-button {
   cursor: pointer;
-  padding: 0 0 0 4px;
+  padding: 0;
   border: none;
   background: none;
-  display: flex;
+  height: 100%;
   align-items: center;
-}
-
-.jump-to-highlight-button:hover {
-  color: var(--color-text-primary);
+  max-width: 100%;
+  overflow: hidden;
 }
 
 .delete-highlight-button devtools-icon {
-  --icon-color: var(--color-text-primary);
+  width: 13px;
+  height: 13px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
 }
 
 .source-code {
   font-family: var(--source-code-font-family);
   font-size: var(--source-code-font-size);
-  max-width: 250px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  color: var(--color-text-primary);
 }
 
 .value {

package/package.json

@@ -56,5 +56,5 @@
     "unittest": "scripts/test/run_unittests.py --no-text-coverage",
     "watch": "vpython third_party/node/node.py --output scripts/watch_build.js"
   },
-  "version": "1.0.1035963"
+  "version": "1.0.1036501"
 }