diff options
author | Moonchild <mcwerewolf@gmail.com> | 2018-09-03 18:26:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-03 18:26:19 +0200 |
commit | 2e00eb87ef299e6eb7521670e6a6720fee19f5fc (patch) | |
tree | c44670a25d942a672951e430499f70978ec7d337 /image | |
parent | 45f9a0daad81d1c6a1188b3473e5f0c67d27c0aa (diff) | |
parent | ab961aeb54335fd07c66de2e3b8c3b6af6f89ea2 (diff) | |
download | UXP-2e00eb87ef299e6eb7521670e6a6720fee19f5fc.tar UXP-2e00eb87ef299e6eb7521670e6a6720fee19f5fc.tar.gz UXP-2e00eb87ef299e6eb7521670e6a6720fee19f5fc.tar.lz UXP-2e00eb87ef299e6eb7521670e6a6720fee19f5fc.tar.xz UXP-2e00eb87ef299e6eb7521670e6a6720fee19f5fc.zip |
Merge pull request #745 from MoonchildProductions/Kill-Telemetry
Remove all C++ Telemetry Accumulation calls.
Diffstat (limited to 'image')
-rw-r--r-- | image/RasterImage.cpp | 31 | ||||
-rw-r--r-- | image/imgFrame.cpp | 3 |
2 files changed, 1 insertions, 33 deletions
diff --git a/image/RasterImage.cpp b/image/RasterImage.cpp index aad705473..b67ec3bef 100644 --- a/image/RasterImage.cpp +++ b/image/RasterImage.cpp @@ -39,8 +39,8 @@ #include "mozilla/MemoryReporting.h" #include "mozilla/Services.h" #include <stdint.h> -#include "mozilla/Telemetry.h" #include "mozilla/TimeStamp.h" +#include "mozilla/Telemetry.h" #include "mozilla/Tuple.h" #include "mozilla/ClearOnShutdown.h" #include "mozilla/gfx/Scale.h" @@ -104,9 +104,6 @@ RasterImage::~RasterImage() // Release all frames from the surface cache. SurfaceCache::RemoveImage(ImageKey(this)); - - // Record Telemetry. - Telemetry::Accumulate(Telemetry::IMAGE_DECODE_COUNT, mDecodeCount); } nsresult @@ -1365,19 +1362,9 @@ RasterImage::Draw(gfxContext* aContext, return DrawResult::NOT_READY; } - bool shouldRecordTelemetry = !mDrawStartTime.IsNull() && - surface->IsFinished(); - auto result = DrawInternal(Move(surface), aContext, aSize, aRegion, aSamplingFilter, flags); - if (shouldRecordTelemetry) { - TimeDuration drawLatency = TimeStamp::Now() - mDrawStartTime; - Telemetry::Accumulate(Telemetry::IMAGE_DECODE_ON_DRAW_LATENCY, - int32_t(drawLatency.ToMicroseconds())); - mDrawStartTime = TimeStamp(); - } - return result; } @@ -1614,22 +1601,6 @@ RasterImage::NotifyDecodeComplete(const DecoderFinalStatus& aStatus, mAnimationState->SetDoneDecoding(true); } - // Do some telemetry if this isn't a metadata decode. - if (!aStatus.mWasMetadataDecode) { - if (aTelemetry.mChunkCount) { - Telemetry::Accumulate(Telemetry::IMAGE_DECODE_CHUNKS, aTelemetry.mChunkCount); - } - - if (aStatus.mFinished) { - Telemetry::Accumulate(Telemetry::IMAGE_DECODE_TIME, - int32_t(aTelemetry.mDecodeTime.ToMicroseconds())); - - if (aTelemetry.mSpeedHistogram) { - Telemetry::Accumulate(*aTelemetry.mSpeedHistogram, aTelemetry.Speed()); - } - } - } - // Only act on errors if we have no usable frames from the decoder. if (aStatus.mHadError && (!mAnimationState || mAnimationState->KnownFrameCount() == 0)) { diff --git a/image/imgFrame.cpp b/image/imgFrame.cpp index 9c5bf9b99..5da2ccec5 100644 --- a/image/imgFrame.cpp +++ b/image/imgFrame.cpp @@ -22,7 +22,6 @@ #include "mozilla/gfx/Tools.h" #include "mozilla/Likely.h" #include "mozilla/MemoryReporting.h" -#include "mozilla/Telemetry.h" #include "nsMargin.h" #include "nsThreadUtils.h" @@ -620,8 +619,6 @@ imgFrame::Finish(Opacity aFrameOpacity /* = Opacity::SOME_TRANSPARENCY */, if (aFrameOpacity == Opacity::FULLY_OPAQUE) { mHasNoAlpha = true; - Telemetry::Accumulate(Telemetry::IMAGE_DECODE_OPAQUE_BGRA, - mFormat == SurfaceFormat::B8G8R8A8); } mDisposalMethod = aDisposalMethod; |