chrome-devtools-frontend 1.0.1675430 → 1.0.1676824

package/front_end/panels/timeline/TimelineController.ts

@@ -205,10 +205,6 @@ export class TimelineController implements Tracing.TracingManager.TracingManager
   }
 
   async startRecording(options: RecordingOptions): Promise<void> {
-    function disabledByDefault(category: string): string {
-      return 'disabled-by-default-' + category;
-    }
-
     this.client.recordingStatus(i18nString(UIStrings.initializingTracing));
 
     // If we are doing "Reload & record", we first navigate the page to
@@ -220,51 +216,9 @@ export class TimelineController implements Tracing.TracingManager.TracingManager
       await this.#navigateToAboutBlank();
     }
 
-    // The following categories are also used in other tools, but this panel
-    // offers the possibility of turning them off (see below).
-    // 'disabled-by-default-devtools.screenshot'
-    //   └ default: on, option: captureFilmStrip
-    // 'disabled-by-default-devtools.timeline.invalidationTracking'
-    //   └ default: off, experiment: timelineInvalidationTracking
-    // 'disabled-by-default-v8.cpu_profiler'
-    //   └ default: on, option: enableJSSampling
-    const categoriesArray = [
-      Common.Settings.Settings.instance().moduleSetting('timeline-show-all-events').get() ? '*' : '-*',
-      Trace.Types.Events.Categories.Console,
-      Trace.Types.Events.Categories.Loading,
-      Trace.Types.Events.Categories.UserTiming,
-      'devtools.timeline',
-      disabledByDefault('devtools.target-rundown'),
-      disabledByDefault('devtools.timeline.frame'),
-      disabledByDefault('devtools.timeline.stack'),
-      disabledByDefault('devtools.timeline'),
-      disabledByDefault('devtools.v8-source-rundown-sources'),
-      disabledByDefault('devtools.v8-source-rundown'),
-      disabledByDefault('layout_shift.debug'),
-      // Looking for disabled-by-default-v8.compile? We disabled it: crbug.com/414330508.
-      disabledByDefault('v8.inspector'),
-      disabledByDefault('v8.cpu_profiler.hires'),
-      disabledByDefault('lighthouse'),
-      'v8.execute',
-      'v8',
-      'cppgc',
-      'navigation,rail',
-    ];
-
-    if (options.enableJSSampling) {
-      categoriesArray.push(disabledByDefault('v8.cpu_profiler'));
-    }
-    if (Common.Settings.Settings.instance().moduleSetting('timeline-invalidation-tracking').get() as boolean) {
-      categoriesArray.push(disabledByDefault('devtools.timeline.invalidationTracking'));
-    }
-    if (options.capturePictures) {
-      categoriesArray.push(
-          disabledByDefault('devtools.timeline.layers'), disabledByDefault('devtools.timeline.picture'),
-          disabledByDefault('blink.graphics_context_annotations'));
-    }
+    const categoriesArray = this.#categoriesForRecording(options);
     const screenshotOptions: Tracing.TracingManager.TracingStartOptions = {};
     if (options.captureFilmStrip) {
-      categoriesArray.push(disabledByDefault('devtools.screenshot'));
       if (options.screenshotMaxSize !== undefined) {
         screenshotOptions.screenshotMaxSize = options.screenshotMaxSize;
       }
@@ -272,17 +226,12 @@ export class TimelineController implements Tracing.TracingManager.TracingManager
         screenshotOptions.screenshotMaxCount = options.screenshotMaxCount;
       }
     }
-    if (options.captureSelectorStats) {
-      categoriesArray.push(disabledByDefault('blink.debug'));
-      // enable invalidation nodes
-      categoriesArray.push(disabledByDefault('devtools.timeline.invalidationTracking'));
-    }
 
     await LiveMetrics.LiveMetrics.instance().disable();
 
