Bug 802168 - Don't shut down the decoder when we're destroying RasterImages; instead, just remove ourselves from the decoding list. r=jrmuizel,jdm

image/src/Decoder.cpp

@@ -29,7 +29,6 @@ Decoder::Decoder(RasterImage &aImage, imgIDecoderObserver* aObserver)
 
 Decoder::~Decoder()
 {
-  NS_WARN_IF_FALSE(!mInFrame, "Shutting down decoder mid-frame!");
   mInitialized = false;
 }
 

image/src/RasterImage.cpp

@@ -399,11 +399,11 @@ RasterImage::~RasterImage()
     DiscardTracker::Remove(&mDiscardTrackerNode);
   }
 
-  // If we have a decoder open, shut it down
   if (mDecoder) {
-    nsresult rv = ShutdownDecoder(eShutdownIntent_Interrupted);
-    if (NS_FAILED(rv))
-      NS_WARNING("Failed to shut down decoder in destructor!");
+    // Kill off our decode request, if it's pending.  (If not, this call is
+    // harmless.)
+    DecodeWorker::Singleton()->StopDecoding(this);
+    mDecoder = nullptr;
   }
 
   delete mAnim;