Bug 1956726 - remove the CONTENT_FRAME_TIME_REASON histogram that has already been migrated to Glean, r=chutten.

Differential Revision: https://phabricator.services.mozilla.com/D242766

gfx/layers/ipc/CompositorBridgeParent.cpp

@@ -62,7 +62,6 @@
 #include "mozilla/PodOperations.h"
 #include "mozilla/ProfilerLabels.h"
 #include "mozilla/ProfilerMarkers.h"
-#include "mozilla/Telemetry.h"
 #include "mozilla/glean/GfxMetrics.h"
 #include "nsCOMPtr.h"         // for already_AddRefed
 #include "nsDebug.h"          // for NS_ASSERTION, etc
@@ -80,7 +79,6 @@
 #include "mozilla/Hal.h"
 #include "mozilla/HalTypes.h"
 #include "mozilla/StaticPtr.h"
-#include "mozilla/Telemetry.h"
 #include "mozilla/VsyncDispatcher.h"
 #if defined(XP_WIN) || defined(MOZ_WIDGET_GTK)
 #  include "VsyncSource.h"
@@ -102,8 +100,6 @@ using namespace mozilla::gfx;
 
 using base::ProcessId;
 
-using mozilla::Telemetry::LABELS_CONTENT_FRAME_TIME_REASON;
-
 /* static*/
 StaticMonitor CompositorBridgeParent::sIndirectLayerTreesLock;
 
@@ -1765,7 +1761,7 @@ int32_t RecordContentFrameTime(
           static_cast<unsigned long long>(fracLatencyNorm));
     }
 
-    // Record CONTENT_FRAME_TIME_REASON.
+    // Record glean::gfx_content_frame_time::reason
     //
     // Note that deseralizing a layers update (RecvUpdate) can delay the receipt
     // of the composite vsync message
@@ -1792,8 +1788,6 @@ int32_t RecordContentFrameTime(
     // when we choose to not do it.
     if (fracLatencyNorm < 200) {
       // Success
-      Telemetry::AccumulateCategorical(
-          LABELS_CONTENT_FRAME_TIME_REASON::OnTime);
       mozilla::glean::gfx_content_frame_time::reason
           .EnumGet(glean::gfx_content_frame_time::ReasonLabel::eOnTime)
           .Add();
@@ -1801,44 +1795,32 @@ int32_t RecordContentFrameTime(
       if (aCompositeId == VsyncId()) {
         // aCompositeId is 0, possibly something got trigged from
         // outside vsync?
-        Telemetry::AccumulateCategorical(
-            LABELS_CONTENT_FRAME_TIME_REASON::NoVsyncNoId);
         mozilla::glean::gfx_content_frame_time::reason
             .EnumGet(glean::gfx_content_frame_time::ReasonLabel::eNoVsyncNoId)
             .Add();
       } else if (aTxnId >= aCompositeId) {
         // Vsync ids are nonsensical, maybe we're trying to catch up?
-        Telemetry::AccumulateCategorical(
-            LABELS_CONTENT_FRAME_TIME_REASON::NoVsync);
         mozilla::glean::gfx_content_frame_time::reason
             .EnumGet(glean::gfx_content_frame_time::ReasonLabel::eNoVsync)
             .Add();
       } else if (aCompositeId - aTxnId > 1) {
         // Composite started late (and maybe took too long as well)
         if (aFullPaintTime >= TimeDuration::FromMilliseconds(20)) {
-          Telemetry::AccumulateCategorical(
-              LABELS_CONTENT_FRAME_TIME_REASON::MissedCompositeLong);
           mozilla::glean::gfx_content_frame_time::reason
               .EnumGet(glean::gfx_content_frame_time::ReasonLabel::
                            eMissedCompositeLong)
               .Add();
         } else if (aFullPaintTime >= TimeDuration::FromMilliseconds(10)) {
-          Telemetry::AccumulateCategorical(
-              LABELS_CONTENT_FRAME_TIME_REASON::MissedCompositeMid);
           mozilla::glean::gfx_content_frame_time::reason
               .EnumGet(glean::gfx_content_frame_time::ReasonLabel::
                            eMissedCompositeMid)
               .Add();
         } else if (aFullPaintTime >= TimeDuration::FromMilliseconds(5)) {
-          Telemetry::AccumulateCategorical(
-              LABELS_CONTENT_FRAME_TIME_REASON::MissedCompositeLow);
           mozilla::glean::gfx_content_frame_time::reason
               .EnumGet(glean::gfx_content_frame_time::ReasonLabel::
                            eMissedCompositeLow)
               .Add();
         } else {
-          Telemetry::AccumulateCategorical(
-              LABELS_CONTENT_FRAME_TIME_REASON::MissedComposite);
           mozilla::glean::gfx_content_frame_time::reason
               .EnumGet(
                   glean::gfx_content_frame_time::ReasonLabel::eMissedComposite)
@@ -1846,8 +1828,6 @@ int32_t RecordContentFrameTime(
         }
       } else {
         // Composite started on time, but must have taken too long.
-        Telemetry::AccumulateCategorical(
-            LABELS_CONTENT_FRAME_TIME_REASON::SlowComposite);
         mozilla::glean::gfx_content_frame_time::reason
             .EnumGet(glean::gfx_content_frame_time::ReasonLabel::eSlowComposite)
             .Add();

toolkit/components/telemetry/Histograms.json

@@ -11929,28 +11929,6 @@
     "n_buckets": 50,
     "description": "The time, in percentage of a vsync interval, spent from beginning a paint in the content process until that frame is presented in the compositor by WebRender, excluding time spent uploading any content"
   },
-  "CONTENT_FRAME_TIME_REASON": {
-    "record_in_processes": ["main", "gpu"],
-    "products": ["firefox"],
-    "alert_emails": [
-      "gfx-telemetry-alerts@mozilla.com",
-      "mwoodrow@mozilla.com"
-    ],
-    "bug_numbers": [1510853, 1584109],
-    "expires_in_version": "never",
-    "kind": "categorical",
-    "description": "The reason that CONTENT_FRAME_TIME recorded a slow (>200) result, if any.",
-    "labels": [
-      "OnTime",
-      "NoVsync",
-      "MissedComposite",
-      "SlowComposite",
-      "MissedCompositeMid",
-      "MissedCompositeLong",
-      "MissedCompositeLow",
-      "NoVsyncNoId"
-    ]
-  },
   "CONTENT_SMALL_PAINT_PHASE_WEIGHT_PARTIAL": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox", "fennec"],