-    SDK.TargetManager.TargetManager.instance().addModelListener(
-        SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.FrameNavigated, this.#onFrameNavigated,
-        this);
+    SDK.TargetManager.TargetManager.instance().addModelListener(SDK.ResourceTreeModel.ResourceTreeModel,
+                                                                SDK.ResourceTreeModel.Events.FrameNavigated,
+                                                                this.#onFrameNavigated, this);
 
     this.#navigationUrls = [];
     this.#fieldData = null;
@@ -311,9 +260,8 @@ export class TimelineController implements Tracing.TracingManager.TracingManager
 
     const loadEvent = this.#navigateWithSDK(options.navigateToUrl);
     this.#statusChecker.add(i18nString(UIStrings.waitingForLoadEvent), loadEvent);
-    this.#statusChecker.add(
-        i18nString(UIStrings.waitingForLoadEventPlus5Seconds),
-        loadEvent.then(() => new Promise(resolve => setTimeout(resolve, 5000))));
+    this.#statusChecker.add(i18nString(UIStrings.waitingForLoadEventPlus5Seconds),
+                            loadEvent.then(() => new Promise(resolve => setTimeout(resolve, 5000))));
 
     this.#statusChecker.setListener(status => {
       if (status === null) {
@@ -352,9 +300,9 @@ export class TimelineController implements Tracing.TracingManager.TracingManager
       this.tracingManager.stop();
     }
 
-    SDK.TargetManager.TargetManager.instance().removeModelListener(
-        SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.FrameNavigated, this.#onFrameNavigated,
-        this);
+    SDK.TargetManager.TargetManager.instance().removeModelListener(SDK.ResourceTreeModel.ResourceTreeModel,
+                                                                   SDK.ResourceTreeModel.Events.FrameNavigated,
+                                                                   this.#onFrameNavigated, this);
     SDK.TargetManager.TargetManager.instance().removeModelListener(
         SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.Load, this.#onLoadEventFired, this);
 
@@ -475,6 +423,30 @@ export class TimelineController implements Tracing.TracingManager.TracingManager
   eventsRetrievalProgress(progress: number): void {
     this.client.loadingProgress(progress);
   }
+
+  #categoriesForRecording(options: RecordingOptions): string[] {
+    const categoriesArray = [
+      Common.Settings.Settings.instance().moduleSetting('timeline-show-all-events').get() ? '*' : '-*',
+      ...Trace.Types.Events.DefaultCategories,
+    ];
+
+    if (options.enableJSSampling) {
+      categoriesArray.push(...Trace.Types.Events.OptionalCategories.JsSampling);
+    }
+    if (Common.Settings.Settings.instance().moduleSetting('timeline-invalidation-tracking').get() as boolean) {
+      categoriesArray.push(...Trace.Types.Events.OptionalCategories.InvalidationTracking);
+    }
+    if (options.capturePictures) {
+      categoriesArray.push(...Trace.Types.Events.OptionalCategories.AdvancedPaint);
+    }
+    if (options.captureFilmStrip) {
+      categoriesArray.push(...Trace.Types.Events.OptionalCategories.Screenshot);
+    }
+    if (options.captureSelectorStats) {
+      categoriesArray.push(...Trace.Types.Events.OptionalCategories.CssSelectorStats);
+    }
+    return categoriesArray;
+  }
 }
 
 export interface Client {
@@ -483,9 +455,9 @@ export interface Client {
   loadingStarted(): void;
   processingStarted(): void;
   loadingProgress(progress?: number): void;
-  loadingComplete(
-      collectedEvents: Trace.Types.Events.Event[], exclusiveFilter: Trace.Extras.TraceFilter.TraceFilter|null,
-      metadata: Trace.Types.File.MetaData|null): Promise<void>;
+  loadingComplete(collectedEvents: Trace.Types.Events.Event[],
+                  exclusiveFilter: Trace.Extras.TraceFilter.TraceFilter|null,
+                  metadata: Trace.Types.File.MetaData|null): Promise<void>;
   loadingCompleteForTest(): void;
 }
 export interface RecordingOptions {

package/front_end/panels/timeline/TimelinePanel.ts

@@ -58,6 +58,7 @@ import * as PerfUI from '../../ui/legacy/components/perf_ui/perf_ui.js';
 import * as SettingsUI from '../../ui/legacy/components/settings_ui/settings_ui.js';
 import * as UI from '../../ui/legacy/legacy.js';
 import * as ThemeSupport from '../../ui/legacy/theme_support/theme_support.js';
+import * as SettingUIRegistration from '../../ui/settings/settings.js';
 import * as VisualLogging from '../../ui/visual_logging/visual_logging.js';
 import * as MobileThrottling from '../mobile_throttling/mobile_throttling.js';
 
@@ -1326,8 +1327,8 @@ export class TimelinePanel extends Common.ObjectWrapper.eventMixin<EventTypes, t
         MobileThrottling.CPUThrottlingSelector.CPUThrottlingSelector.createForGlobalConditions(cpuThrottlingPane);
 
     this.settingsPane.append(SettingsUI.SettingsUI.createSettingCheckbox(
-        this.captureSelectorStatsSetting.title(), this.captureSelectorStatsSetting,
-        i18nString(UIStrings.capturesSelectorStats)));
+        SettingUIRegistration.SettingUIRegistration.resolve(this.captureSelectorStatsSetting.descriptor()).title,
+        this.captureSelectorStatsSetting, i18nString(UIStrings.capturesSelectorStats)));
 
     const networkThrottlingPane = this.settingsPane.createChild('div');
     networkThrottlingPane.append(i18nString(UIStrings.network));
