chrome-devtools-frontend 1.0.1402249 → 1.0.1418433

package/front_end/panels/mobile_throttling/ThrottlingManager.ts

@@ -23,7 +23,7 @@ import {
 
 export interface CPUThrottlingSelectorWrapper {
   control: UI.Toolbar.ToolbarComboBox;
-  updateRecommendedRate(recommendedRate: number|null): void;
+  updateRecommendedOption(recommendedOption: SDK.CPUThrottlingManager.CPUThrottlingOption|null): void;
 }
 
 export interface NetworkThrottlingSelectorWrapper {
@@ -67,15 +67,6 @@ const UIStrings = {
    *@description Screen reader label for a select box that chooses the CPU throttling speed in the Performance panel
    */
   cpuThrottling: 'CPU throttling',
-  /**
-   *@description Text for no network throttling
-   */
-  noThrottling: 'No throttling',
-  /**
-   *@description Text in Throttling Manager of the Network panel
-   *@example {2} PH1
-   */
-  dSlowdown: '{PH1}× slowdown',
   /**
    *@description Tooltip text in Throttling Manager of the Performance panel
    */
@@ -97,7 +88,15 @@ const UIStrings = {
    * @example {Fast 4G} PH1
    * @example {4x slowdown} PH1
    */
-  recommendedThrottling: '{PH1} - recommended',
+  recommendedThrottling: '{PH1} – recommended',
+  /**
+   * @description Text to prompt the user to run the CPU calibration process.
+   */
+  calibrate: 'Calibrate…',
+  /**
+   * @description Text to prompt the user to re-run the CPU calibration process.
+   */
+  recalibrate: 'Recalibrate…',
 };
 const str_ = i18n.i18n.registerUIStrings('panels/mobile_throttling/ThrottlingManager.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
@@ -105,9 +104,11 @@ let throttlingManagerInstance: ThrottlingManager;
 
 export class ThrottlingManager {
   private readonly cpuThrottlingControls: Set<UI.Toolbar.ToolbarComboBox>;
-  private readonly cpuThrottlingRates: number[];
+  private readonly cpuThrottlingOptions: SDK.CPUThrottlingManager.CPUThrottlingOption[];
   private readonly customNetworkConditionsSetting: Common.Settings.Setting<SDK.NetworkManager.Conditions[]>;
   private readonly currentNetworkThrottlingConditionsSetting: Common.Settings.Setting<SDK.NetworkManager.Conditions>;
+  private readonly calibratedCpuThrottlingSetting:
+      Common.Settings.Setting<SDK.CPUThrottlingManager.CalibratedCPUThrottling>;
   private lastNetworkThrottlingConditions!: SDK.NetworkManager.Conditions;
   private readonly cpuThrottlingManager: SDK.CPUThrottlingManager.CPUThrottlingManager;
   #hardwareConcurrencyOverrideEnabled = false;
@@ -121,11 +122,14 @@ export class ThrottlingManager {
         SDK.CPUThrottlingManager.Events.RATE_CHANGED,
         (event: Common.EventTarget.EventTargetEvent<number>) => this.onCPUThrottlingRateChangedOnSDK(event.data));
     this.cpuThrottlingControls = new Set();
-    this.cpuThrottlingRates = ThrottlingPresets.cpuThrottlingPresets;
+    this.cpuThrottlingOptions = ThrottlingPresets.cpuThrottlingPresets;
     this.customNetworkConditionsSetting =
         Common.Settings.Settings.instance().moduleSetting('custom-network-conditions');
     this.currentNetworkThrottlingConditionsSetting = Common.Settings.Settings.instance().createSetting(
         'preferred-network-condition', SDK.NetworkManager.NoThrottlingConditions);
+    this.calibratedCpuThrottlingSetting =
+        Common.Settings.Settings.instance().createSetting<SDK.CPUThrottlingManager.CalibratedCPUThrottling>(
+            'calibrated-cpu-throttling', {}, Common.Settings.SettingStorageType.GLOBAL);
 
     this.currentNetworkThrottlingConditionsSetting.setSerializer(new SDK.NetworkManager.ConditionsSerializer());
 
@@ -234,16 +238,17 @@ export class ThrottlingManager {
     UI.InspectorView.InspectorView.instance().setPanelWarnings('timeline', warnings);
   }
 
-  setCPUThrottlingRate(rate: number): void {
+  setCPUThrottlingOption(option: SDK.CPUThrottlingManager.CPUThrottlingOption): void {
     // This will transitively call onCPUThrottlingRateChangedOnSDK.
-    this.cpuThrottlingManager.setCPUThrottlingRate(rate);
+    this.cpuThrottlingManager.setCPUThrottlingOption(option);
   }
 
   onCPUThrottlingRateChangedOnSDK(rate: number): void {
     if (rate !== SDK.CPUThrottlingManager.CPUThrottlingRates.NO_THROTTLING) {
       Host.userMetrics.actionTaken(Host.UserMetrics.Action.CpuThrottlingEnabled);
     }
-    const index = this.cpuThrottlingRates.indexOf(rate);
+
+    const index = this.cpuThrottlingOptions.indexOf(this.cpuThrottlingManager.cpuThrottlingOption());
     for (const control of this.cpuThrottlingControls) {
       control.setSelectedIndex(index);
     }
@@ -332,40 +337,59 @@ export class ThrottlingManager {
   }
 
   createCPUThrottlingSelector(): CPUThrottlingSelectorWrapper {
-    const control = new UI.Toolbar.ToolbarComboBox(
-        event => this.setCPUThrottlingRate(this.cpuThrottlingRates[(event.target as HTMLSelectElement).selectedIndex]),
-        i18nString(UIStrings.cpuThrottling), '', 'cpu-throttling');
+    const getCalibrationString = (): Common.UIString.LocalizedString => {
+      const value = this.calibratedCpuThrottlingSetting.get();
+      const hasCalibrated = value.low || value.mid;
+      return hasCalibrated ? i18nString(UIStrings.recalibrate) : i18nString(UIStrings.calibrate);
+    };
+
+    const optionSelected = (): void => {
+      if (control.selectedIndex() === control.options().length - 1) {
+        const index = this.cpuThrottlingOptions.indexOf(this.cpuThrottlingManager.cpuThrottlingOption());
+        control.setSelectedIndex(index);
+        void Common.Revealer.reveal(this.calibratedCpuThrottlingSetting);
+      } else {
+        this.setCPUThrottlingOption(this.cpuThrottlingOptions[control.selectedIndex()]);
+      }
+    };
+
+    const control =
+        new UI.Toolbar.ToolbarComboBox(optionSelected, i18nString(UIStrings.cpuThrottling), '', 'cpu-throttling');
     this.cpuThrottlingControls.add(control);
-    const currentRate = this.cpuThrottlingManager.cpuThrottlingRate();
+    const currentOption = this.cpuThrottlingManager.cpuThrottlingOption();
 
-    const titles: string[] = [];
     const optionEls: HTMLOptionElement[] = [];
-    const rates = this.cpuThrottlingRates;
-
-    for (let i = 0; i < this.cpuThrottlingRates.length; ++i) {
-      const rate = this.cpuThrottlingRates[i];
-      const title = rate === 1 ? i18nString(UIStrings.noThrottling) : i18nString(UIStrings.dSlowdown, {PH1: rate});
-      const value = rate === 1 ? 'cpu-no-throttling' : `cpu-throttled-${rate}`;
-      const option = control.createOption(title, value);
-      control.addOption(option);
-      if (currentRate === rate) {
+    const options = this.cpuThrottlingOptions;
+
+    for (let i = 0; i < this.cpuThrottlingOptions.length; ++i) {
+      const option = this.cpuThrottlingOptions[i];
+      const title = option.title();
+      const value = option.jslogContext;
+      const optionEl = control.createOption(title, value);
+      control.addOption(optionEl);
+      if (currentOption === option) {
         control.setSelectedIndex(i);
       }
 
-      titles.push(title);
-      optionEls.push(option);
+      optionEls.push(optionEl);
     }
 
+    const optionEl = control.createOption(getCalibrationString(), '');
+    control.addOption(optionEl);
+    optionEls.push(optionEl);
+
     return {
       control,
-      updateRecommendedRate(recommendedRate: number|null) {
-        for (let i = 0; i < optionEls.length; i++) {
-          let title = titles[i];
-          if (rates[i] === recommendedRate) {
-            title = i18nString(UIStrings.recommendedThrottling, {PH1: title});
-          }
-          optionEls[i].text = title;
+      updateRecommendedOption(recommendedOption: SDK.CPUThrottlingManager.CPUThrottlingOption|null) {
+        for (let i = 0; i < optionEls.length - 1; i++) {
+          const option = options[i];
+          optionEls[i].text = option === recommendedOption ?
+              i18nString(UIStrings.recommendedThrottling, {PH1: option.title()}) :
+              option.title();
+          optionEls[i].disabled = option.rate() === 0;
         }
+
+        optionEls[optionEls.length - 1].textContent = getCalibrationString();
       },
     };
   }

package/front_end/panels/mobile_throttling/ThrottlingPresets.ts

@@ -17,11 +17,16 @@ const UIStrings = {
   /**
    *@description Text in Throttling Presets of the Network panel
    */
-  lowendMobile: 'Low-end mobile',
+  lowTierMobile: 'Low-tier mobile',
   /**
    *@description Text in Throttling Presets of the Network panel
    */
   slowGXCpuSlowdown: 'Slow 3G & 6x CPU slowdown',
+  /**
+   * @description Text in Throttling Presets of the Network panel
+   * @example {2.2} PH1
+   */
+  slowGXCpuSlowdownCalibrated: 'Slow 3G & {PH1}x CPU slowdown',
   /**
    *@description Text in Throttling Presets of the Network panel
    */
@@ -30,6 +35,11 @@ const UIStrings = {
    *@description Text in Throttling Presets of the Network panel
    */
   fastGXCpuSlowdown: 'Fast 3G & 4x CPU slowdown',
+  /**
+   * @description Text in Throttling Presets of the Network panel
+   * @example {2.2} PH1
+   */
+  fastGXCpuSlowdownCalibrated: 'Fast 3G & {PH1}x CPU slowdown',
   /**
    *@description Text in Network Throttling Selector of the Network panel
    */
@@ -51,7 +61,7 @@ export class ThrottlingPresets {
       title,
       description: i18nString(UIStrings.noThrottling),
       network: SDK.NetworkManager.NoThrottlingConditions,
-      cpuThrottlingRate: SDK.CPUThrottlingManager.CPUThrottlingRates.NO_THROTTLING,
+      cpuThrottlingOption: SDK.CPUThrottlingManager.NoThrottlingOption,
       jslogContext: 'no-throttling',
     };
   }
@@ -64,27 +74,41 @@ export class ThrottlingPresets {
       title,
       description: i18nString(UIStrings.noInternetConnectivity),
       network: SDK.NetworkManager.OfflineConditions,
-      cpuThrottlingRate: SDK.CPUThrottlingManager.CPUThrottlingRates.NO_THROTTLING,
+      cpuThrottlingOption: SDK.CPUThrottlingManager.NoThrottlingOption,
       jslogContext: 'offline',
     };
   }
 
   static getLowEndMobileConditions(): Conditions {
+    const useCalibrated = SDK.CPUThrottlingManager.CalibratedLowTierMobileThrottlingOption.rate() !== 0;
+    const cpuThrottlingOption = useCalibrated ? SDK.CPUThrottlingManager.CalibratedLowTierMobileThrottlingOption :
+                                                SDK.CPUThrottlingManager.LowTierThrottlingOption;
+    const description = useCalibrated ?
+        i18nString(UIStrings.slowGXCpuSlowdownCalibrated, {PH1: cpuThrottlingOption.rate()}) :
+        i18nString(UIStrings.slowGXCpuSlowdown);
+
     return {
-      title: i18nString(UIStrings.lowendMobile),
-      description: i18nString(UIStrings.slowGXCpuSlowdown),
+      title: i18nString(UIStrings.lowTierMobile),
+      description,
       network: SDK.NetworkManager.Slow3GConditions,
-      cpuThrottlingRate: SDK.CPUThrottlingManager.CPUThrottlingRates.LowEndMobile,
+      cpuThrottlingOption,
       jslogContext: 'low-end-mobile',
     };
   }
 
   static getMidTierMobileConditions(): Conditions {
+    const useCalibrated = SDK.CPUThrottlingManager.CalibratedMidTierMobileThrottlingOption.rate() !== 0;
+    const cpuThrottlingOption = useCalibrated ? SDK.CPUThrottlingManager.CalibratedMidTierMobileThrottlingOption :
+                                                SDK.CPUThrottlingManager.MidTierThrottlingOption;
+    const description = useCalibrated ?
+        i18nString(UIStrings.fastGXCpuSlowdownCalibrated, {PH1: cpuThrottlingOption.rate()}) :
+        i18nString(UIStrings.fastGXCpuSlowdown);
+
     return {
       title: i18nString(UIStrings.midtierMobile),
-      description: i18nString(UIStrings.fastGXCpuSlowdown),
+      description,
       network: SDK.NetworkManager.Slow4GConditions,
-      cpuThrottlingRate: SDK.CPUThrottlingManager.CPUThrottlingRates.MidTierMobile,
+      cpuThrottlingOption,
       jslogContext: 'mid-tier-mobile',
     };
   }
@@ -154,11 +178,13 @@ export class ThrottlingPresets {
     SDK.NetworkManager.OfflineConditions,
   ];
 
-  static cpuThrottlingPresets: SDK.CPUThrottlingManager.CPUThrottlingRates[] = [
-    SDK.CPUThrottlingManager.CPUThrottlingRates.NO_THROTTLING,
-    SDK.CPUThrottlingManager.CPUThrottlingRates.MidTierMobile,
-    SDK.CPUThrottlingManager.CPUThrottlingRates.LowEndMobile,
-    SDK.CPUThrottlingManager.CPUThrottlingRates.EXTRA_SLOW,
+  static cpuThrottlingPresets: SDK.CPUThrottlingManager.CPUThrottlingOption[] = [
+    SDK.CPUThrottlingManager.NoThrottlingOption,
+    SDK.CPUThrottlingManager.MidTierThrottlingOption,
+    SDK.CPUThrottlingManager.LowTierThrottlingOption,
+    SDK.CPUThrottlingManager.ExtraSlowThrottlingOption,
+    SDK.CPUThrottlingManager.CalibratedLowTierMobileThrottlingOption,
+    SDK.CPUThrottlingManager.CalibratedMidTierMobileThrottlingOption,
   ];
 }
 
@@ -171,7 +197,7 @@ export interface Conditions {
   title: string;
   description: string;
   network: SDK.NetworkManager.Conditions;
-  cpuThrottlingRate: number;
+  cpuThrottlingOption: SDK.CPUThrottlingManager.CPUThrottlingOption;
   jslogContext?: string;
 }