From 28d652639cbf89fa477f4545b0f84bd6f09c4ba4 Mon Sep 17 00:00:00 2001
From: Seth Fowler <seth@mozilla.com>
Date: Mon, 24 Nov 2014 23:42:43 -0800
Subject: [PATCH] Bug 1103328 (Part 3) - Fire HAS_TRANSPARENCY in
 nsIconDecoder. r=tn

---
 image/decoders/nsIconDecoder.cpp | 3 +++
 image/src/ProgressTracker.cpp    | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/image/decoders/nsIconDecoder.cpp b/image/decoders/nsIconDecoder.cpp
index cd6c55c7ab8..e7c32624ae1 100644
--- a/image/decoders/nsIconDecoder.cpp
+++ b/image/decoders/nsIconDecoder.cpp
@@ -59,6 +59,9 @@ nsIconDecoder::WriteInternal(const char* aBuffer, uint32_t aCount,
 
         // Post our size to the superclass
         PostSize(mWidth, mHeight);
+
+        PostHasTransparency();
+
         if (HasError()) {
           // Setting the size led to an error.
           mState = iconStateFinished;
diff --git a/image/src/ProgressTracker.cpp b/image/src/ProgressTracker.cpp
index e92564d4aa0..cd3e19057e8 100644
--- a/image/src/ProgressTracker.cpp
+++ b/image/src/ProgressTracker.cpp
@@ -79,7 +79,6 @@ CheckProgressConsistency(Progress aProgress)
     MOZ_ASSERT(aProgress & FLAG_SIZE_AVAILABLE);
   }
   if (aProgress & FLAG_HAS_TRANSPARENCY) {
-    MOZ_ASSERT(aProgress & FLAG_DECODE_STARTED);
     MOZ_ASSERT(aProgress & FLAG_SIZE_AVAILABLE);
   }
   if (aProgress & FLAG_IS_MULTIPART) {