@@ -1337,17 +1338,18 @@ export class TimelinePanel extends Common.ObjectWrapper.eventMixin<EventTypes, t
     );
 
     this.settingsPane.append(SettingsUI.SettingsUI.createSettingCheckbox(
-        this.captureLayersAndPicturesSetting.title(), this.captureLayersAndPicturesSetting,
-        i18nString(UIStrings.capturesAdvancedPaint)));
+        SettingUIRegistration.SettingUIRegistration.resolve(this.captureLayersAndPicturesSetting.descriptor()).title,
+        this.captureLayersAndPicturesSetting, i18nString(UIStrings.capturesAdvancedPaint)));
 
     this.settingsPane.append(SettingsUI.SettingsUI.createSettingCheckbox(
-        this.disableCaptureJSProfileSetting.title(), this.disableCaptureJSProfileSetting,
-        i18nString(UIStrings.disablesJavascriptSampling)));
+        SettingUIRegistration.SettingUIRegistration.resolve(this.disableCaptureJSProfileSetting.descriptor()).title,
+        this.disableCaptureJSProfileSetting, i18nString(UIStrings.disablesJavascriptSampling)));
 
     const screenshotPresetSelect = new UI.Toolbar.ToolbarComboBox(
         () =>
             this.screenshotCaptureModeSetting.set((screenshotPresetSelect.selectedOption() as HTMLOptionElement).value),
-        this.screenshotCaptureModeSetting.title(), '', 'screenshot-capture-mode');
+        SettingUIRegistration.SettingUIRegistration.resolve(this.screenshotCaptureModeSetting.descriptor()).title, '',
+        'screenshot-capture-mode');
     let selectedScreenshotPresetIndex = 0;
     for (let i = 0; i < SCREENSHOT_CAPTURE_PRESETS.length; ++i) {
       const preset = SCREENSHOT_CAPTURE_PRESETS[i];
@@ -1359,7 +1361,8 @@ export class TimelinePanel extends Common.ObjectWrapper.eventMixin<EventTypes, t
     }
     screenshotPresetSelect.setSelectedIndex(selectedScreenshotPresetIndex);
     const screenshotPresetPane = this.settingsPane.createChild('div');
