Add scanline decoding to SkCodec.

dm/DMSrcSink.cpp

 #include "DMSrcSink.h"
 #include "SamplePipeControllers.h"
 #include "SkCommonFlags.h"
 #include "SkCodec.h"
 #include "SkDocument.h"
 #include "SkError.h"
 #include "SkMultiPictureDraw.h"
 #include "SkNullCanvas.h"
 #include "SkOSFile.h"
 #include "SkPictureData.h"
 #include "SkPictureRecorder.h"
 #include "SkRandom.h"
+#include "SkScanlineDecoder.h"
+#include "SkStream.h"
 #include "SkSVGCanvas.h"
-#include "SkStream.h"
 #include "SkXMLWriter.h"
 
 namespace DM {
 
 GMSrc::GMSrc(skiagm::GMRegistry::Factory factory) : fFactory(factory) {}
 
 Error GMSrc::draw(SkCanvas* canvas) const {
     SkAutoTDelete<skiagm::GM> gm(fFactory(NULL));
     canvas->concat(gm->getInitialTransform());
     gm->draw(canvas);
@@ skipping 38 matching lines @@
         decodeInfo = decodeInfo.makeAlphaType(kPremul_SkAlphaType);
     }
 
     SkBitmap bitmap;
     if (!bitmap.tryAllocPixels(decodeInfo)) {
         return SkStringPrintf("Image(%s) is too large (%d x %d)\n", fPath.c_str(),
                               decodeInfo.width(), decodeInfo.height());
     }
 
     SkAutoLockPixels alp(bitmap);
-    switch (codec->getPixels(decodeInfo, bitmap.getPixels(), bitmap.rowBytes())) {
-        case SkImageGenerator::kSuccess:
-        // We consider incomplete to be valid, since we should still decode what is
-        // available.
-        case SkImageGenerator::kIncompleteInput:
-            canvas->drawBitmap(bitmap, 0, 0);
-            return "";
-        case SkImageGenerator::kInvalidConversion:
-            return Error::Nonfatal("Incompatible colortype conversion");
-        default:
-            // Everything else is considered a failure.
-            return SkStringPrintf("Couldn't getPixels %s.", fPath.c_str());
+    SkScanlineDecoder* scanlineDecoder = codec->getScanlineDecoder(decodeInfo);
+    if (NULL == scanlineDecoder) {
+        return Error::Nonfatal("Cannot use scanline decoder for all images");
     }
+
+    for (int y = 0; y < decodeInfo.height(); ++y) {
+        const SkImageGenerator::Result result =
+        scanlineDecoder->getScanlines(bitmap.getAddr(0, y), 1, 0);
+        switch (result) {
+            case SkImageGenerator::kSuccess:
+                // We consider incomplete to be valid, since we should still decode what is
+                // available.
+            case SkImageGenerator::kIncompleteInput:
+                break;
+            default:
+                // Everything else is considered a failure.
+                return SkStringPrintf("Couldn't getPixels %s.", fPath.c_str());
+        }
+    }
+
+    const SkImageGenerator::Result result = scanlineDecoder->finish();
+    if (result != SkImageGenerator::kSuccess) {
+        return SkStringPrintf("failed in finish!");
+    }
+    canvas->drawBitmap(bitmap, 0, 0);
+    return "";
 }
 
 SkISize CodecSrc::size() const {
     SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
     SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
     return codec->getInfo().dimensions();
 }
 
 Name CodecSrc::name() const {
     return SkOSPath::Basename(fPath.c_str());
@@ skipping 478 matching lines @@
             surfaces.unrefAll();
             return "";
         }
         SkISize size() const SK_OVERRIDE { return fSize; }
         Name name() const SK_OVERRIDE { sk_throw(); return ""; }  // No one should be calling this.
     } proxy(fW, fH, pic, src.size());
     return fSink->draw(proxy, bitmap, stream, log);
 }
 
 }  // namespace DM