chrome-devtools-frontend 1.0.1636056 → 1.0.1640418

package/front_end/panels/sources/BreakpointsView.ts

@@ -300,7 +300,7 @@ export class BreakpointsSidebarController implements UI.ContextFlavorListener.Co
     }
 
     const locationsGroupedById = this.#groupBreakpointLocationsById(breakpointLocations);
-    const locationIdsByLineId = this.#getLocationIdsByLineId(breakpointLocations);
+    const locationIdsByLineId = this.#getLocationIdsByLineId(locationsGroupedById);
 
     const [content, selectedUILocation] = await Promise.all([
       this.#getContent(locationsGroupedById),
@@ -312,9 +312,9 @@ export class BreakpointsSidebarController implements UI.ContextFlavorListener.Co
     for (let idx = 0; idx < locationsGroupedById.length; idx++) {
       const locations = locationsGroupedById[idx];
       const fstLocation = locations[0];
-      const sourceURL = fstLocation.uiLocation.uiSourceCode.url();
-      const scriptId = fstLocation.uiLocation.uiSourceCode.canonicalScriptId();
-      const uiLocation = fstLocation.uiLocation;
+      const uiLocation = fstLocation.breakpoint.getClosestResolvedLocation() || fstLocation.uiLocation;
+      const sourceURL = uiLocation.uiSourceCode.url();
+      const scriptId = uiLocation.uiSourceCode.canonicalScriptId();
 
       const isHit = selectedUILocation !== null &&
           locations.some(location => location.uiLocation.id() === selectedUILocation.id());
@@ -334,8 +334,8 @@ export class BreakpointsSidebarController implements UI.ContextFlavorListener.Co
       }
       const expanded = !this.#collapsedFiles.has(sourceURL);
 
-      const status: BreakpointStatus = this.#getBreakpointState(locations);
-      const {type, hoverText} = this.#getBreakpointTypeAndDetails(locations);
+      const status: BreakpointStatus = this.#getBreakpointState(fstLocation.breakpoint);
+      const {type, hoverText} = this.#getBreakpointTypeAndDetails(fstLocation.breakpoint);
       const item = {
         id: fstLocation.breakpoint.breakpointStorageId(),
         location: locationText,
@@ -403,15 +403,13 @@ export class BreakpointsSidebarController implements UI.ContextFlavorListener.Co
     this.#collapsedFilesSettings.set(Array.from(this.#collapsedFiles.values()));
   }
 
-  #getBreakpointTypeAndDetails(locations: Breakpoints.BreakpointManager.BreakpointLocation[]):
+  #getBreakpointTypeAndDetails(breakpoint: Breakpoints.BreakpointManager.Breakpoint):
       {type: SDK.DebuggerModel.BreakpointType, hoverText?: string} {
-    const breakpointWithCondition = locations.find(location => Boolean(location.breakpoint.condition()));
-    const breakpoint = breakpointWithCondition?.breakpoint;
-    if (!breakpoint?.condition()) {
+    const condition = breakpoint.condition();
+    if (!condition) {
       return {type: SDK.DebuggerModel.BreakpointType.REGULAR_BREAKPOINT};
     }
 
-    const condition = breakpoint.condition();
     if (breakpoint.isLogpoint()) {
       return {type: SDK.DebuggerModel.BreakpointType.LOGPOINT, hoverText: condition};
     }
@@ -456,49 +454,32 @@ export class BreakpointsSidebarController implements UI.ContextFlavorListener.Co
 
   #groupBreakpointLocationsById(breakpointLocations: Breakpoints.BreakpointManager.BreakpointLocation[]):
       Breakpoints.BreakpointManager.BreakpointLocation[][] {
-    const map = new Platform.MapUtilities.Multimap<string, Breakpoints.BreakpointManager.BreakpointLocation>();
-    for (const breakpointLocation of breakpointLocations) {
-      const uiLocation = breakpointLocation.uiLocation;
-      map.set(uiLocation.id(), breakpointLocation);
-    }
-    const arr: Breakpoints.BreakpointManager.BreakpointLocation[][] = [];
-    for (const id of map.keysArray()) {
-      const locations = Array.from(map.get(id));
-      if (locations.length) {
-        arr.push(locations);
-      }
-    }
-    return arr;
+    const map = Map.groupBy(breakpointLocations, loc => loc.breakpoint.breakpointStorageId());
+    return Array.from(map.values());
   }
 
-  #getLocationIdsByLineId(breakpointLocations: Breakpoints.BreakpointManager.BreakpointLocation[]):
+  #getLocationIdsByLineId(locationsGroupedById: Breakpoints.BreakpointManager.BreakpointLocation[][]):
       Platform.MapUtilities.Multimap<string, string> {
     const result = new Platform.MapUtilities.Multimap<string, string>();
 
-    for (const breakpointLocation of breakpointLocations) {
-      const uiLocation = breakpointLocation.uiLocation;
-      result.set(uiLocation.lineId(), uiLocation.id());
+    for (const locations of locationsGroupedById) {
+      const breakpoint = locations[0].breakpoint;
+      const uiLocation = breakpoint.getClosestResolvedLocation() || locations[0].uiLocation;
+      result.set(uiLocation.lineId(), breakpoint.breakpointStorageId());
     }
-
     return result;
   }
 
-  #getBreakpointState(locations: Breakpoints.BreakpointManager.BreakpointLocation[]): BreakpointStatus {
-    const hasEnabled = locations.some(location => location.breakpoint.enabled());
-    const hasDisabled = locations.some(location => !location.breakpoint.enabled());
-    let status: BreakpointStatus;
-    if (hasEnabled) {
-      status = hasDisabled ? BreakpointStatus.INDETERMINATE : BreakpointStatus.ENABLED;
-    } else {
-      status = BreakpointStatus.DISABLED;
-    }
-    return status;
+  #getBreakpointState(breakpoint: Breakpoints.BreakpointManager.Breakpoint): BreakpointStatus {
+    return breakpoint.enabled() ? BreakpointStatus.ENABLED : BreakpointStatus.DISABLED;
   }
 
-  #getContent(locations: Breakpoints.BreakpointManager.BreakpointLocation[][]):
+  #getContent(locationsGroupedById: Breakpoints.BreakpointManager.BreakpointLocation[][]):
       Promise<TextUtils.ContentData.ContentData[]> {
-    return Promise.all(locations.map(async ([{uiLocation: {uiSourceCode}}]) => {
-      const contentData = await uiSourceCode.requestContentData({cachedWasmOnly: true});
+    return Promise.all(locationsGroupedById.map(async locations => {
+      const fstLocation = locations[0];
+      const uiLocation = fstLocation.breakpoint.getClosestResolvedLocation() || fstLocation.uiLocation;
+      const contentData = await uiLocation.uiSourceCode.requestContentData({cachedWasmOnly: true});
       return TextUtils.ContentData.ContentData.contentDataOrEmpty(contentData);
     }));
   }

package/front_end/panels/sources/DebuggerPlugin.ts

@@ -1179,14 +1179,21 @@ export class DebuggerPlugin extends Plugin {
     }
     const {editor} = this;
     const breakpointLocations = this.breakpointManager.breakpointLocationsForUISourceCode(this.uiSourceCode);
-    return breakpointLocations.map(({uiLocation, breakpoint}) => {
+
+    // Group by breakpoint to de-duplicate
+    const uniqueBreakpoints = Map.groupBy(breakpointLocations, loc => loc.breakpoint);
+
+    const result = [];
+    for (const [breakpoint, locations] of uniqueBreakpoints) {
+      const closestUILoc = breakpoint.getClosestResolvedLocation() || locations[0].uiLocation;
       const editorLocation =
-          this.transformer.uiLocationToEditorLocation(uiLocation.lineNumber, uiLocation.columnNumber);
-      return {
+          this.transformer.uiLocationToEditorLocation(closestUILoc.lineNumber, closestUILoc.columnNumber);
+      result.push({
         position: editor.toOffset(editorLocation),
         breakpoint,
-      };
-    });
+      });
+    }
+    return result;
   }
 
   private lineBreakpoints(line: CodeMirror.Line): readonly Breakpoints.BreakpointManager.Breakpoint[] {

package/front_end/panels/sources/ScopeChainSidebarPane.ts

@@ -1,7 +1,6 @@
 // Copyright 2021 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 @devtools/no-imperative-dom-api */
 
 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
@@ -31,13 +30,14 @@
 
 import type * as Common from '../../core/common/common.js';
 import * as i18n from '../../core/i18n/i18n.js';
-import * as SDK from '../../core/sdk/sdk.js';
+import type * as SDK from '../../core/sdk/sdk.js';
 import * as Protocol from '../../generated/protocol.js';
 import * as SourceMapScopes from '../../models/source_map_scopes/source_map_scopes.js';
 import * as StackTrace from '../../models/stack_trace/stack_trace.js';
 import * as ObjectUI from '../../ui/legacy/components/object_ui/object_ui.js';
 import * as Components from '../../ui/legacy/components/utils/utils.js';
 import * as UI from '../../ui/legacy/legacy.js';
+import {html, nothing, render, type TemplateResult} from '../../ui/lit/lit.js';
 import * as VisualLogging from '../../ui/visual_logging/visual_logging.js';
 
 import scopeChainSidebarPaneStyles from './scopeChainSidebarPane.css.js';
@@ -69,32 +69,119 @@ const str_ = i18n.i18n.registerUIStrings('panels/sources/ScopeChainSidebarPane.t
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 let scopeChainSidebarPaneInstance: ScopeChainSidebarPane;
 
+interface ViewInput {
+  linkifier: Components.Linkifier.Linkifier;
+  isPaused: boolean;
+  scopeChain: Array<{
+    scope: SDK.DebuggerModel.ScopeChainEntry,
+    objectTree: ObjectUI.ObjectPropertiesSection.ObjectTree,
+  }>|null;
+}
+type View = (input: ViewInput, output: object, target: HTMLElement) => void;
+export const DEFAULT_VIEW: View = (input, output, target) => {
+  const createScopeSectionTreeElement =
+      (scope: SDK.DebuggerModel.ScopeChainEntry,
+       objectTree: ObjectUI.ObjectPropertiesSection.ObjectTree): TemplateResult => {
+        let emptyPlaceholder: Common.UIString.LocalizedString|null = null;
+        if (scope.type() === Protocol.Debugger.ScopeType.Local ||
+            scope.type() === Protocol.Debugger.ScopeType.Closure) {
+          emptyPlaceholder = i18nString(UIStrings.noVariables);
+        }
+        const icon = scope.icon();
+        const {title, subtitle} = scopeTitle(scope);
+        const section = new ObjectUI.ObjectPropertiesSection.RootElement(objectTree, input.linkifier, emptyPlaceholder);
+        section.listItemElement.classList.add('scope-chain-sidebar-pane-section');
+        section.listItemElement.setAttribute('aria-label', title);
+
+        const titleNode = document.createDocumentFragment();
+        // eslint-disable-next-line @devtools/no-lit-render-outside-of-view
+        render(
+            html`<div class='scope-chain-sidebar-pane-section-header tree-element-title'>${
+                icon ? html`<img class=scope-chain-sidebar-pane-section-icon src=${icon}>` : nothing}
+                   <div class=scope-chain-sidebar-pane-section-subtitle>${subtitle}</div>
+                   <div class=scope-chain-sidebar-pane-section-title>${title}</div>
+                 </div>`,
+            titleNode);
+        section.title = titleNode;
+
+        if (scope === input.scopeChain?.[0]?.scope) {
+          section.select(/* omitFocus */ true);
+        }
+
+        return html`<devtools-tree-wrapper .treeElement=${section}></devtools-tree-wrapper>`;
+      };
+
+  render(
+      // clang-format off
+      html`
+    <style>${scopeChainSidebarPaneStyles}</style>
+    ${input.scopeChain ? html`
+      <devtools-tree autofocus hide-overflow show-selection-on-keyboard-focus .template=${
+            html`<ul role=tree class="source-code object-properties-section">
+          <style>${ObjectUI.ObjectPropertiesSection.objectValueStyles}</style>
+          <style>${ObjectUI.ObjectPropertiesSection.objectPropertiesSectionStyles}</style>
+          <style>${scopeChainSidebarPaneStyles}</style>
+          ${input.scopeChain?.map(({scope, objectTree}) => createScopeSectionTreeElement(scope, objectTree)) ?? nothing}
+        </ul>`}>
+      </devtools-tree>` : html`
+      <div class=gray-info-message tabindex=-1>${
+          input.isPaused ? i18nString(UIStrings.loading) : i18nString(UIStrings.notPaused)}</div>`}
+    `,
+      // clang-format on
+      target);
+};
+
+function scopeTitle(scope: SDK.DebuggerModel.ScopeChainEntry): {title: string, subtitle: string|null} {
+  let title = scope.typeName();
+  if (scope.type() === Protocol.Debugger.ScopeType.Closure) {
+    const scopeName = scope.name();
+    if (scopeName) {
+      title = i18nString(UIStrings.closureS, {PH1: UI.UIUtils.beautifyFunctionName(scopeName)});
+    } else {
+      title = i18nString(UIStrings.closure);
+    }
+  }
+  let subtitle: string|null = scope.description();
+  if (!title || title === subtitle) {
+    subtitle = null;
+  }
+  return {title, subtitle};
+}
+
+function scopeKey(scope: SDK.DebuggerModel.ScopeChainEntry): string {
+  let title = scope.typeName();
+  if (scope.type() === Protocol.Debugger.ScopeType.Closure) {
+    const scopeName = scope.name();
+    if (scopeName) {
+      title = `Closure: ${UI.UIUtils.beautifyFunctionName(scopeName)}`;
+    } else {
+      title = 'Closure';
+    }
+  }
+  let subtitle: string|null = scope.description();
+  if (!title || title === subtitle) {
+    subtitle = null;
+  }
+  return title + (subtitle ? ':' + subtitle : '');
+}
 export class ScopeChainSidebarPane extends UI.Widget.VBox implements UI.ContextFlavorListener.ContextFlavorListener {
-  private readonly treeOutline: ObjectUI.ObjectPropertiesSection.ObjectPropertiesSectionsTreeOutline;
-  private readonly expandController: ObjectUI.ObjectPropertiesSection.ObjectPropertiesSectionsTreeExpandController;
-  private readonly linkifier: Components.Linkifier.Linkifier;
-  private infoElement: HTMLDivElement;
+  readonly #linkifier: Components.Linkifier.Linkifier;
+  #expansionTrackers = new Map<string, ObjectUI.ObjectPropertiesSection.ObjectTreeExpansionTracker>();
   #scopeChainModel: SourceMapScopes.ScopeChainModel.ScopeChainModel|null = null;
+  #scopeChain:
+      Array<{scope: SDK.DebuggerModel.ScopeChainEntry, objectTree: ObjectUI.ObjectPropertiesSection.ObjectTree}>|null =
+          null;
+  #view: View;
 
-  private constructor() {
-    super({
+  constructor(target?: HTMLElement, view = DEFAULT_VIEW) {
+    super(target, {
       jslog: `${VisualLogging.section('sources.scope-chain')}`,
       useShadowDom: true,
     });
-    this.registerRequiredCSS(scopeChainSidebarPaneStyles);
-
-    this.treeOutline = new ObjectUI.ObjectPropertiesSection.ObjectPropertiesSectionsTreeOutline();
-    this.treeOutline.registerRequiredCSS(scopeChainSidebarPaneStyles);
-    this.treeOutline.setHideOverflow(true);
-
-    this.treeOutline.setShowSelectionOnKeyboardFocus(/* show */ true);
-    this.expandController =
-        new ObjectUI.ObjectPropertiesSection.ObjectPropertiesSectionsTreeExpandController(this.treeOutline);
-    this.linkifier = new Components.Linkifier.Linkifier();
-    this.infoElement = document.createElement('div');
-    this.infoElement.className = 'gray-info-message';
-    this.infoElement.tabIndex = -1;
+
+    this.#linkifier = new Components.Linkifier.Linkifier();
     this.flavorChanged(UI.Context.Context.instance().flavor(StackTrace.StackTrace.DebuggableFrameFlavor));
+    this.#view = view;
   }
 
   static instance(): ScopeChainSidebarPane {
@@ -104,116 +191,92 @@ export class ScopeChainSidebarPane extends UI.Widget.VBox implements UI.ContextF
     return scopeChainSidebarPaneInstance;
   }
 
-  treeOutlineForTest(): ObjectUI.ObjectPropertiesSection.ObjectPropertiesSectionsTreeOutline {
-    return this.treeOutline;
+  /**
+   * @deprecated Required for legacy web tests via DebuggerTestRunner.js
+   */
+  get treeOutline(): ObjectUI.ObjectPropertiesSection.ObjectPropertiesSectionsTreeOutline|null {
+    const devtoolsTree = this.contentElement.querySelector('devtools-tree');
+    if (devtoolsTree) {
+      return (devtoolsTree as UI.TreeOutline.TreeViewElement).getInternalTreeOutlineForTest() as
+          ObjectUI.ObjectPropertiesSection.ObjectPropertiesSectionsTreeOutline;
+    }
+    return null;
   }
 
   flavorChanged(callFrame: StackTrace.StackTrace.DebuggableFrameFlavor|null): void {
     this.#scopeChainModel?.dispose();
     this.#scopeChainModel = null;
+    this.#scopeChain = null;
 
-    this.linkifier.reset();
-    this.contentElement.removeChildren();
-    this.contentElement.appendChild(this.infoElement);
+    this.#linkifier.reset();
 
     if (callFrame) {
-      // Resolving the scope may take a while to complete, so indicate to the user that something
-      // is happening (see https://crbug.com/1162416).
-      this.infoElement.textContent = i18nString(UIStrings.loading);
-
-      this.#scopeChainModel = new SourceMapScopes.ScopeChainModel.ScopeChainModel(callFrame.sdkFrame);
-      this.#scopeChainModel.addEventListener(
-          SourceMapScopes.ScopeChainModel.Events.SCOPE_CHAIN_UPDATED, event => this.buildScopeTreeOutline(event.data),
-          this);
-    } else {
-      this.infoElement.textContent = i18nString(UIStrings.notPaused);
-    }
-  }
-
-  override focus(): void {
-    if (this.hasFocus()) {
-      return;
+      const scopeChainModel = new SourceMapScopes.ScopeChainModel.ScopeChainModel(callFrame.sdkFrame);
+      this.#scopeChainModel = scopeChainModel;
+      this.#scopeChainModel.addEventListener(SourceMapScopes.ScopeChainModel.Events.SCOPE_CHAIN_UPDATED, event => {
+        if (this.#scopeChainModel === scopeChainModel) {
+          this.#buildScopeChain(event.data);
+        }
+      });
     }
 
-    if (UI.Context.Context.instance().flavor(SDK.DebuggerModel.DebuggerPausedDetails)) {
-      this.treeOutline.forceSelect();
-    }
+    this.requestUpdate();
   }
 
-  private buildScopeTreeOutline(eventScopeChain: SourceMapScopes.ScopeChainModel.ScopeChain): void {
-    const {scopeChain} = eventScopeChain;
+  override performUpdate(): void {
+    this.#view(
+        {
+          linkifier: this.#linkifier,
+          isPaused: Boolean(this.#scopeChainModel),
+          scopeChain: this.#scopeChain,
+        },
+        {}, this.contentElement);
+  }
 
-    this.treeOutline.removeChildren();
+  #buildScopeChain({scopeChain}: SourceMapScopes.ScopeChainModel.ScopeChain): void {
+    const oldExpansionTrackers = this.#expansionTrackers;
+    this.#expansionTrackers = new Map();
+    this.#scopeChain = [];
 
-    this.contentElement.removeChildren();
-    this.contentElement.appendChild(this.treeOutline.element);
-    let foundLocalScope = false;
-    for (const [i, scope] of scopeChain.entries()) {
-      if (scope.type() === Protocol.Debugger.ScopeType.Local) {
-        foundLocalScope = true;
+    for (const scope of scopeChain) {
+      const key = scopeKey(scope);
+      let expansionTracker = this.#expansionTrackers.get(key);
+      if (!expansionTracker) {
+        expansionTracker =
+            oldExpansionTrackers.get(key) ?? new ObjectUI.ObjectPropertiesSection.ObjectTreeExpansionTracker();
+        this.#expansionTrackers.set(key, expansionTracker);
       }
 
-      const section = this.createScopeSectionTreeElement(scope);
+      const objectTree = new ObjectUI.ObjectPropertiesSection.ObjectTree(scope.object(), {
+        propertiesMode: ObjectUI.ObjectPropertiesSection.ObjectPropertiesMode.ALL,
+        readOnly: false,
+        expansionTracker,
+      });
+      void expansionTracker.apply(objectTree);
+      objectTree.addExtraProperties(...scope.extraProperties());
       if (scope.type() === Protocol.Debugger.ScopeType.Global) {
-        section.collapse();
-      } else if (!foundLocalScope || scope.type() === Protocol.Debugger.ScopeType.Local) {
-        section.expand();
+        objectTree.expanded = false;
       }
 
-      this.treeOutline.appendChild(section);
-      if (i === 0) {
-        section.select(/* omitFocus */ true);
-      }
+      this.#scopeChain.push({scope, objectTree});
     }
-    this.sidebarPaneUpdatedForTest();
-  }
 
-  private createScopeSectionTreeElement(scope: SDK.DebuggerModel.ScopeChainEntry):
-      ObjectUI.ObjectPropertiesSection.RootElement {
-    let emptyPlaceholder: Common.UIString.LocalizedString|null = null;
-    if (scope.type() === Protocol.Debugger.ScopeType.Local || scope.type() === Protocol.Debugger.ScopeType.Closure) {
-      emptyPlaceholder = i18nString(UIStrings.noVariables);
-    }
-
-    let title = scope.typeName();
-    if (scope.type() === Protocol.Debugger.ScopeType.Closure) {
-      const scopeName = scope.name();
-      if (scopeName) {
-        title = i18nString(UIStrings.closureS, {PH1: UI.UIUtils.beautifyFunctionName(scopeName)});
-      } else {
-        title = i18nString(UIStrings.closure);
+    for (const {scope, objectTree} of this.#scopeChain) {
+      if (scope.type() !== Protocol.Debugger.ScopeType.Global) {
+        objectTree.expanded = true;
+      }
+      if (scope.type() === Protocol.Debugger.ScopeType.Local) {
+        break;
       }
     }
-    let subtitle: string|null = scope.description();
-    if (!title || title === subtitle) {
-      subtitle = null;
-    }
-    const icon = scope.icon();
-
-    const titleElement = document.createElement('div');
-    titleElement.classList.add('scope-chain-sidebar-pane-section-header');
-    titleElement.classList.add('tree-element-title');
-    if (icon) {
-      const iconElement = document.createElement('img');
-      iconElement.classList.add('scope-chain-sidebar-pane-section-icon');
-      iconElement.src = icon;
-      titleElement.appendChild(iconElement);
-    }
-    titleElement.createChild('div', 'scope-chain-sidebar-pane-section-subtitle').textContent = subtitle;
-    titleElement.createChild('div', 'scope-chain-sidebar-pane-section-title').textContent = title;
-
-    const root = new ObjectUI.ObjectPropertiesSection.ObjectTree(
-        scope.object(), {propertiesMode: ObjectUI.ObjectPropertiesSection.ObjectPropertiesMode.ALL, readOnly: false});
-    root.addExtraProperties(...scope.extraProperties());
-    const section = new ObjectUI.ObjectPropertiesSection.RootElement(root, this.linkifier, emptyPlaceholder);
-    section.title = titleElement;
-    section.listItemElement.classList.add('scope-chain-sidebar-pane-section');
-    section.listItemElement.setAttribute('aria-label', title);
-    this.expandController.watchSection(title + (subtitle ? ':' + subtitle : ''), section);
-
-    return section;
+
+    this.requestUpdate();
+    void this.updateComplete.then(() => this.sidebarPaneUpdatedForTest());
   }
 
+  /**
+   * @deprecated Hook for legacy web tests
+   */
   sidebarPaneUpdatedForTest(): void {
   }
 }

package/front_end/panels/timeline/components/IgnoreListSetting.ts

@@ -192,6 +192,7 @@ export class IgnoreListSetting extends UI.Widget.Widget {
     Common.Settings.Settings.instance()
         .moduleSetting('enable-ignore-listing')
         .addChangeListener(this.requestUpdate.bind(this));
+    this.requestUpdate();
   }
 
   #getSkipStackFramesPatternSetting(): Common.Settings.RegExpSetting {

package/front_end/third_party/chromium/README.chromium

@@ -1,7 +1,7 @@
 Name: Dependencies sourced from the upstream `chromium` repository
 URL: Internal
 Version: N/A
-Revision: 59215b2081aea1f087ea0f9e9d428c2eb9b41876
+Revision: d56b17376efe8dc18fbf38aee20fe155821dd910
 Update Mechanism: Manual (https://crbug.com/428069060)
 License: BSD-3-Clause
 License File: LICENSE

package/front_end/third_party/lighthouse/lighthouse-dt-bundle.js

@@ -462,8 +462,8 @@ f=x});do var h=this._binding.writeSync(a,e,o,r,this._buffer,this._offset,t);whil
 r=[];for(let[t,o]of a)i.set(t,e.getSummary(o)),r.push(...o);return i.set(e.summary,e.getSummary(r)),i}static estimateValueByOrigin(a,i){let r=e.estimateIfConnectionWasReused(a),t=e.groupByOrigin(a),o=new Map;for(let[n,d]of t.entries()){let l=[];for(let c of d){let f=c.timing;if(!f)continue;let h=i({request:c,timing:f,connectionReused:r.get(c.requestId)});typeof h<"u"&&(l=l.concat(h))}l.length&&o.set(n,l)}return o}static estimateRTTViaConnectionTiming(a){let{timing:i,connectionReused:r,request:t}=a;if(r)return;let{connectStart:o,sslStart:n,sslEnd:d,connectEnd:l}=i;if(l>=0&&o>=0&&t.protocol.startsWith("h3"))return l-o;if(n>=0&&d>=0&&n!==o)return[l-n,n-o];if(o>=0&&l>=0)return l-o}static estimateRTTViaDownloadTiming(a){let{timing:i,connectionReused:r,request:t}=a;if(r||t.transferSize<=XD||!Number.isFinite(i.receiveHeadersEnd)||i.receiveHeadersEnd<0)return;let n=t.networkEndTime-t.networkRequestTime-i.receiveHeadersEnd,d=Math.log2(t.transferSize/XD);if(!(d>5))return n/d}static estimateRTTViaSendStartTiming(a){
 let{timing:i,connectionReused:r,request:t}=a;if(r||!Number.isFinite(i.sendStart)||i.sendStart<0)return;let o=1;return t.protocol.startsWith("h3")||(o+=1),t.parsedURL.scheme==="https"&&(o+=1),i.sendStart/o}static estimateRTTViaHeadersEndTiming(a){let{timing:i,connectionReused:r,request:t}=a;if(!Number.isFinite(i.receiveHeadersEnd)||i.receiveHeadersEnd<0||!t.resourceType)return;let o=Fee[t.resourceType]||Nee,n=i.receiveHeadersEnd*o,d=1;return r||(d+=1,t.protocol.startsWith("h3")||(d+=1),t.parsedURL.scheme==="https"&&(d+=1)),Math.max((i.receiveHeadersEnd-n)/d,3)}static estimateResponseTimeByOrigin(a,i){return e.estimateValueByOrigin(a,({request:r,timing:t})=>{if(r.serverResponseTime!==void 0)return r.serverResponseTime;if(!Number.isFinite(t.receiveHeadersEnd)||t.receiveHeadersEnd<0||!Number.isFinite(t.sendEnd)||t.sendEnd<0)return;let o=t.receiveHeadersEnd-t.sendEnd,n=r.parsedURL.securityOrigin,d=i.get(n)||i.get(e.summary)||0;return Math.max(o-d,0)})}static canTrustConnectionInformation(a){
 let i=new Map;for(let r of a){let t=i.get(r.connectionId)||!r.connectionReused;i.set(r.connectionId,t)}return i.size<=1?!1:Array.from(i.values()).every(r=>r)}static estimateIfConnectionWasReused(a,i){let{forceCoarseEstimates:r=!1}=i||{};if(!r&&e.canTrustConnectionInformation(a))return new Map(a.map(n=>[n.requestId,!!n.connectionReused]));let t=new Map,o=e.groupByOrigin(a);for(let n of o.values()){let d=n.map(c=>c.networkEndTime).reduce((c,f)=>Math.min(c,f),1/0);for(let c of n)t.set(c.requestId,c.networkRequestTime>=d||c.protocol==="h2");let l=n.reduce((c,f)=>c.networkRequestTime>f.networkRequestTime?f:c);t.set(l.requestId,!1)}return t}static estimateRTTByOrigin(a,i){let{forceCoarseEstimates:r=!1,coarseEstimateMultiplier:t=.3,useDownloadEstimates:o=!0,useSendStartEstimates:n=!0,useHeadersEndEstimates:d=!0}=i||{},l=e.estimateIfConnectionWasReused(a),c=e.groupByOrigin(a),f=new Map;for(let[h,m]of c.entries()){let g=function(x,y=1){for(let E of m){let C=E.timing;if(!C||!E.transferSize)continue;
-let k=x({request:E,timing:C,connectionReused:l.get(E.requestId)});k!==void 0&&(Array.isArray(k)?u.push(...k.map(T=>T*y)):u.push(k*y))}};s(g,"collectEstimates");let u=[];r||g(this.estimateRTTViaConnectionTiming),u.length||(o&&g(this.estimateRTTViaDownloadTiming,t),n&&g(this.estimateRTTViaSendStartTiming,t),d&&g(this.estimateRTTViaHeadersEndTiming,t)),u.length&&f.set(h,u)}if(!f.size)throw new J("No timing information available");return e.summarize(f)}static estimateServerResponseTimeByOrigin(a,i){let r=i?.rttByOrigin;if(!r){r=new Map;let o=e.estimateRTTByOrigin(a,i);for(let[n,d]of o.entries())r.set(n,d.min)}let t=e.estimateResponseTimeByOrigin(a,r);return e.summarize(t)}static estimateThroughput(a){let i=0,r=a.reduce((d,l)=>(l.parsedURL?.scheme==="data"||l.failed||!l.finished||l.statusCode>300||!l.transferSize||(i+=l.transferSize,d.push({time:l.responseHeadersEndTime/1e3,isStart:!0}),d.push({time:l.networkEndTime/1e3,isStart:!1})),d),[]).sort((d,l)=>d.time-l.time);if(!r.length)return null;
-let t=0,o=0,n=0;return r.forEach(d=>{d.isStart?(t===0&&(o=d.time),t++):(t--,t===0&&(n+=d.time-o))}),i*8/n}static computeRTTAndServerResponseTime(a){let i=new Map;for(let[d,l]of e.estimateRTTByOrigin(a).entries())i.set(d,l.min);let r=Math.min(...Array.from(i.values())),t=e.estimateServerResponseTimeByOrigin(a,{rttByOrigin:i}),o=new Map,n=new Map;for(let[d,l]of t.entries()){let c=i.get(d)||r;o.set(d,c-r),n.set(d,l.median)}return{rtt:r,additionalRttByOrigin:o,serverResponseTimeByOrigin:n}}static analyze(a){let i=e.estimateThroughput(a);return i===null?null:{throughput:i,...e.computeRTTAndServerResponseTime(a)}}static findResourceForUrl(a,i){return a.find(r=>i.startsWith(r.url)&&Vm.equalWithExcludedFragments(r.url,i))}static findLastDocumentForUrl(a,i){let r=a.filter(t=>t.resourceType==="Document"&&!t.failed&&i.startsWith(t.url)&&Vm.equalWithExcludedFragments(t.url,i));return r[r.length-1]}static resolveRedirects(a){for(;a.redirectDestination;)a=a.redirectDestination;return a}}});var ca={};S(ca,{LanternError:()=>J,NetworkAnalyzer:()=>Bt});var dr=_(()=>{p();Q2();KD()});var aa,qm=_(()=>{p();dr();aa=class e{static{s(this,"BaseNode")}static types={NETWORK:"network",CPU:"cpu"};_id;_isMainDocument;dependents;dependencies;constructor(a){this._id=a,this._isMainDocument=!1,this.dependents=[],this.dependencies=[]}get id(){return this._id}get type(){throw new J("Unimplemented")}get startTime(){throw new J("Unimplemented")}get endTime(){throw new J("Unimplemented")}setIsMainDocument(a){this._isMainDocument=a}isMainDocument(){return this._isMainDocument}getDependents(){return this.dependents.slice()}getNumberOfDependents(){return this.dependents.length}getDependencies(){return this.dependencies.slice()}getNumberOfDependencies(){return this.dependencies.length}getRootNode(){let a=this;for(;a.dependencies.length;)a=a.dependencies[0];return a}addDependent(a){a.addDependency(this)}addDependency(a){if(a===this)throw new J("Cannot add dependency on itself");this.dependencies.includes(a)||(a.dependents.push(this),this.dependencies.push(a))}removeDependent(a){a.removeDependency(
+let k=x({request:E,timing:C,connectionReused:l.get(E.requestId)});k!==void 0&&(Array.isArray(k)?u.push(...k.map(T=>T*y)):u.push(k*y))}};s(g,"collectEstimates");let u=[];r||g(this.estimateRTTViaConnectionTiming),u.length||(o&&g(this.estimateRTTViaDownloadTiming,t),n&&g(this.estimateRTTViaSendStartTiming,t),d&&g(this.estimateRTTViaHeadersEndTiming,t)),u.length&&f.set(h,u)};return e.summarize(f)}static estimateServerResponseTimeByOrigin(a,i){let r=i?.rttByOrigin;if(!r){r=new Map;let o=e.estimateRTTByOrigin(a,i);for(let[n,d]of o.entries())r.set(n,d.min)}let t=e.estimateResponseTimeByOrigin(a,r);return e.summarize(t)}static estimateThroughput(a){let i=0,r=a.reduce((d,l)=>(l.parsedURL?.scheme==="data"||l.failed||!l.finished||l.statusCode>300||!l.transferSize||(i+=l.transferSize,d.push({time:l.responseHeadersEndTime/1e3,isStart:!0}),d.push({time:l.networkEndTime/1e3,isStart:!1})),d),[]).sort((d,l)=>d.time-l.time);if(!r.length)return null;
+let t=0,o=0,n=0;return r.forEach(d=>{d.isStart?(t===0&&(o=d.time),t++):(t--,t===0&&(n+=d.time-o))}),i*8/n}static computeRTTAndServerResponseTime(a){let i=new Map;for(let[d,l]of e.estimateRTTByOrigin(a).entries())i.set(d,l.min);let r=i.size?Math.min(...Array.from(i.values())):0,t=e.estimateServerResponseTimeByOrigin(a,{rttByOrigin:i}),o=new Map,n=new Map;for(let[d,l]of t.entries()){let c=i.get(d)||r;o.set(d,c-r),n.set(d,l.median)}return{rtt:r,additionalRttByOrigin:o,serverResponseTimeByOrigin:n}}static analyze(a){let i=e.estimateThroughput(a);return i===null?null:{throughput:i,...e.computeRTTAndServerResponseTime(a)}}static findResourceForUrl(a,i){return a.find(r=>i.startsWith(r.url)&&Vm.equalWithExcludedFragments(r.url,i))}static findLastDocumentForUrl(a,i){let r=a.filter(t=>t.resourceType==="Document"&&!t.failed&&i.startsWith(t.url)&&Vm.equalWithExcludedFragments(t.url,i));return r[r.length-1]}static resolveRedirects(a){for(;a.redirectDestination;)a=a.redirectDestination;return a}}});var ca={};S(ca,{LanternError:()=>J,NetworkAnalyzer:()=>Bt});var dr=_(()=>{p();Q2();KD()});var aa,qm=_(()=>{p();dr();aa=class e{static{s(this,"BaseNode")}static types={NETWORK:"network",CPU:"cpu"};_id;_isMainDocument;dependents;dependencies;constructor(a){this._id=a,this._isMainDocument=!1,this.dependents=[],this.dependencies=[]}get id(){return this._id}get type(){throw new J("Unimplemented")}get startTime(){throw new J("Unimplemented")}get endTime(){throw new J("Unimplemented")}setIsMainDocument(a){this._isMainDocument=a}isMainDocument(){return this._isMainDocument}getDependents(){return this.dependents.slice()}getNumberOfDependents(){return this.dependents.length}getDependencies(){return this.dependencies.slice()}getNumberOfDependencies(){return this.dependencies.length}getRootNode(){let a=this;for(;a.dependencies.length;)a=a.dependencies[0];return a}addDependent(a){a.addDependency(this)}addDependency(a){if(a===this)throw new J("Cannot add dependency on itself");this.dependencies.includes(a)||(a.dependents.push(this),this.dependencies.push(a))}removeDependent(a){a.removeDependency(
 this)}removeDependency(a){if(!this.dependencies.includes(a))return;let i=a.dependents.indexOf(this);a.dependents.splice(i,1),this.dependencies.splice(this.dependencies.indexOf(a),1)}removeAllDependencies(){for(let a of this.dependencies.slice())this.removeDependency(a)}isDependentOn(a){let i=!1;return this.traverse(r=>{i||(i=r===a)},r=>i?[]:r.getDependencies()),i}cloneWithoutRelationships(){let a=new e(this.id);return a.setIsMainDocument(this._isMainDocument),a}cloneWithRelationships(a){let i=this.getRootNode(),r=new Map;i.traverse(o=>{if(!r.has(o.id)){if(a===void 0){r.set(o.id,o.cloneWithoutRelationships());return}a(o)&&o.traverse(n=>r.set(n.id,n.cloneWithoutRelationships()),n=>n.dependencies.filter(d=>!r.has(d.id)))}}),i.traverse(o=>{let n=r.get(o.id);if(n)for(let d of o.dependencies){let l=r.get(d.id);if(!l)throw new J("Dependency somehow not cloned");n.addDependency(l)}});let t=r.get(this.id);if(!t)throw new J("Cloned graph missing node");return t}traverse(a,i){for(let{node:r,traversalPath:t}of this.
 traverseGenerator(i))a(r,t)}*traverseGenerator(a){a||(a=s(t=>t.getDependents(),"getNextNodes"));let i=[[this]],r=new Set([this.id]);for(;i.length;){let t=i.shift(),o=t[0];yield{node:o,traversalPath:t};for(let n of a(o))r.has(n.id)||(r.add(n.id),i.push([n,...t]))}}static findCycle(a,i="both"){if(i==="both")return e.findCycle(a,"dependents")||e.findCycle(a,"dependencies");let r=new Set,t=[],o=[a],n=new Map([[a,0]]);for(;o.length;){let d=o.pop();if(t.includes(d))return t;if(r.has(d))continue;for(;t.length>n.get(d);)t.pop();r.add(d),t.push(d);let l=i==="dependents"?d.dependents:d.dependencies;for(let c of l)o.includes(c)||(o.push(c),n.set(c,t.length))}return null}canDependOn(a){return a.startTime<=this.startTime}}});var xc,eb=_(()=>{p();qm();xc=class e extends aa{static{s(this,"CPUNode")}_event;_childEvents;correctedEndTs;constructor(a,i=[],r){let t=`${a.tid}.${a.ts}`;super(t),this._event=a,this._childEvents=i,this.correctedEndTs=r}get type(){return aa.types.CPU}get startTime(){return this._event.ts}get endTime(){return this.correctedEndTs?this.correctedEndTs:this._event.ts+this._event.dur}get duration(){return this.endTime-this.startTime}get event(){return this._event}get childEvents(){return this._childEvents}didPerformLayout(){return this._childEvents.some(a=>a.name==="Layout")}getEvaluateScriptURLs(){let a=new Set;for(let i of this._childEvents)i.name==="EvaluateScript"&&i.args.data?.url&&a.add(i.args.data.url);return a}cloneWithoutRelationships(){return new e(this._event,this._childEvents,this.correctedEndTs)}}});function YD(e){let a=e.includes(":")?e.slice(0,e.indexOf(":")):e;return jee.includes(a)}var jee,zs,ab=_(()=>{p();qm();jee=["blob","data","intent","file","filesystem","chrome-extension"];s(YD,"isNonNetworkProtocol");zs=class e extends aa{static{s(this,"NetworkNode")}_request;constructor(a){super(a.requestId),this._request=a}get type(){return aa.types.NETWORK}get startTime(){return this._request.rendererStartTime*1e3}get endTime(){return this._request.networkEndTime*1e3}get rawRequest(){return this._request.rawRequest}get request(){return this._request}get initiatorType(){return this._request.initiator.type}get fromDiskCache(){return!!this._request.fromDiskCache}get isNonNetworkProtocol(){return YD(this.request.protocol)||YD(this.request.parsedURL.scheme)}get isConnectionless(){return this.fromDiskCache||this.isNonNetworkProtocol}hasRenderBlockingPriority(){let a=this._request.priority,i=this._request.resourceType==="Script",r=this._request.resourceType==="Document";return a==="VeryHigh"||
 a==="High"&&i||a==="High"&&r}cloneWithoutRelationships(){let a=new e(this._request);return a.setIsMainDocument(this._isMainDocument),a}}});var Gee,Bee,Hee,Uee,Wee,Vee,ib,$D=_(()=>{p();dr();eb();ab();Gee="RunTask",Bee="ThreadControllerImpl::RunTask",Hee="ThreadControllerImpl::DoWork",Uee="TaskQueueManager::ProcessTaskFromWorkQueue",Wee=10,Vee=/^video/,ib=class e{static{s(this,"PageDependencyGraph")}static getNetworkInitiators(a){if(!a.initiator)return[];if(a.initiator.url)return[a.initiator.url];if(a.initiator.type==="script"){let i=new Set,r=a.initiator.stack;for(;r;){let t=r.callFrames||[];for(let o of t)o.url&&i.add(o.url);r=r.parent}return Array.from(i)}return[]}static getNetworkNodeOutput(a){let i=[],r=new Map,t=new Map,o=new Map;return a.forEach(n=>{if(Vee.test(n.mimeType)||n.fromWorker)return;for(;r.has(n.requestId);)n.requestId+=":duplicate";let d=new zs(n);i.push(d);let l=t.get(n.url)||[];if(l.push(d),r.set(n.requestId,d),t.set(n.url,l),n.frameId&&n.resourceType==="Document"&&n.documentURL===n.url){let c=o.has(n.frameId)?null:d;o.set(n.frameId,c)}}),{nodes:i,idToNodeMap:r,urlToNodeMap:t,frameIdToNodeMap:o}}static isScheduleableTask(a){

package/front_end/third_party/marked/README.chromium

@@ -1,8 +1,8 @@
 Name: Marked
 Short Name: marked
 URL: https://github.com/markedjs/marked
-Version: 13.0.1
-Revision: aaee616d54e82295d61a61aa26192416c2547ac4
+Version: 18.0.4
+Revision: 0a2cd54cbe91911890e4460ae4fd7b9966e05654
 Update Mechanism: Manual
 License: BSD-3-Clause, MIT
 License File: LICENSE
@@ -14,8 +14,5 @@ Light-weight markdown parser and renderer.
 
 To update this package, run the following command (replace version number with updated version number):
 ```bash
-wget -qO- https://registry.npmjs.org/marked/-/marked-13.0.1.tgz | tar xzf -
+wget -qO- https://registry.npmjs.org/marked/-/marked-18.0.4.tgz | tar xzf -
 ```
-
-Local Modifications:
-- Renamed marked.d.ts to marked.esm.d.ts for TypeScript typechecking.

package/front_end/third_party/marked/package/README.md

@@ -5,7 +5,6 @@
 # Marked
 
 [![npm](https://badgen.net/npm/v/marked)](https://www.npmjs.com/package/marked)
-[![gzip size](https://badgen.net/badgesize/gzip/https://cdn.jsdelivr.net/npm/marked/marked.min.js)](https://cdn.jsdelivr.net/npm/marked/marked.min.js)
 [![install size](https://badgen.net/packagephobia/install/marked)](https://packagephobia.now.sh/result?p=marked)
 [![downloads](https://badgen.net/npm/dt/marked)](https://www.npmjs.com/package/marked)
 [![github actions](https://github.com/markedjs/marked/workflows/Tests/badge.svg)](https://github.com/markedjs/marked/actions)
@@ -18,7 +17,7 @@
 
 ## Demo
 
-Checkout the [demo page](https://marked.js.org/demo/) to see marked in action ⛹️
+Check out the [demo page](https://marked.js.org/demo/) to see Marked in action ⛹️
 
 ## Docs
 
@@ -33,7 +32,7 @@ Also read about:
 
 **Node.js:** Only [current and LTS](https://nodejs.org/en/about/releases/) Node.js versions are supported. End of life Node.js versions may become incompatible with Marked at any point in time.
 
-**Browser:** Not IE11 :)
+**Browser:** [Baseline Widely Available](https://developer.mozilla.org/en-US/docs/Glossary/Baseline/Compatibility)
 
 ## Installation
 
@@ -84,7 +83,7 @@ $ marked --help
 </head>
 <body>
   <div id="content"></div>
-  <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/marked/lib/marked.umd.js"></script>
   <script>
     document.getElementById('content').innerHTML =
       marked.parse('# Marked in the browser\n\nRendered by **marked**.');
@@ -104,4 +103,5 @@ or import esm module
 
 ## License
 
-Copyright (c) 2011-2022, Christopher Jeffrey. (MIT License)
+Copyright (c) 2018+, MarkedJS. (MIT License)
+Copyright (c) 2011-2018, Christopher Jeffrey. (MIT License)