Backed out 2 changesets (bug 1737682) for causing build bustages on T…

…elemetryHistogramEnums.h. CLOSED TREE

Backed out changeset 297b16133aa9 (bug 1737682)
Backed out changeset 362b1e430789 (bug 1737682)

dom/media/test/manifest.js

@@ -2136,14 +2136,6 @@ var gDecodeSuspendTests = [
   },
 ];
 
-// These are video files with hardware-decodable formats and longer
-// durations that are looped while we check telemetry for macOS video
-// low power mode.
-var gVideoLowPowerTests = [
-  { name: "seek.ogv", type: "video/ogg", duration: 3.966 },
-  { name: "gizmo.mp4", type: "video/mp4", duration: 5.56 },
-];
-
 function checkMetadata(msg, e, test) {
   if (test.width) {
     is(e.videoWidth, test.width, msg + " video width");

dom/media/test/mochitest.ini

@@ -929,8 +929,6 @@ skip-if = true # bug 1021673
 [test_video_to_canvas.html]
 skip-if = toolkit == 'android' # android(bug 1232305), bugs 1320418,1347953,1347954,1348140,1348386
 [test_video_in_audio_element.html]
-[test_video_low_power_telemetry.html]
-skip-if = (os != 'mac') # This telemetry is macOS-specific.
 [test_video_stats_resistfingerprinting.html]
 tags = resistfingerprinting
 [test_videoDocumentTitle.html]
@@ -978,7 +976,7 @@ tags = cloneelementvisually
 tags = cloneelementvisually
 [test_cloneElementVisually_resource_change.html]
 skip-if =
-  os == "linux" && !(debug || asan || tsan) # Bug 1559308 - lower frequency intermittent
+  os == "linux" && !(debug || asan || tsan) # Bug 1559308 - lower frequency intermittent 
 tags = cloneelementvisually
 [test_cloneElementVisually_no_suspend.html]
 tags = cloneelementvisually

gfx/layers/NativeLayerCA.h

@@ -42,21 +42,6 @@ namespace layers {
 class NativeLayerRootSnapshotterCA;
 class SurfacePoolHandleCA;
 
-enum class VideoLowPowerType {
-  // These must be kept synchronized with the telemetry histogram enums.
-  NotVideo,           // Never emitted as telemetry. No video is visible.
-  Success,            // As best we can tell, we are in the "detached",
-                      // low-power compositing mode.
-  FailMultipleVideo,  // There is more than one video visible.
-  FailWindowed,       // The window is not fullscreen.
-  FailOverlaid,       // Something is on top of the video (likely captions).
-  FailBacking,        // The layer behind the video is not full-coverage black.
-  FailMacOSVersion,   // macOS version does not meet requirements.
-  FailPref,           // Pref is not set.
-  FailSurface,        // Surface is not eligible.
-  FailEnqueue,        // Enqueueing the video didn't work.
-};
-
 // NativeLayerRootCA is the CoreAnimation implementation of the NativeLayerRoot
 // interface. A NativeLayerRootCA is created by the widget around an existing
 // CALayer with a call to CreateForCALayer - this CALayer is the root of the
@@ -137,8 +122,7 @@ class NativeLayerRootCA : public NativeLayerRoot {
       gfx::DeviceColor aColor) override;
 
   void SetWindowIsFullscreen(bool aFullscreen);
-
-  VideoLowPowerType CheckVideoLowPower();
+  void NoteMouseMoveAtTime(const TimeStamp& aTime);
 
  protected:
   explicit NativeLayerRootCA(CALayer* aLayer);
@@ -180,12 +164,6 @@ class NativeLayerRootCA : public NativeLayerRoot {
   // Updated by the layer's view's window to match the fullscreen state
   // of that window.
   bool mWindowIsFullscreen = false;
-
-  // How many times have we committed since the last time we emitted
-  // telemetry?
-  unsigned int mTelemetryCommitCount = 0;
-  static const unsigned int TELEMETRY_COMMIT_PERIOD =
-      600;  // 10 seconds at 60fps
 };
 
 class RenderSourceNLRS;