Issue #21 - Remove Telemetry plumbing and fix build.

Note this won't give working applications. Requires FE changes and
additional js module changes (next part).

6 files changed, 0 insertions, 27 deletions

diff --git a/image/decoders/nsGIFDecoder2.cpp b/image/decoders/nsGIFDecoder2.cpp
index 6f2be1fa18..7a0628e8eb 100644
--- a/image/decoders/nsGIFDecoder2.cpp
+++ b/image/decoders/nsGIFDecoder2.cpp
@@ -52,7 +52,6 @@ mailing address.
 #include "gfxPlatform.h"
 #include "qcms.h"
 #include <algorithm>
-#include "mozilla/Telemetry.h"
 
 using namespace mozilla::gfx;
 
@@ -1088,11 +1087,5 @@ nsGIFDecoder2::SkipSubBlocks(const char* aData)
                                   nextSubBlockLength);
 }
 
-Maybe<Telemetry::ID>
-nsGIFDecoder2::SpeedHistogram() const
-{
-  return Some(Telemetry::IMAGE_DECODE_SPEED_GIF);
-}
-
 } // namespace image
 } // namespace mozilla
diff --git a/image/decoders/nsGIFDecoder2.h b/image/decoders/nsGIFDecoder2.h
index c903ce890a..d1bf90e507 100644
--- a/image/decoders/nsGIFDecoder2.h
+++ b/image/decoders/nsGIFDecoder2.h
@@ -29,8 +29,6 @@ protected:
                        IResumable* aOnResume) override;
   nsresult FinishInternal() override;
 
-  Maybe<Telemetry::ID> SpeedHistogram() const override;
-
 private:
   friend class DecoderFactory;
 
diff --git a/image/decoders/nsJPEGDecoder.cpp b/image/decoders/nsJPEGDecoder.cpp
index 7dac18e271..7fc749890f 100644
--- a/image/decoders/nsJPEGDecoder.cpp
+++ b/image/decoders/nsJPEGDecoder.cpp
@@ -24,7 +24,6 @@
 
 #include "gfxPlatform.h"
 #include "mozilla/EndianUtils.h"
-#include "mozilla/Telemetry.h"
 
 extern "C" {
 #include "iccjpeg.h"
@@ -123,12 +122,6 @@ nsJPEGDecoder::~nsJPEGDecoder()
           this));
 }
 
-Maybe<Telemetry::ID>
-nsJPEGDecoder::SpeedHistogram() const
-{
-  return Some(Telemetry::IMAGE_DECODE_SPEED_JPEG);
-}
-
 nsresult
 nsJPEGDecoder::InitInternal()
 {
diff --git a/image/decoders/nsJPEGDecoder.h b/image/decoders/nsJPEGDecoder.h
index 260e913031..7df89318c9 100644
--- a/image/decoders/nsJPEGDecoder.h
+++ b/image/decoders/nsJPEGDecoder.h
@@ -65,8 +65,6 @@ protected:
                        IResumable* aOnResume) override;
   nsresult FinishInternal() override;
 
-  Maybe<Telemetry::ID> SpeedHistogram() const override;
-
 protected:
   Orientation ReadOrientationFromEXIF();
   void OutputScanlines(bool* suspend);
diff --git a/image/decoders/nsPNGDecoder.cpp b/image/decoders/nsPNGDecoder.cpp
index 1f19c41bc4..78ed182d5b 100644
--- a/image/decoders/nsPNGDecoder.cpp
+++ b/image/decoders/nsPNGDecoder.cpp
@@ -22,7 +22,6 @@
 #include "RasterImage.h"
 #include "SurfacePipeFactory.h"
 #include "mozilla/DebugOnly.h"
-#include "mozilla/Telemetry.h"
 
 using namespace mozilla::gfx;
 
@@ -1087,12 +1086,6 @@ nsPNGDecoder::warning_callback(png_structp png_ptr, png_const_charp warning_msg)
   MOZ_LOG(sPNGLog, LogLevel::Warning, ("libpng warning: %s\n", warning_msg));
 }
 
-Maybe<Telemetry::ID>
-nsPNGDecoder::SpeedHistogram() const
-{
-  return Some(Telemetry::IMAGE_DECODE_SPEED_PNG);
-}
-
 bool
 nsPNGDecoder::IsValidICO() const
 {
diff --git a/image/decoders/nsPNGDecoder.h b/image/decoders/nsPNGDecoder.h
index 4b5c50ac50..7e677d40ab 100644
--- a/image/decoders/nsPNGDecoder.h
+++ b/image/decoders/nsPNGDecoder.h
@@ -30,8 +30,6 @@ protected:
   LexerResult DoDecode(SourceBufferIterator& aIterator,
                        IResumable* aOnResume) override;
 
-  Maybe<Telemetry::ID> SpeedHistogram() const override;
-
 private:
   friend class DecoderFactory;