chrome-devtools-frontend 1.0.1040857 → 1.0.1070764

package/front_end/panels/profiler/HeapProfileView.ts

@@ -518,7 +518,7 @@ export class SamplingHeapProfileHeader extends WritableProfileHeader {
 
 export class SamplingHeapProfileNode extends SDK.ProfileTreeModel.ProfileNode {
   self: number;
-  constructor(node: Protocol.HeapProfiler.SamplingHeapProfileNode) {
+  constructor(node: Protocol.HeapProfiler.SamplingHeapProfileNode, target: SDK.Target.Target|null) {
     const callFrame = node.callFrame || ({
                         // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration)
                         // @ts-expect-error
@@ -536,7 +536,7 @@ export class SamplingHeapProfileNode extends SDK.ProfileTreeModel.ProfileNode {
                         // @ts-expect-error
                         columnNumber: node['columnNumber'] - 1,
                       } as Protocol.Runtime.CallFrame);
-    super(callFrame);
+    super(callFrame, target);
     this.self = node.selfSize;
   }
 }
@@ -566,17 +566,18 @@ export class SamplingHeapProfileModel extends SDK.ProfileTreeModel.ProfileTreeMo
       }
     }
 
-    this.initialize(translateProfileTree(profile.head));
+    this.initialize(translateProfileTree(profile.head, this.target()));
 
-    function translateProfileTree(root: Protocol.HeapProfiler.SamplingHeapProfileNode): SamplingHeapProfileNode {
-      const resultRoot = new SamplingHeapProfileNode(root);
+    function translateProfileTree(
+        root: Protocol.HeapProfiler.SamplingHeapProfileNode, target: SDK.Target.Target|null): SamplingHeapProfileNode {
+      const resultRoot = new SamplingHeapProfileNode(root, target);
       const sourceNodeStack = [root];
       const targetNodeStack = [resultRoot];
       while (sourceNodeStack.length) {
         const sourceNode = (sourceNodeStack.pop() as Protocol.HeapProfiler.SamplingHeapProfileNode);
         const targetNode = (targetNodeStack.pop() as SamplingHeapProfileNode);
         targetNode.children = sourceNode.children.map(child => {
-          const targetChild = new SamplingHeapProfileNode(child);
+          const targetChild = new SamplingHeapProfileNode(child, target);
           if (nodeIdToSizeMap) {
             targetChild.self = nodeIdToSizeMap.get(child.id) || 0;
           }

package/front_end/panels/profiler/LiveHeapProfileView.ts

@@ -79,7 +79,7 @@ export class LiveHeapProfileView extends UI.Widget.VBox {
     this.toggleRecordButton.setToggled(this.setting.get());
     toolbar.appendToolbarItem(this.toggleRecordButton);
 
-    const mainTarget = SDK.TargetManager.TargetManager.instance().mainTarget();
+    const mainTarget = SDK.TargetManager.TargetManager.instance().mainFrameTarget();
     if (mainTarget && mainTarget.model(SDK.ResourceTreeModel.ResourceTreeModel)) {
       const startWithReloadAction =
           (UI.ActionRegistry.ActionRegistry.instance().action('live-heap-profile.start-with-reload') as
@@ -335,7 +335,7 @@ export class LiveHeapProfileView extends UI.Widget.VBox {
     if (!reload) {
       return;
     }
-    const mainTarget = SDK.TargetManager.TargetManager.instance().mainTarget();
+    const mainTarget = SDK.TargetManager.TargetManager.instance().mainFrameTarget();
     if (!mainTarget) {
       return;
     }

package/front_end/panels/sensors/sensors-meta.ts

@@ -142,16 +142,6 @@ UI.ViewManager.registerViewExtension({
   ],
 });
 
-UI.ActionRegistration.registerActionExtension({
-  actionId: 'emulation.show-sensors',
-  category: UI.ActionRegistration.ActionCategory.SENSORS,
-  async loadActionDelegate() {
-    const Sensors = await loadEmulationModule();
-    return Sensors.SensorsView.ShowActionDelegate.instance();
-  },
-  title: i18nLazyString(UIStrings.sensors),
-});
-
 Common.Settings.registerSettingExtension({
   storageType: Common.Settings.SettingStorageType.Synced,
   settingName: 'emulation.locations',

package/front_end/panels/settings/FrameworkIgnoreListSettingsTab.ts

@@ -35,17 +35,21 @@ const UIStrings = {
   automaticallyIgnoreListKnownThirdPartyScriptsTooltip:
       'Add sources from the `x_google_ignoreList` field from source maps to the ignore list',
   /**
-  *@description Ignore List label in Framework Ignore List Settings Tab of the Settings
+  *@description Text in Framework Ignore List Settings Tab of the Settings
   */
-  ignoreList: 'Ignore List',
+  enableIgnoreListing: 'Enable Ignore Listing',
   /**
-  *@description Text to indicate something is not enabled
+  *@description Text in Framework Ignore List Settings Tab of the Settings
   */
-  disabled: 'Disabled',
+  enableIgnoreListingTooltip: 'Uncheck to disable all ignore listing',
   /**
-  *@description Placeholder text content in Framework Ignore List Settings Tab of the Settings
+  *@description Text in Framework Ignore List Settings Tab of the Settings
   */
-  noIgnoreListPatterns: 'No ignore list patterns',
+  generalExclusionRules: 'General exclusion rules:',
+  /**
+  *@description Text in Framework Ignore List Settings Tab of the Settings
+  */
+  customExclusionRules: 'Custom exclusion rules:',
   /**
   *@description Text of the add pattern button in Framework Ignore List Settings Tab of the Settings
   */
@@ -63,11 +67,7 @@ const UIStrings = {
   *@description Aria accessible name in Framework Ignore List Settings Tab of the Settings. It labels the input
   * field used to add new or edit existing regular expressions that match file names to ignore in the debugger.
   */
-  pattern: 'Pattern',
-  /**
-  *@description Aria accessible name in Framework Ignore List Settings Tab of the Settings
-  */
-  behavior: 'Behavior',
+  pattern: 'Add Pattern',
   /**
   *@description Error message in Framework Ignore List settings pane that declares pattern must not be empty
   */
@@ -87,8 +87,6 @@ const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 let frameworkIgnoreListSettingsTabInstance: FrameworkIgnoreListSettingsTab;
 export class FrameworkIgnoreListSettingsTab extends UI.Widget.VBox implements
     UI.ListWidget.Delegate<Common.Settings.RegExpSettingItem> {
-  private ignoreListLabel: Common.UIString.LocalizedString;
-  private disabledLabel: Common.UIString.LocalizedString;
   private readonly list: UI.ListWidget.ListWidget<Common.Settings.RegExpSettingItem>;
   private readonly setting: Common.Settings.RegExpSetting;
   private editor?: UI.ListWidget.Editor<Common.Settings.RegExpSettingItem>;
@@ -99,41 +97,65 @@ export class FrameworkIgnoreListSettingsTab extends UI.Widget.VBox implements
     const header = this.contentElement.createChild('div', 'header');
     header.textContent = i18nString(UIStrings.frameworkIgnoreList);
     UI.ARIAUtils.markAsHeading(header, 1);
+
     this.contentElement.createChild('div', 'intro').textContent = i18nString(UIStrings.debuggerWillSkipThroughThe);
 
-    const ignoreListContentScripts = this.contentElement.createChild('div', 'ignore-list-content-scripts');
+    const enabledSetting =
+        Common.Settings.Settings.instance().moduleSetting('enableIgnoreListing') as Common.Settings.Setting<boolean>;
+    const enableIgnoreListing = this.contentElement.createChild('div', 'ignore-list-global-enable');
+    enableIgnoreListing.appendChild(
+        UI.SettingsUI.createSettingCheckbox(i18nString(UIStrings.enableIgnoreListing), enabledSetting, true));
+    UI.Tooltip.Tooltip.install(enableIgnoreListing, i18nString(UIStrings.enableIgnoreListingTooltip));
+
+    const ignoreListOptions = this.contentElement.createChild('div', 'ignore-list-options');
+
+    ignoreListOptions.createChild('div', 'ignore-list-option-group').textContent =
+        i18nString(UIStrings.generalExclusionRules);
+
+    const ignoreListContentScripts = ignoreListOptions.createChild('div', 'ignore-list-option');
     ignoreListContentScripts.appendChild(UI.SettingsUI.createSettingCheckbox(
         i18nString(UIStrings.ignoreListContentScripts),
         Common.Settings.Settings.instance().moduleSetting('skipContentScripts'), true));
     UI.Tooltip.Tooltip.install(ignoreListContentScripts, i18nString(UIStrings.ignoreListContentScriptsExtension));
 
-    const automaticallyIgnoreList = this.contentElement.createChild('div', 'automatically-ignore-list');
+    const automaticallyIgnoreList = ignoreListOptions.createChild('div', 'ignore-list-option');
     automaticallyIgnoreList.appendChild(UI.SettingsUI.createSettingCheckbox(
         i18nString(UIStrings.automaticallyIgnoreListKnownThirdPartyScripts),
         Common.Settings.Settings.instance().moduleSetting('automaticallyIgnoreListKnownThirdPartyScripts'), true));
     UI.Tooltip.Tooltip.install(
         automaticallyIgnoreList, i18nString(UIStrings.automaticallyIgnoreListKnownThirdPartyScriptsTooltip));
 
-    this.ignoreListLabel = i18nString(UIStrings.ignoreList);
-    this.disabledLabel = i18nString(UIStrings.disabled);
+    ignoreListOptions.createChild('div', 'ignore-list-option-group').textContent =
+        i18nString(UIStrings.customExclusionRules);
 
     this.list = new UI.ListWidget.ListWidget(this);
     this.list.element.classList.add('ignore-list');
 
     const placeholder = document.createElement('div');
     placeholder.classList.add('ignore-list-empty');
-    placeholder.textContent = i18nString(UIStrings.noIgnoreListPatterns);
     this.list.setEmptyPlaceholder(placeholder);
-    this.list.show(this.contentElement);
+    this.list.show(ignoreListOptions);
     const addPatternButton =
         UI.UIUtils.createTextButton(i18nString(UIStrings.addPattern), this.addButtonClicked.bind(this), 'add-button');
     UI.ARIAUtils.setAccessibleName(addPatternButton, i18nString(UIStrings.addFilenamePattern));
-    this.contentElement.appendChild(addPatternButton);
+    ignoreListOptions.appendChild(addPatternButton);
     this.setting =
         Common.Settings.Settings.instance().moduleSetting('skipStackFramesPattern') as Common.Settings.RegExpSetting;
     this.setting.addChangeListener(this.settingUpdated, this);
 
     this.setDefaultFocusedElement(addPatternButton);
+
+    enabledSetting.addChangeListener(enabledChanged);
+    enabledChanged();
+
+    function enabledChanged(): void {
+      const enabled = enabledSetting.get();
+      if (enabled) {
+        ignoreListOptions.classList.remove('ignore-listing-disabled');
+      } else {
+        ignoreListOptions.classList.add('ignore-listing-disabled');
+      }
+    }
   }
 
   static instance(opts = {forceNew: null}): FrameworkIgnoreListSettingsTab {
@@ -166,17 +188,27 @@ export class FrameworkIgnoreListSettingsTab extends UI.Widget.VBox implements
 
   renderItem(item: Common.Settings.RegExpSettingItem, _editable: boolean): Element {
     const element = document.createElement('div');
+
+    const listSetting = this.setting;
+
+    const checkbox = UI.UIUtils.CheckboxLabel.create(item.pattern, !item.disabled);
+    const helpText = i18nString(UIStrings.ignoreScriptsWhoseNamesMatchS, {PH1: item.pattern});
+    UI.Tooltip.Tooltip.install(checkbox, helpText);
+    checkbox.checkboxElement.ariaLabel = helpText;
+    checkbox.checkboxElement.addEventListener('change', inputChanged, false);
+    element.appendChild(checkbox);
     element.classList.add('ignore-list-item');
-    const pattern = element.createChild('div', 'ignore-list-pattern');
-    pattern.textContent = item.pattern;
-    UI.Tooltip.Tooltip.install(pattern, i18nString(UIStrings.ignoreScriptsWhoseNamesMatchS, {PH1: item.pattern}));
-    element.createChild('div', 'ignore-list-separator');
-    element.createChild('div', 'ignore-list-behavior').textContent =
-        item.disabled ? this.disabledLabel : this.ignoreListLabel;
-    if (item.disabled) {
-      element.classList.add('ignore-list-disabled');
-    }
+
     return element;
+
+    function inputChanged(): void {
+      const disabled = !checkbox.checkboxElement.checked;
+      if (item.disabled !== disabled) {
+        item.disabled = disabled;
+        // Send changed event
+        listSetting.setAsArray(listSetting.getAsArray());
+      }
+    }
   }
 
   removeItemRequested(item: Common.Settings.RegExpSettingItem, index: number): void {
@@ -189,7 +221,6 @@ export class FrameworkIgnoreListSettingsTab extends UI.Widget.VBox implements
       item: Common.Settings.RegExpSettingItem, editor: UI.ListWidget.Editor<Common.Settings.RegExpSettingItem>,
       isNew: boolean): void {
     item.pattern = editor.control('pattern').value.trim();
-    item.disabled = editor.control('behavior').value === this.disabledLabel;
 
     const list = this.setting.getAsArray();
     if (isNew) {
@@ -201,7 +232,6 @@ export class FrameworkIgnoreListSettingsTab extends UI.Widget.VBox implements
   beginEdit(item: Common.Settings.RegExpSettingItem): UI.ListWidget.Editor<Common.Settings.RegExpSettingItem> {
     const editor = this.createEditor();
     editor.control('pattern').value = item.pattern;
-    editor.control('behavior').value = item.disabled ? this.disabledLabel : this.ignoreListLabel;
     return editor;
   }
 
@@ -216,17 +246,11 @@ export class FrameworkIgnoreListSettingsTab extends UI.Widget.VBox implements
 
     const titles = content.createChild('div', 'ignore-list-edit-row');
     titles.createChild('div', 'ignore-list-pattern').textContent = i18nString(UIStrings.pattern);
-    titles.createChild('div', 'ignore-list-separator ignore-list-separator-invisible');
-    titles.createChild('div', 'ignore-list-behavior').textContent = i18nString(UIStrings.behavior);
 
     const fields = content.createChild('div', 'ignore-list-edit-row');
     const pattern = editor.createInput('pattern', 'text', '/framework\\.js$', patternValidator.bind(this));
     UI.ARIAUtils.setAccessibleName(pattern, i18nString(UIStrings.pattern));
     fields.createChild('div', 'ignore-list-pattern').appendChild(pattern);
-    fields.createChild('div', 'ignore-list-separator ignore-list-separator-invisible');
-    const behavior = editor.createSelect('behavior', [this.ignoreListLabel, this.disabledLabel], behaviorValidator);
-    UI.ARIAUtils.setAccessibleName(behavior, i18nString(UIStrings.behavior));
-    fields.createChild('div', 'ignore-list-behavior').appendChild(behavior);
 
     return editor;
 
@@ -256,11 +280,5 @@ export class FrameworkIgnoreListSettingsTab extends UI.Widget.VBox implements
       }
       return {valid: true, errorMessage: undefined};
     }
-
-    function behaviorValidator(
-        _item: Common.Settings.RegExpSettingItem, _index: number,
-        _input: UI.ListWidget.EditorControl): UI.ListWidget.ValidatorResult {
-      return {valid: true, errorMessage: undefined};
-    }
   }
 }

package/front_end/panels/settings/KeybindsSettingsTab.ts

@@ -381,7 +381,7 @@ export class ShortcutListItem {
         i18nString(UIStrings.discardChanges), 'largeicon-delete', 'keybinds-cancel-button',
         () => this.settingsTab.stopEditing(this.item)));
     this.element.addEventListener('keydown', event => {
-      if (isEscKey(event)) {
+      if (Platform.KeyboardUtilities.isEscKey(event)) {
         this.settingsTab.stopEditing(this.item);
         event.consume(true);
       }

package/front_end/panels/settings/SettingsScreen.ts

@@ -285,10 +285,8 @@ export class GenericSettingsTab extends SettingsTab {
       Common.Settings.SettingCategory.PERSISTENCE,
       Common.Settings.SettingCategory.DEBUGGER,
       Common.Settings.SettingCategory.GLOBAL,
+      Common.Settings.SettingCategory.SYNC,
     ];
-    if (Root.Runtime.experiments.isEnabled(Root.Runtime.ExperimentName.SYNC_SETTINGS)) {
-      explicitSectionOrder.push(Common.Settings.SettingCategory.SYNC);
-    }
 
     // Some settings define their initial ordering.
     const preRegisteredSettings = Common.Settings.getRegisteredSettings().sort(

package/front_end/panels/settings/components/syncSection.css

@@ -29,7 +29,7 @@ legend {
   color: var(--color-link);
   text-decoration: underline;
   cursor: pointer;
-  padding: 2px 0; /* adjust focus ring size */
+  outline-offset: 2px;
 }
 
 img {

package/front_end/panels/settings/frameworkIgnoreListSettingsTab.css

@@ -20,9 +20,16 @@
   margin-top: 10px;
 }
 
-.ignore-list-content-scripts {
-  margin-top: 10px;
+.ignore-list-option {
   flex: none;
+  padding: 3px 6px;
+  min-height: 30px;
+}
+
+.ignore-list-option-group {
+  margin-top: 16px;
+  margin-bottom: 3px;
+  margin-left: 8px;
 }
 
 .add-button {
@@ -32,18 +39,15 @@
 }
 
 .ignore-list {
-  margin-top: 10px;
   max-width: 500px;
   flex: 0 1 auto;
-  min-height: 30px;
 }
 
-.ignore-list-empty {
-  flex: auto;
-  height: 30px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
+.ignore-list-global-enable {
+  padding: 3px 0;
+  color: var(--color-text-secondary);
+  font-size: 120%;
+  margin-top: 20px;
 }
 
 .ignore-list-item {
@@ -68,31 +72,6 @@
   overflow: hidden;
 }
 
-.ignore-list-item.ignore-list-disabled .ignore-list-pattern {
-  text-decoration: line-through;
-}
-
-.ignore-list-behavior {
-  flex: 0 0 100px;
-  padding-left: 10px;
-}
-
-.ignore-list-behavior > select {
-  margin-left: -10px;
-}
-
-.ignore-list-separator {
-  flex: 0 0 1px;
-  background-color: var(--color-details-hairline);
-  height: 30px;
-  margin: 0 4px;
-}
-
-.ignore-list-separator-invisible {
-  visibility: hidden;
-  height: 100% !important; /* stylelint-disable-line declaration-no-important */
-}
-
 .ignore-list-edit-row {
   flex: none;
   display: flex;
@@ -106,3 +85,27 @@
   width: 100%;
   text-align: inherit;
 }
+
+.ignore-list-options {
+  margin-left: 22px;
+  display: flex;
+  flex-direction: column;
+}
+
+.ignore-list-options.ignore-listing-disabled {
+  opacity: 30%;
+}
+
+.list:has(.ignore-list-empty),
+.list:has(.ignore-list-edit-row),
+.list:has(.ignore-list-item) {
+  border: none;
+}
+
+.editor-container:has(.ignore-list-edit-row) {
+  background: var(--color-background-elevation-0);
+}
+
+.ignore-list.list-editing ~ .add-button {
+  display: none;
+}