chrome-devtools-frontend 1.0.1518653 → 1.0.1520139

package/front_end/panels/network/NetworkDataGridNode.ts

@@ -771,6 +771,24 @@ export class NetworkRequestNode extends NetworkNode {
     return aScore - bScore || aRequest.identityCompare(bRequest);
   }
 
+  static IsAdRelatedComparator(a: NetworkNode, b: NetworkNode): number {
+    // TODO(allada) Handle this properly for group nodes.
+    const aRequest = a.requestOrFirstKnownChildRequest();
+    const bRequest = b.requestOrFirstKnownChildRequest();
+    if (!aRequest || !bRequest) {
+      return !aRequest ? -1 : 1;
+    }
+    const aIsAdRelated = aRequest.isAdRelated();
+    const bIsAdRelated = bRequest.isAdRelated();
+    if (aIsAdRelated > bIsAdRelated) {
+      return 1;
+    }
+    if (bIsAdRelated > aIsAdRelated) {
+      return -1;
+    }
+    return aRequest.identityCompare(bRequest);
+  }
+
   static RequestPropertyComparator(propertyName: string, a: NetworkNode, b: NetworkNode): number {
     // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration)
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1038,6 +1056,10 @@ export class NetworkRequestNode extends NetworkNode {
         this.renderAddressSpaceCell(cell, this.requestInternal.remoteAddressSpace());
         break;
       }
+      case 'is-ad-related': {
+        this.setTextAndTitle(cell, this.requestInternal.isAdRelated().toLocaleString());
+        break;
+      }
       case 'cookies': {
         this.setTextAndTitle(cell, this.arrayLength(this.requestInternal.includedRequestCookies()));
         break;

package/front_end/panels/network/NetworkLogViewColumns.ts

@@ -148,6 +148,10 @@ const UIStrings = {
    * @description Text in Network Log View Columns of the Network panel
    */
   remoteAddressSpace: 'Remote Address Space',
+  /**
+   * @description Text to show whether a request is ad-related
+   */
+  isAdRelated: 'Is Ad-Related',
 } as const;
 const str_ = i18n.i18n.registerUIStrings('panels/network/NetworkLogViewColumns.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
@@ -1183,6 +1187,11 @@ const DEFAULT_COLUMNS = [
     title: i18n.i18n.lockedLazyString('User-Agent'),
     sortingFunction: NetworkRequestNode.RequestHeaderStringComparator.bind(null, 'user-agent'),
   },
+  {
+    id: 'is-ad-related',
+    title: i18nLazyString(UIStrings.isAdRelated),
+    sortingFunction: NetworkRequestNode.IsAdRelatedComparator,
+  },
   // This header is a placeholder to let datagrid know that it can be sorted by this column, but never shown.
   {
     id: 'waterfall',

package/front_end/panels/recorder/components/CreateRecordingView.ts

@@ -8,6 +8,7 @@ import '../../../ui/components/icon_button/icon_button.js';
 import './ControlButton.js';
 
 import * as i18n from '../../../core/i18n/i18n.js';
+import * as Badges from '../../../models/badges/badges.js';
 import * as Buttons from '../../../ui/components/buttons/buttons.js';
 import * as Input from '../../../ui/components/input/input.js';
 import * as Lit from '../../../ui/lit/lit.js';
@@ -231,6 +232,7 @@ export class CreateRecordingView extends HTMLElement {
             selectorAttribute,
             ),
     );
+    Badges.UserBadges.instance().recordAction(Badges.BadgeAction.RECORDER_RECORDING_STARTED);
   }
 
   #dispatchRecordingCancelled(): void {

package/front_end/panels/recorder/components/RecordingView.ts

@@ -220,9 +220,9 @@ function renderSettings({
   replayState,
   onReplaySettingsKeydown,
   onToggleReplaySettings
-}: ViewInput): Lit.TemplateResult {
+}: ViewInput): Lit.LitTemplate {
   if (!settings) {
-    return html``;
+    return Lit.nothing;
   }
   const environmentFragments = [];
   if (settings.viewportSettings) {

package/front_end/panels/search/SearchResultsPane.ts

@@ -1,16 +1,13 @@
 // Copyright 2014 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-/* eslint-disable rulesdir/no-imperative-dom-api */
-/* eslint-disable rulesdir/no-lit-render-outside-of-view */
-
 import * as Common from '../../core/common/common.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as Platform from '../../core/platform/platform.js';
 import * as TextUtils from '../../models/text_utils/text_utils.js';
 import type * as Workspace from '../../models/workspace/workspace.js';
 import * as UI from '../../ui/legacy/legacy.js';
-import {html, render} from '../../ui/lit/lit.js';
+import {html, render, type TemplateResult} from '../../ui/lit/lit.js';
 
 import searchResultsPaneStyles from './searchResultsPane.css.js';
 import type {SearchResult} from './SearchScope.js';
@@ -41,143 +38,185 @@ interface SearchMatch {
   resultLabel: string|number;
 }
 
-export class SearchResultsPane extends UI.Widget.VBox {
-  private readonly searchConfig: Workspace.SearchConfig.SearchConfig;
-  private readonly searchResults = new Map<SearchResult, UI.TreeOutline.TreeElement>();
-  private expandedResults = new WeakSet<SearchResult>();
-  private readonly searchMatches = new WeakMap<SearchResult, SearchMatch[]>();
-  private treeOutline: UI.TreeOutline.TreeOutlineInShadow;
-  private matchesExpandedCount = 0;
-
-  private addTreeElement(searchResult: SearchResult): void {
-    const treeElement = new UI.TreeOutline.TreeElement('', true);
-    treeElement.toggleOnClick = true;
-    this.searchResults.set(searchResult, treeElement);
-    this.treeOutline.appendChild(treeElement);
-    if (!this.treeOutline.selectedTreeElement) {
-      treeElement.select(/* omitFocus */ true, /* selectedByUser */ true);
+interface ViewInput {
+  results: SearchResult[];
+  matches: WeakMap<SearchResult, SearchMatch[]>;
+  expandedResults: WeakSet<SearchResult>;
+  onSelectMatch: (searchResult: SearchResult, matchIndex: number) => void;
+  onExpandSearchResult: (searchResult: SearchResult) => void;
+  onShowMoreMatches: (searchResult: SearchResult) => void;
+}
+
+export type View = (input: ViewInput, output: unknown, target: HTMLElement) => void;
+
+export const DEFAULT_VIEW: View = (input, _output, target) => {
+  const {results, matches, expandedResults, onSelectMatch, onExpandSearchResult, onShowMoreMatches} = input;
+
+  const onExpand = ({detail: {expanded, target}}: UI.TreeOutline.TreeViewElement.ExpandEvent): void => {
+    const searchResultIndex = Number(target.dataset.searchResultIndex);
+    const searchResult = results[searchResultIndex];
+    if (expanded) {
+      expandedResults.add(searchResult);
+      onExpandSearchResult(searchResult);
+    } else {
+      expandedResults.delete(searchResult);
     }
-    treeElement.listItemElement.classList.add('search-result');
-    // clang-format off
-    render(html`
-      <span class="search-result-file-name">${searchResult.label()}
-        <span class="search-result-dash">${'\u2014'}</span>
-        <span class="search-result-qualifier">${searchResult.description()}</span>
-      </span>
-      <span class="search-result-matches-count"
-          aria-label=${i18nString(UIStrings.matchesCountS, {PH1: searchResult.matchesCount()})}>
-          ${searchResult.matchesCount()}
-      </span>`,
-    treeElement.listItemElement);
-    // clang-format on
-    treeElement.tooltip = searchResult.description();
+  };
+
+  // clang-format off
+  render(html`
+    <devtools-tree hide-overflow @expand=${onExpand} .template=${html`
+      <ul role="tree">
+        ${results.map((searchResult, i) => html`
+          <li role="treeitem" data-search-result-index=${i} class="search-result">
+            <style>${searchResultsPaneStyles}</style>
+            ${renderSearchResult(searchResult)}
+            <ul role="group" ?hidden=${!expandedResults.has(searchResult)}>
+              ${renderSearchMatches(searchResult, matches, onSelectMatch, onShowMoreMatches)}
+            </ul>
+          </li>`)}
+      </ul>
+    `}></devtools-tree>`,
+    target,
+  );
+  // clang-format on
+};
+
+const renderSearchResult = (searchResult: SearchResult): TemplateResult => {
+  // clang-format off
+  return html`
+    <span class="search-result-file-name">${searchResult.label()}
+      <span class="search-result-dash">${'\u2014'}</span>
+      <span class="search-result-qualifier">${searchResult.description()}</span>
+    </span>
+    <span class="search-result-matches-count"
+        aria-label=${i18nString(UIStrings.matchesCountS, {PH1: searchResult.matchesCount()})}>
+        ${searchResult.matchesCount()}
+    </span>`;
+  // clang-format on
+};
+
+const renderSearchMatches =
+    (searchResult: SearchResult, matches: WeakMap<SearchResult, SearchMatch[]>,
+     onSelectMatch: (searchResult: SearchResult, matchIndex: number) => void,
+     onShowMoreMatches: (searchResult: SearchResult) => void): TemplateResult => {
+      const visibleMatches = matches.get(searchResult) ?? [];
+      const matchesLeftCount = searchResult.matchesCount() - visibleMatches.length;
+      // clang-format off
+  return html`
+      ${visibleMatches.map(({lineContent, matchRanges, resultLabel}, i) => html`
+        <li role="treeitem" class="search-match" @click=${() => onSelectMatch(searchResult, i)}
+          ${UI.TreeOutline.TreeSearch.highlight(matchRanges.map(range =>
+            ({offset: range.offset + `${resultLabel}`.length, length: range.length})), undefined)}
+          @keydown=${(event: KeyboardEvent) => {
+            if (event.key === 'Enter') {
+              onSelectMatch(searchResult, i);
+            }
+          }}
+        >
+          <button class="devtools-link text-button link-style search-match-link"
+                  jslog="Link; context: search-match; track: click" role="link" tabindex="0"
+                  @click=${() => void Common.Revealer.reveal(searchResult.matchRevealable(i))}>
+            <span class="search-match-line-number"
+                aria-label=${typeof resultLabel === 'number' && !isNaN(resultLabel)
+                                ? i18nString(UIStrings.lineS, {PH1: resultLabel}) : resultLabel}>
+              ${resultLabel}
+            </span>
+            <span class="search-match-content" aria-label="${lineContent} line">
+              ${lineContent}
+            </span>
+          </button>
+        </li>`)}
+      ${
+      matchesLeftCount > 0 ? html`
+        <li role="treeitem" class="show-more-matches" @click=${() => onShowMoreMatches(searchResult)}>
+          ${i18nString(UIStrings.showDMore, { PH1: matchesLeftCount })}
+        </li>` : ''}`;
+      // clang-format on
+    };
+
+export class SearchResultsPane extends UI.Widget.VBox {
+  #searchConfig: Workspace.SearchConfig.SearchConfig|null = null;
+  #searchResults: SearchResult[] = [];
+  #resultsUpdated = false;
+  #expandedResults = new WeakSet<SearchResult>();
+  readonly #searchMatches = new WeakMap<SearchResult, SearchMatch[]>();
+  #view: View;
+
+  constructor(element: HTMLElement|undefined, view: View = DEFAULT_VIEW) {
+    super(element, {useShadowDom: true});
+    this.#view = view;
   }
 
-  private appendSearchMatchElement(searchResult: SearchResult, match: SearchMatch, i: number): void {
-    const {lineContent, matchRanges, resultLabel} = match;
-    const element = this.searchResults.get(searchResult);
-    if (!element) {
+  get searchResults(): SearchResult[] {
+    return this.#searchResults;
+  }
+
+  set searchResults(searchResults: SearchResult[]) {
+    if (this.#searchResults === searchResults) {
       return;
     }
-    const searchMatchElement = new UI.TreeOutline.TreeElement();
-    element.appendChild(searchMatchElement);
-    // clang-format off
-    render(html`
-      <button class="devtools-link text-button link-style search-match-link"
-              jslog="Link; context: search-match; track: click" role="link" tabindex="0"
-              @click=${() => void Common.Revealer.reveal(searchResult.matchRevealable(i))}>
-        <span class="search-match-line-number"
-            aria-label=${typeof resultLabel === 'number' && !isNaN(resultLabel)
-                            ?  i18nString(UIStrings.lineS, {PH1: resultLabel}) : resultLabel}>
-          ${resultLabel}
-        </span>
-        <span class="search-match-content" aria-label="${lineContent} line">
-          ${lineContent}
-        </span>
-      </button>`,
-      searchMatchElement.listItemElement);
-    // clang-format on
-    const contentSpan = searchMatchElement.listItemElement.querySelector('.search-match-content') as HTMLElement;
-    UI.UIUtils.highlightRangesWithStyleClass(contentSpan, matchRanges, 'highlighted-search-result');
-    searchMatchElement.listItemElement.className = 'search-match';
-    searchMatchElement.listItemElement.addEventListener('keydown', event => {
-      if (event.key === 'Enter') {
-        event.consume(true);
-        void Common.Revealer.reveal(searchResult.matchRevealable(i));
+    if (this.#searchResults.length !== searchResults.length) {
+      this.#resultsUpdated = true;
+    } else if (this.#searchResults.length === searchResults.length) {
+      for (let i = 0; i < this.#searchResults.length; ++i) {
+        if (this.#searchResults[i] === searchResults[i]) {
+          continue;
+        }
+        this.#resultsUpdated = true;
+        break;
       }
-    });
-    searchMatchElement.tooltip = lineContent;
+    }
+    if (!this.#resultsUpdated) {
+      return;
+    }
+    this.#searchResults = searchResults;
+    this.requestUpdate();
   }
 
-  constructor(searchConfig: Workspace.SearchConfig.SearchConfig) {
-    super({useShadowDom: true});
-    this.searchConfig = searchConfig;
-    this.treeOutline = new UI.TreeOutline.TreeOutlineInShadow();
-    this.treeOutline.registerRequiredCSS(searchResultsPaneStyles);
-    this.treeOutline.setHideOverflow(true);
-    this.treeOutline.addEventListener(
-        UI.TreeOutline.Events.ElementExpanded,
-        (event: Common.EventTarget.EventTargetEvent<UI.TreeOutline.TreeElement>) => {
-          const searchResult = this.searchResults.entries().find(entry => entry[1] === event.data)?.[0];
-          if (!searchResult) {
-            return;
-          }
-          this.expandSearchResult(searchResult);
-        });
-
-    this.contentElement.appendChild(this.treeOutline.element);
-
-    this.matchesExpandedCount = 0;
+  get searchConfig(): Workspace.SearchConfig.SearchConfig|null {
+    return this.#searchConfig;
   }
 
-  addSearchResult(searchResult: SearchResult): void {
-    this.addTreeElement(searchResult);
-    // Expand until at least a certain number of matches is expanded.
-    if (this.matchesExpandedCount < matchesExpandedByDefault) {
-      this.searchResults.get(searchResult)?.expand();
-    }
+  set searchConfig(searchConfig: Workspace.SearchConfig.SearchConfig|null) {
+    this.#searchConfig = searchConfig;
+    this.requestUpdate();
   }
 
   showAllMatches(): void {
-    for (const searchResult of this.searchResults.keys()) {
-      const startMatchIndex = this.searchMatches.get(searchResult)?.length ?? 0;
-      this.appendSearchMatches(searchResult, startMatchIndex, searchResult.matchesCount());
+    for (const searchResult of this.#searchResults) {
+      const startMatchIndex = this.#searchMatches.get(searchResult)?.length ?? 0;
+      this.#appendSearchMatches(searchResult, startMatchIndex, searchResult.matchesCount());
+      this.#expandedResults.add(searchResult);
     }
+    this.requestUpdate();
   }
 
   collapseAllResults(): void {
-    for (const treeElement of this.searchResults.values()) {
-      treeElement.collapse();
-    }
+    this.#expandedResults = new WeakSet<SearchResult>();
+    this.requestUpdate();
   }
 
-  private expandSearchResult(searchResult: SearchResult): void {
+  #onExpandSearchResult(searchResult: SearchResult): void {
     const toIndex = Math.min(searchResult.matchesCount(), matchesShownAtOnce);
-    if (toIndex < searchResult.matchesCount()) {
-      this.appendSearchMatches(searchResult, 0, toIndex - 1);
-      this.appendShowMoreMatchesElement(searchResult, toIndex - 1);
-    } else {
-      this.appendSearchMatches(searchResult, 0, toIndex);
-    }
-    this.matchesExpandedCount += toIndex;
+    this.#appendSearchMatches(searchResult, 0, toIndex);
     this.requestUpdate();
   }
 
-  private collapseSearchResult(searchResult: SearchResult): void {
-    this.searchResults.get(searchResult)?.collapse();
-  }
-
-  private appendSearchMatches(searchResult: SearchResult, fromIndex: number, toIndex: number): void {
-    const queries = this.searchConfig.queries();
+  #appendSearchMatches(searchResult: SearchResult, fromIndex: number, toIndex: number): void {
+    if (!this.#searchConfig) {
+      return;
+    }
+    const queries = this.#searchConfig.queries();
     const regexes = [];
     for (let i = 0; i < queries.length; ++i) {
       regexes.push(Platform.StringUtilities.createSearchRegex(
-          queries[i], !this.searchConfig.ignoreCase(), this.searchConfig.isRegex()));
+          queries[i], !this.#searchConfig.ignoreCase(), this.#searchConfig.isRegex()));
     }
 
-    const searchMatches = this.searchMatches.get(searchResult) ?? [];
-    this.searchMatches.set(searchResult, searchMatches);
-    if (searchMatches.length > toIndex) {
+    const searchMatches = this.#searchMatches.get(searchResult) ?? [];
+    this.#searchMatches.set(searchResult, searchMatches);
+    if (searchMatches.length >= toIndex) {
       return;
     }
 
@@ -197,32 +236,48 @@ export class SearchResultsPane extends UI.Widget.VBox {
       } else {
         lineContent = lineContent.trim();
         for (let j = 0; j < regexes.length; ++j) {
-          matchRanges = matchRanges.concat(this.regexMatchRanges(lineContent, regexes[j]));
+          matchRanges = matchRanges.concat(this.#regexMatchRanges(lineContent, regexes[j]));
         }
         ({lineSegment: lineContent, matchRanges} = lineSegmentForMultipleMatches(lineContent, matchRanges));
       }
 
       const resultLabel = searchResult.matchLabel(i);
       searchMatches.push({lineContent, matchRanges, resultLabel});
-      this.appendSearchMatchElement(searchResult, searchMatches[i], i);
     }
   }
 
-  private appendShowMoreMatchesElement(searchResult: SearchResult, startMatchIndex: number): void {
-    const element = this.searchResults.get(searchResult);
-    if (!element) {
-      return;
+  override performUpdate(): void {
+    if (this.#resultsUpdated) {
+      let matchesExpandedCount = 0;
+      for (const searchResult of this.#searchResults) {
+        if (this.#expandedResults.has(searchResult)) {
+          matchesExpandedCount += this.#searchMatches.get(searchResult)?.length ?? 0;
+        }
+      }
+      for (const searchResult of this.#searchResults) {
+        if (matchesExpandedCount < matchesExpandedByDefault && !this.#expandedResults.has(searchResult)) {
+          this.#expandedResults.add(searchResult);
+          this.#onExpandSearchResult(searchResult);
+          matchesExpandedCount += this.#searchMatches.get(searchResult)?.length ?? 0;
+        }
+      }
+      this.#resultsUpdated = false;
     }
-    const matchesLeftCount = searchResult.matchesCount() - startMatchIndex;
-    const showMoreMatchesText = i18nString(UIStrings.showDMore, {PH1: matchesLeftCount});
-    const showMoreMatchesTreeElement = new UI.TreeOutline.TreeElement(showMoreMatchesText);
-    element.appendChild(showMoreMatchesTreeElement);
-    showMoreMatchesTreeElement.listItemElement.classList.add('show-more-matches');
-    showMoreMatchesTreeElement.onselect =
-        this.showMoreMatchesElementSelected.bind(this, searchResult, showMoreMatchesTreeElement, startMatchIndex);
+    this.#view(
+        {
+          results: this.#searchResults,
+          matches: this.#searchMatches,
+          expandedResults: this.#expandedResults,
+          onSelectMatch: (searchResult, matchIndex) => {
+            void Common.Revealer.reveal(searchResult.matchRevealable(matchIndex));
+          },
+          onExpandSearchResult: this.#onExpandSearchResult.bind(this),
+          onShowMoreMatches: this.#onShowMoreMatches.bind(this),
+        },
+        {}, this.contentElement);
   }
 
-  private regexMatchRanges(lineContent: string, regex: RegExp): TextUtils.TextRange.SourceRange[] {
+  #regexMatchRanges(lineContent: string, regex: RegExp): TextUtils.TextRange.SourceRange[] {
     regex.lastIndex = 0;
     let match;
     const matchRanges = [];
@@ -233,13 +288,10 @@ export class SearchResultsPane extends UI.Widget.VBox {
     return matchRanges;
   }
 
-  private showMoreMatchesElementSelected(
-      searchResult: SearchResult, showMoreMatchesTreeElement: UI.TreeOutline.TreeElement,
-      startMatchIndex: number): boolean {
-    const parentElement = showMoreMatchesTreeElement.parent;
-    parentElement?.removeChild(showMoreMatchesTreeElement);
-    this.appendSearchMatches(searchResult, startMatchIndex, searchResult.matchesCount());
-    return true;
+  #onShowMoreMatches(searchResult: SearchResult): void {
+    const startMatchIndex = this.#searchMatches.get(searchResult)?.length ?? 0;
+    this.#appendSearchMatches(searchResult, startMatchIndex, searchResult.matchesCount());
+    this.requestUpdate();
   }
 }