Fix bug in deferred decoding where we don't properly pass the unpremul option to the codec.

src/images/SkImageRef.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkImageRef.h"
 #include "SkBitmap.h"
 #include "SkReadBuffer.h"
@@ skipping 103 matching lines @@
         codec = fFactory->newDecoder(fStream);
     } else {
         codec = SkImageDecoder::Factory(fStream);
     }
 
     if (codec) {
         SkAutoTDelete<SkImageDecoder> ad(codec);
 
         codec->setSampleSize(fSampleSize);
         codec->setDitherImage(fDoDither);
+        codec->setRequireUnpremultipliedColors(this->info().fAlphaType == kUnpremul_SkAlphaType);
         if (this->onDecode(codec, fStream, &fBitmap, fBitmap.config(), mode)) {
             if (kOpaque_SkAlphaType == fBitmap.alphaType()) {
                 this->changeAlphaType(kOpaque_SkAlphaType);
             }
-            SkASSERT(this->info().fColorType == fBitmap.colorType());
-            SkASSERT(this->info().fWidth == fBitmap.width());
-            SkASSERT(this->info().fHeight == fBitmap.height());
+            SkASSERT(this->info() == fBitmap.info());
             return true;
         }
     }
 
 #ifdef DUMP_IMAGEREF_LIFECYCLE
     if (NULL == codec) {
         SkDebugf("--- ImageRef: <%s> failed to find codec\n", this->getURI());
     } else {
         SkDebugf("--- ImageRef: <%s> failed in codec for %d mode\n",
                  this->getURI(), mode);
@@ skipping 63 matching lines @@
     // now.
     if (!fStream->rewind()) {
         SkDEBUGF(("Failed to rewind SkImageRef stream!"));
         buffer.write32(0);
     } else {
         // FIXME: Handle getLength properly here. Perhaps this class should
         // take an SkStreamAsset.
         buffer.writeStream(fStream, fStream->getLength());
     }
 }