GoogleChrome · devtools-bot · May 26, 2021 · May 24, 2021 · May 24, 2021 · May 24, 2021
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -16,7 +16,6 @@ module.exports = {
     onlyAudits: [
       'first-meaningful-paint',
       'speed-index',
-      'first-cpu-idle',
       'interactive',
     ],
   },
@@ -127,8 +126,7 @@ The audits property controls which audits to run and include with your Lighthous
 ```js
 {
   audits: [
-    'first-meaningful-paint',
-    'first-cpu-idle',
+    'first-contentful-paint',
     'byte-efficiency/uses-optimized-images',
   ]
 }
@@ -150,7 +148,7 @@ The categories property controls how to score and organize the audit results in
       description: 'This category judges your performance',
       auditRefs: [
         {id: 'first-meaningful-paint', weight: 2, group: 'metrics'},
-        {id: 'first-cpu-idle', weight: 3, group: 'metrics'},
+        {id: 'first-contentful-paint', weight: 3, group: 'metrics'},
         {id: 'interactive', weight: 5, group: 'metrics'},
       ],
     }

diff --git a/docs/performance-budgets.md b/docs/performance-budgets.md
@@ -90,11 +90,9 @@ Use the optional `timings` property to define budgets for time-based performance
 Supported timing metrics:
 
 - `first-contentful-paint`
-- `first-cpu-idle`
 - `interactive`
 - `first-meaningful-paint`
 - `max-potential-fid`
-- `estimated-input-latency`
 - `total-blocking-time`
 - `speed-index`
 - `largest-contentful-paint`

diff --git a/docs/readme.md b/docs/readme.md
@@ -83,7 +83,6 @@ In order to extend the Lighthouse configuration programmatically, you need to pa
     onlyAudits: [
       'first-meaningful-paint',
       'speed-index',
-      'first-cpu-idle',
       'interactive',
     ],
   },

diff --git a/lighthouse-cli/test/cli/__snapshots__/index-test.js.snap b/lighthouse-cli/test/cli/__snapshots__/index-test.js.snap
@@ -33,9 +33,6 @@ Object {
     Object {
       "path": "final-screenshot",
     },
-    Object {
-      "path": "metrics/estimated-input-latency",
-    },
     Object {
       "path": "metrics/total-blocking-time",
     },
@@ -51,9 +48,6 @@ Object {
     Object {
       "path": "server-response-time",
     },
-    Object {
-      "path": "metrics/first-cpu-idle",
-    },
     Object {
       "path": "metrics/interactive",
     },
@@ -924,11 +918,6 @@ Object {
           ],
           "weight": 5,
         },
-        Object {
-          "acronym": "FCI",
-          "id": "first-cpu-idle",
-          "weight": 0,
-        },
         Object {
           "id": "max-potential-fid",
           "weight": 0,
@@ -938,10 +927,6 @@ Object {
           "id": "first-meaningful-paint",
           "weight": 0,
         },
-        Object {
-          "id": "estimated-input-latency",
-          "weight": 0,
-        },
         Object {
           "group": "load-opportunities",
           "id": "render-blocking-resources",

diff --git a/lighthouse-cli/test/smokehouse/test-definitions/lantern/lantern-expectations.js b/lighthouse-cli/test/smokehouse/test-definitions/lantern/lantern-expectations.js
@@ -18,9 +18,10 @@ module.exports = [
         'first-contentful-paint': {
           numericValue: '>2000',
         },
-        'first-cpu-idle': {
-          numericValue: '>2000',
-        },
+        // TODO: ?
+        // 'first-cpu-idle': {
+        //   numericValue: '>2000',
+        // },
         'interactive': {
           numericValue: '>2000',
         },

diff --git a/lighthouse-cli/test/smokehouse/test-definitions/perf/expectations.js b/lighthouse-cli/test/smokehouse/test-definitions/perf/expectations.js
@@ -26,9 +26,6 @@ module.exports = [
         'first-meaningful-paint': {
           score: '>=0.90', // primarily just making sure it didn't fail/go crazy, specific value isn't that important
         },
-        'first-cpu-idle': {
-          score: '>=0.90', // primarily just making sure it didn't fail/go crazy, specific value isn't that important
-        },
         'interactive': {
           score: '>=0.90', // primarily just making sure it didn't fail/go crazy, specific value isn't that important
         },

diff --git a/lighthouse-cli/test/smokehouse/test-definitions/perf/perf-config.js b/lighthouse-cli/test/smokehouse/test-definitions/perf/perf-config.js
@@ -41,7 +41,6 @@ const perfConfig = {
       ],
       timings: [
         {metric: 'first-contentful-paint', budget: 2000},
-        {metric: 'first-cpu-idle', budget: 2000},
         {metric: 'interactive', budget: 2000},
         {metric: 'first-meaningful-paint', budget: 2000},
         {metric: 'max-potential-fid', budget: 2000},

diff --git a/lighthouse-cli/test/smokehouse/test-definitions/tricky-metrics/expectations.js b/lighthouse-cli/test/smokehouse/test-definitions/tricky-metrics/expectations.js
@@ -17,10 +17,6 @@ module.exports = [
       requestedUrl: 'http://localhost:10200/tricky-tti.html',
       finalUrl: 'http://localhost:10200/tricky-tti.html',
       audits: {
-        'first-cpu-idle': {
-          // stalls for ~5 seconds, ~5 seconds out, so should be at least ~10s
-          numericValue: '>9900',
-        },
         'interactive': {
           // stalls for ~5 seconds, ~5 seconds out, so should be at least ~10s
           numericValue: '>9900',
@@ -33,10 +29,6 @@ module.exports = [
       requestedUrl: 'http://localhost:10200/tricky-tti-late-fcp.html',
       finalUrl: 'http://localhost:10200/tricky-tti-late-fcp.html',
       audits: {
-        'first-cpu-idle': {
-          // FCP at least ~5 seconds out
-          numericValue: '>4900',
-        },
         'interactive': {
           // FCP at least ~5 seconds out
           numericValue: '>4900',

diff --git a/lighthouse-core/audits/metrics/estimated-input-latency.js b/lighthouse-core/audits/metrics/estimated-input-latency.js
diff --git a/lighthouse-core/audits/metrics/first-cpu-idle.js b/lighthouse-core/audits/metrics/first-cpu-idle.js
diff --git a/lighthouse-core/audits/predictive-perf.js b/lighthouse-core/audits/predictive-perf.js
@@ -11,9 +11,7 @@ const i18n = require('../lib/i18n/i18n.js');
 const LanternFcp = require('../computed/metrics/lantern-first-contentful-paint.js');
 const LanternFmp = require('../computed/metrics/lantern-first-meaningful-paint.js');
 const LanternInteractive = require('../computed/metrics/lantern-interactive.js');
-const LanternFirstCPUIdle = require('../computed/metrics/lantern-first-cpu-idle.js');
 const LanternSpeedIndex = require('../computed/metrics/lantern-speed-index.js');
-const LanternEil = require('../computed/metrics/lantern-estimated-input-latency.js');
 const LanternLcp = require('../computed/metrics/lantern-largest-contentful-paint.js');
 
 // Parameters (in ms) for log-normal CDF scoring. To see the curve:
@@ -53,9 +51,7 @@ class PredictivePerf extends Audit {
     const fcp = await LanternFcp.request({trace, devtoolsLog, settings}, context);
     const fmp = await LanternFmp.request({trace, devtoolsLog, settings}, context);
     const tti = await LanternInteractive.request({trace, devtoolsLog, settings}, context);
-    const ttfcpui = await LanternFirstCPUIdle.request({trace, devtoolsLog, settings}, context);
     const si = await LanternSpeedIndex.request({trace, devtoolsLog, settings}, context);
-    const eil = await LanternEil.request({trace, devtoolsLog, settings}, context);
     const lcp = await LanternLcp.request({trace, devtoolsLog, settings}, context);
 
     const values = {
@@ -71,18 +67,10 @@ class PredictivePerf extends Audit {
       optimisticTTI: tti.optimisticEstimate.timeInMs,
       pessimisticTTI: tti.pessimisticEstimate.timeInMs,
 
-      roughEstimateOfTTFCPUI: ttfcpui.timing,
-      optimisticTTFCPUI: ttfcpui.optimisticEstimate.timeInMs,
-      pessimisticTTFCPUI: ttfcpui.pessimisticEstimate.timeInMs,
-
       roughEstimateOfSI: si.timing,
       optimisticSI: si.optimisticEstimate.timeInMs,
       pessimisticSI: si.pessimisticEstimate.timeInMs,
 
-      roughEstimateOfEIL: eil.timing,
-      optimisticEIL: eil.optimisticEstimate.timeInMs,
-      pessimisticEIL: eil.pessimisticEstimate.timeInMs,
-
       roughEstimateOfLCP: lcp.timing,
       optimisticLCP: lcp.optimisticEstimate.timeInMs,
       pessimisticLCP: lcp.pessimisticEstimate.timeInMs,

diff --git a/lighthouse-core/audits/timing-budget.js b/lighthouse-core/audits/timing-budget.js
@@ -48,11 +48,9 @@ class TimingBudget extends Audit {
     /** @type {Record<LH.Budget.TimingMetric, string>} */
     const strMappings = {
       'first-contentful-paint': i18n.UIStrings.firstContentfulPaintMetric,
-      'first-cpu-idle': i18n.UIStrings.firstCPUIdleMetric,
       'interactive': i18n.UIStrings.interactiveMetric,
       'first-meaningful-paint': i18n.UIStrings.firstMeaningfulPaintMetric,
       'max-potential-fid': i18n.UIStrings.maxPotentialFIDMetric,
-      'estimated-input-latency': i18n.UIStrings.estimatedInputLatencyMetric,
       'total-blocking-time': i18n.UIStrings.totalBlockingTimeMetric,
       'speed-index': i18n.UIStrings.speedIndexMetric,
       'largest-contentful-paint': i18n.UIStrings.largestContentfulPaintMetric,
@@ -70,11 +68,9 @@ class TimingBudget extends Audit {
     /** @type {Record<LH.Budget.TimingMetric, number|undefined>} */
     const measurements = {
       'first-contentful-paint': summary.firstContentfulPaint,
-      'first-cpu-idle': summary.firstCPUIdle,
       'interactive': summary.interactive,
       'first-meaningful-paint': summary.firstMeaningfulPaint,
       'max-potential-fid': summary.maxPotentialFID,
-      'estimated-input-latency': summary.estimatedInputLatency,
       'total-blocking-time': summary.totalBlockingTime,
       'speed-index': summary.speedIndex,
       'largest-contentful-paint': summary.largestContentfulPaint,
@@ -115,14 +111,14 @@ class TimingBudget extends Audit {
     // Defining type here overrides the column setting so that it doesn't receive ms units.
     const clsItem = items.find(item => item.metric === 'cumulative-layout-shift');
     if (clsItem) {
-      if (typeof clsItem.measurement !== 'object') {
+      if (typeof clsItem.measurement === 'number') {
         clsItem.measurement = {
           type: 'numeric',
           value: Number(clsItem.measurement),
           granularity: 0.01,
         };
       }
-      if (typeof clsItem.overBudget !== 'object') {
+      if (typeof clsItem.overBudget === 'number') {
         clsItem.overBudget = {
           type: 'numeric',
           value: Number(clsItem.overBudget),