Backed out changeset 99f425b3e45c (bug 1516061) for causing build bustages. CLOSED TREE

gfx/layers/wr/WebRenderBridgeParent.cpp

@@ -2001,18 +2001,9 @@ TransactionId WebRenderBridgeParent::FlushTransactionIdsForEpoch(
           Telemetry::AccumulateCategorical(
               LABELS_CONTENT_FRAME_TIME_REASON::NoVsync);
         } else if (aCompositeStartId - transactionId.mVsyncId > 1) {
-          auto fullPaintTime = transactionId.mSceneBuiltTime - transactionId.mTxnStartTime;
           // Composite started late (and maybe took too long as well)
-          if (fullPaintTime >= TimeDuration::FromMilliseconds(20)) {
+          Telemetry::AccumulateCategorical(
-            Telemetry::AccumulateCategorical(
+              LABELS_CONTENT_FRAME_TIME_REASON::MissedComposite);
-                LABELS_CONTENT_FRAME_TIME_REASON::MissedCompositeLongPaint);
-          } else if (fullPaintTime >= TimeDuration::FromMilliseconds(10)) {
-            Telemetry::AccumulateCategorical(
-                LABELS_CONTENT_FRAME_TIME_REASON::MissedCompositeMidPaint);
-          } else {
-            Telemetry::AccumulateCategorical(
-                LABELS_CONTENT_FRAME_TIME_REASON::MissedComposite);
-          }
         } else {
           // Composite start on time, but must have taken too long.
           Telemetry::AccumulateCategorical(

toolkit/components/telemetry/Histograms.json

@@ -13222,7 +13222,7 @@
     "expires_in_version": "73",
     "kind": "categorical",
     "description": "The reason that CONTENT_FRAME_TIME recorded a slow (>200) result, if any.",
-    "labels": ["OnTime", "NoVsync", "MissedComposite", "SlowComposite", "MissedCompositeMidPaint", "MissedCompositeLongPaint"]
+    "labels": ["OnTime", "NoVsync", "MissedComposite", "SlowComposite"]
   },
   "CONTENT_LARGE_PAINT_PHASE_WEIGHT": {
     "record_in_processes": ["main", "content"],