From fe00520851884ce0bc2a39e15726aab18e3dc76a Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Sat, 14 May 2016 00:08:18 +0200 Subject: [PATCH] Backed out changeset 2ac62de7365d (bug 1271002) for crash in GTest: [@ mozilla::image::RasterImage::UpdateImageContainer]. r=backout --- image/DecodePool.cpp | 1 - image/DecodePool.h | 6 +----- image/Decoder.cpp | 6 ------ 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/image/DecodePool.cpp b/image/DecodePool.cpp index 3561baf94f49..6df722567317 100644 --- a/image/DecodePool.cpp +++ b/image/DecodePool.cpp @@ -469,7 +469,6 @@ void DecodePool::NotifyProgress(Decoder* aDecoder) { MOZ_ASSERT(aDecoder); - MOZ_ASSERT(aDecoder->HasProgress() && !aDecoder->IsMetadataDecode()); if (!NS_IsMainThread() || (aDecoder->GetDecoderFlags() & DecoderFlags::ASYNC_NOTIFY)) { diff --git a/image/DecodePool.h b/image/DecodePool.h index df354bbce974..2bd0c0d77cbe 100644 --- a/image/DecodePool.h +++ b/image/DecodePool.h @@ -79,11 +79,6 @@ public: */ already_AddRefed GetIOEventTarget(); - /** - * Notify about progress on aDecoder. - */ - void NotifyProgress(Decoder* aDecoder); - private: friend class DecodePoolWorker; @@ -92,6 +87,7 @@ private: void Decode(Decoder* aDecoder); void NotifyDecodeComplete(Decoder* aDecoder); + void NotifyProgress(Decoder* aDecoder); static StaticRefPtr sSingleton; static uint32_t sNumCores; diff --git a/image/Decoder.cpp b/image/Decoder.cpp index ffd647828e0c..06b3480c570b 100644 --- a/image/Decoder.cpp +++ b/image/Decoder.cpp @@ -449,12 +449,6 @@ Decoder::PostFrameStop(Opacity aFrameOpacity mInvalidRect.UnionRect(mInvalidRect, gfx::IntRect(gfx::IntPoint(0, 0), GetSize())); } - - // If we are going to keep decoding we should notify now about the first frame being done. - if (mFrameCount == 1 && HasAnimation()) { - MOZ_ASSERT(HasProgress()); - DecodePool::Singleton()->NotifyProgress(this); - } } void