-    screenshotPresetPane.append(this.screenshotCaptureModeSetting.title());
+    screenshotPresetPane.append(
+        SettingUIRegistration.SettingUIRegistration.resolve(this.screenshotCaptureModeSetting.descriptor()).title);
     screenshotPresetPane.append(screenshotPresetSelect.element);
     // Surface the dropdown only when the "Screenshots" checkbox is on, since the
     // preset only affects the screenshots captured during the recording.

package/front_end/panels/timeline/TimelineUIUtils.ts

@@ -61,6 +61,7 @@ import * as LegacyComponents from '../../ui/legacy/components/utils/utils.js';
 import * as UI from '../../ui/legacy/legacy.js';
 import * as ThemeSupport from '../../ui/legacy/theme_support/theme_support.js';
 import {html, render} from '../../ui/lit/lit.js';
+import * as SettingUIRegistration from '../../ui/settings/settings.js';
 import * as PanelsCommon from '../common/common.js';
 
 import {getDurationString} from './AppenderUtils.js';
@@ -1278,10 +1279,12 @@ export class TimelineUIUtils {
         contentHelper.appendTextRow(i18nString(UIStrings.elementsAffected), unsafeEventArgs['elementCount']);
 
         const selectorStatsSetting =
-            Common.Settings.Settings.instance().createSetting('timeline-capture-selector-stats', false);
+            Common.Settings.Settings.instance().moduleSetting('timeline-capture-selector-stats');
         if (!selectorStatsSetting.get()) {
           const note = document.createElement('span');
-          note.textContent = i18nString(UIStrings.sSelectorStatsInfo, {PH1: selectorStatsSetting.title()});
+          note.textContent = i18nString(UIStrings.sSelectorStatsInfo, {
+            PH1: SettingUIRegistration.SettingUIRegistration.resolve(selectorStatsSetting.descriptor()).title,
+          });
           contentHelper.appendElementRow(i18nString(UIStrings.selectorStatsTitle), note);
         }
 

package/front_end/panels/timeline/overlays/components/EntryLabelOverlay.ts

@@ -14,13 +14,13 @@ import * as Platform from '../../../../core/platform/platform.js';
 import * as Root from '../../../../core/root/root.js';
 import * as AiAssistanceModels from '../../../../models/ai_assistance/ai_assistance.js';
 import * as Buttons from '../../../../ui/components/buttons/buttons.js';
+import * as Dialogs from '../../../../ui/components/dialogs/dialogs.js';
 import * as ComponentHelpers from '../../../../ui/components/helpers/helpers.js';
 import * as UIHelpers from '../../../../ui/helpers/helpers.js';
 import * as UI from '../../../../ui/legacy/legacy.js';
 import * as ThemeSupport from '../../../../ui/legacy/theme_support/theme_support.js';
 import * as Lit from '../../../../ui/lit/lit.js';
 import * as VisualLogging from '../../../../ui/visual_logging/visual_logging.js';
-import * as PanelCommon from '../../../common/common.js';
 
 import entryLabelOverlayStyles from './entryLabelOverlay.css.js';
 
@@ -568,7 +568,7 @@ export class EntryLabelOverlay extends HTMLElement {
    */
   async #showUserAiFirstRunDialog(): Promise<boolean> {
     this.dispatchEvent(new LabelAnnotationsConsentDialogVisibilityChange(true));
-    const userConsented = await PanelCommon.FreDialog.show({
+    const userConsented = await Dialogs.FreDialog.FreDialog.show({
       ariaLabel: i18nString(UIStrings.freDialog),
       header: {iconName: 'pen-spark', text: lockedString(UIStringsNotTranslate.freDisclaimerHeader)},
       reminderItems: [

package/front_end/panels/timeline/timelinePanel.css

@@ -151,16 +151,6 @@
   justify-content: space-between;
 }
 
-#memory-graphs-container .timeline-memory-header::after {
-  content: "";
-  /* stylelint-disable-next-line custom-property-pattern */
-  background-image: var(--image-file-toolbarResizerVertical);
-  background-repeat: no-repeat;
-  background-position: right center, center;
-  flex: 20px 0 0;
-  margin: 0 4px;
-}
-
 .timeline-memory-toolbar {
   flex-shrink: 1;
 }

package/front_end/panels/utils/utils.ts

@@ -21,35 +21,35 @@ const {ref, styleMap, ifDefined} = Directives;
 
 const UIStrings = {
   /**
-   * @description Tooltip to explain the resource's overridden status
+   * @description Tooltip to explain the resource's overridden status.
    */
   requestContentHeadersOverridden: 'Both request content and headers are overridden',
   /**
-   * @description Tooltip to explain the resource's overridden status
+   * @description Tooltip to explain the resource's overridden status.
    */
   requestContentOverridden: 'Request content is overridden',
   /**
-   * @description Tooltip to explain the resource's overridden status
+   * @description Tooltip to explain the resource's overridden status.
    */
   requestHeadersOverridden: 'Request headers are overridden',
   /**
-   * @description Tooltip to explain why the request has warning icon
+   * @description Tooltip to explain why the request has a warning icon.
    */
   thirdPartyPhaseout:
       'Cookies for this request are blocked either because of Chrome flags or browser configuration. Learn more in the Issues panel.',
   /**
-   * @description Tooltip to explain that a request was throttled
+   * @description Tooltip to explain that a request was throttled.
    * @example {Image} PH1
    * @example {3G} PH2
    */
   resourceTypeWithThrottling: '{PH1} (throttled to {PH2})',
   /**
-   * @description Tooltip for a failed request
+   * @description Tooltip for a failed request.
    * @example {Document} PH1
    */
   requestFailed: '{PH1} request failed',
   /**
-   * @description Tooltip for a failed request
+   * @description Tooltip for a failed prefetch request.
    * @example {Document} PH1
    */
   prefetchFailed: '{PH1} prefetch request failed',

package/front_end/services/tracing/PerformanceTracing.ts

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import type * as SDK from '../../core/sdk/sdk.js';
+import * as Trace from '../../models/trace/trace.js';
 
 import {TracingManager, type TracingManagerClient} from './TracingManager.js';
 
@@ -24,26 +25,13 @@ export class PerformanceTracing implements TracingManagerClient {
     }
 
     // This panel may be opened with trace data recorded in other tools.
-    // Keep in sync with the categories arrays in:
-    // https://source.chromium.org/chromium/chromium/src/+/main:third_party/devtools-frontend/src/front_end/panels/timeline/TimelineController.ts
-    // https://github.com/GoogleChrome/lighthouse/blob/master/lighthouse-core/gather/gatherers/trace.js
     const categories = [
       '-*',
-      'blink.console',
-      'blink.user_timing',
-      'devtools.timeline',
-      'disabled-by-default-devtools.screenshot',
-      'disabled-by-default-devtools.timeline',
-      'disabled-by-default-devtools.timeline.invalidationTracking',
-      'disabled-by-default-devtools.timeline.frame',
-      'disabled-by-default-devtools.timeline.stack',
-      'disabled-by-default-v8.cpu_profiler',
-      'disabled-by-default-v8.cpu_profiler.hires',
+      ...Trace.Types.Events.DefaultCategories,
+      ...Trace.Types.Events.OptionalCategories.JsSampling,
+      ...Trace.Types.Events.OptionalCategories.Screenshot,
+      ...Trace.Types.Events.OptionalCategories.InvalidationTracking,
       'latencyInfo',
-      'loading',
-      'disabled-by-default-lighthouse',
-      'v8.execute',
-      'v8',
     ].join(',');
 
     const started = await this.#tracingManager.start(this, categories);

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: cd73d963934f9330aa868dcc05bbce063513294b
+Revision: 41b7a5e674af3d9fbf97c86ae90137b4086b253c
 Update Mechanism: Manual (https://crbug.com/428069060)
 License: BSD-3-Clause
 License File: LICENSE