Issue #21 - Remove remaining telemetry structs, callers and flags.

2 files changed, 1 insertions, 56 deletions

diff --git a/image/Decoder.h b/image/Decoder.h
index ed0c196876..c0f4a20a67 100644
--- a/image/Decoder.h
+++ b/image/Decoder.h
@@ -23,10 +23,6 @@
 
 namespace mozilla {
 
-namespace Telemetry {
-  enum ID : uint32_t;
-} // namespace Telemetry
-
 namespace image {
 
 class imgFrame;
@@ -57,41 +53,6 @@ struct DecoderFinalStatus final
   const bool mShouldReportError : 1;
 };
 
-struct DecoderTelemetry final
-{
-  DecoderTelemetry(Maybe<Telemetry::ID> aSpeedHistogram,
-                   size_t aBytesDecoded,
-                   uint32_t aChunkCount,
-                   TimeDuration aDecodeTime)
-    : mSpeedHistogram(aSpeedHistogram)
-    , mBytesDecoded(aBytesDecoded)
-    , mChunkCount(aChunkCount)
-    , mDecodeTime(aDecodeTime)
-  { }
-
-  /// @return our decoder's speed, in KBps.
-  int32_t Speed() const
-  {
-    return mBytesDecoded / (1024 * mDecodeTime.ToSeconds());
-  }
-
-  /// @return our decoder's decode time, in microseconds.
-  int32_t DecodeTimeMicros() { return mDecodeTime.ToMicroseconds(); }
-
-  /// The per-image-format telemetry ID for recording our decoder's speed, or
-  /// Nothing() if we don't record speed telemetry for this kind of decoder.
-  const Maybe<Telemetry::ID> mSpeedHistogram;
-
-  /// The number of bytes of input our decoder processed.
-  const size_t mBytesDecoded;
-
-  /// The number of chunks our decoder's input was divided into.
-  const uint32_t mChunkCount;
-
-  /// The amount of time our decoder spent inside DoDecode().
-  const TimeDuration mDecodeTime;
-};
-
 class Decoder
 {
 public:
@@ -359,9 +320,6 @@ public:
   /// @return the metadata we collected about this image while decoding.
   const ImageMetadata& GetImageMetadata() { return mImageMetadata; }
 
-  /// @return performance telemetry we collected while decoding.
-  DecoderTelemetry Telemetry() const;
-
   /**
    * @return a weak pointer to the image associated with this decoder. Illegal
    * to call if this decoder is not associated with an image.
@@ -383,7 +341,6 @@ public:
 
 
 protected:
-  friend class AutoRecordDecoderTelemetry;
   friend class nsICODecoder;
   friend class PalettedSurfaceSink;
   friend class SurfaceSink;
@@ -405,13 +362,6 @@ protected:
   virtual nsresult FinishInternal();
   virtual nsresult FinishWithErrorInternal();
 
-  /**
-   * @return the per-image-format telemetry ID for recording this decoder's
-   * speed, or Nothing() if we don't record speed telemetry for this kind of
-   * decoder.
-   */
-  virtual Maybe<Telemetry::ID> SpeedHistogram() const { return Nothing(); }
-
 
   /*
    * Progress notifications.
@@ -534,9 +484,6 @@ private:
   gfx::IntRect mFirstFrameRefreshArea;  // The area of the image that needs to
                                         // be invalidated when the animation loops.
 
-  // Telemetry data for this decoder.
-  TimeDuration mDecodeTime;
-
   DecoderFlags mDecoderFlags;
   SurfaceFlags mSurfaceFlags;
 
diff --git a/image/RasterImage.h b/image/RasterImage.h
index 56e9e6372a..860983b22e 100644
--- a/image/RasterImage.h
+++ b/image/RasterImage.h
@@ -137,7 +137,6 @@ namespace image {
 
 class Decoder;
 struct DecoderFinalStatus;
-struct DecoderTelemetry;
 class ImageMetadata;
 class SourceBuffer;
 
@@ -205,14 +204,13 @@ public:
 
   /**
    * Records decoding results, sends out any final notifications, updates the
-   * state of this image, and records telemetry.
+   * state of this image.
    *
    * Main-thread only.
    *
    * @param aStatus       Final status information about the decoder. (Whether it
    *                      encountered an error, etc.)
    * @param aMetadata     Metadata about this image that the decoder gathered.
-   * @param aTelemetry    Telemetry data about the decoder.
    * @param aProgress     Any final progress notifications to send.
    * @param aInvalidRect  Any final invalidation rect to send.
    * @param aFrameCount   If Some(), a final updated count of the number of frames