Suggestions and merge in the other CL.

dm/DMSrcSink.cpp

 #include "DMSrcSink.h"
 #include "SamplePipeControllers.h"
 #include "SkCommonFlags.h"
 #include "SkDocument.h"
 #include "SkMultiPictureDraw.h"
 #include "SkOSFile.h"
 #include "SkPictureRecorder.h"
 #include "SkRandom.h"
 #include "SkStream.h"
 
@@ skipping 13 matching lines @@
     return gm->getISize();
 }
 
 Name GMSrc::name() const {
     SkAutoTDelete<skiagm::GM> gm(fFactory(NULL));
     return gm->getName();
 }
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-ImageSrc::ImageSrc(Path path, int subsets) : fPath(path), fSubsets(subsets) {}
+ImageSrc::ImageSrc(Path path, int divisor) : fPath(path), fDivisor(divisor) {}
 
 Error ImageSrc::draw(SkCanvas* canvas) const {
     SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
     if (!encoded) {
         return SkStringPrintf("Couldn't read %s.", fPath.c_str());
     }
-    if (fSubsets == 0) {
+    const SkColorType dstColorType = canvas->imageInfo().colorType();
+    if (fDivisor == 0) {
         // Decode the full image.
         SkBitmap bitmap;
-        if (!SkImageDecoder::DecodeMemory(encoded->data(), encoded->size(), &bitmap)) {
+        if (!SkImageDecoder::DecodeMemory(encoded->data(), encoded->size(), &bitmap,
+                                          dstColorType, SkImageDecoder::kDecodePixels_Mode)) {
             return SkStringPrintf("Couldn't decode %s.", fPath.c_str());
         }
         encoded.reset((SkData*)NULL);  // Might as well drop this when we're done with it.
         canvas->drawBitmap(bitmap, 0,0);
         return "";
     }
-    // Decode random subsets.  This is a little involved.
+    // Decode subsets.  This is a little involved.
     SkAutoTDelete<SkMemoryStream> stream(new SkMemoryStream(encoded));
     SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(stream.get()));
     if (!decoder) {
         return SkStringPrintf("Can't find a good decoder for %s.", fPath.c_str());
     }
     stream->rewind();
     int w,h;
     if (!decoder->buildTileIndex(stream.detach(), &w, &h) || w*h == 1) {
         return "";  // Not an error.  Subset decoding is not always supported.
     }
-    SkRandom rand;
-    for (int i = 0; i < fSubsets; i++) {
-        SkIRect rect;
-        do {
-            rect.fLeft   = rand.nextULessThan(w);
-            rect.fTop    = rand.nextULessThan(h);
-            rect.fRight  = rand.nextULessThan(w);
-            rect.fBottom = rand.nextULessThan(h);
-            rect.sort();
-        } while (rect.isEmpty());
-        SkBitmap subset;
-        if (!decoder->decodeSubset(&subset, rect, kUnknown_SkColorType/*use best fit*/)) {
-            return SkStringPrintf("Could not decode subset %d.\n", i);
+
+    // Divide the image into subsets that cover the entire image.
+    if (fDivisor > w || fDivisor > h) {
+        return SkStringPrintf("divisor %d is too big for %s with dimensions (%d x %d)",
+                              fDivisor, fPath.c_str(), w, h);
+    }
+    const int subsetWidth  = w / fDivisor,
+              subsetHeight = h / fDivisor;
+    for (int y = 0; y < h; y += subsetHeight) {
+        for (int x = 0; x < w; x += subsetWidth) {
+            SkBitmap subset;
+            SkIRect rect = SkIRect::MakeXYWH(x, y, subsetWidth, subsetHeight);
+            if (!decoder->decodeSubset(&subset, rect, dstColorType)) {
+                return SkStringPrintf("Could not decode subset (%d, %d, %d, %d).",
+                                      x, y, x+subsetWidth, y+subsetHeight);
+            }
+            canvas->drawBitmap(subset, SkIntToScalar(x), SkIntToScalar(y));
         }
-        canvas->drawBitmap(subset, SkIntToScalar(rect.fLeft), SkIntToScalar(rect.fTop));
     }
     return "";
 }
 
 SkISize ImageSrc::size() const {
     SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
     SkBitmap bitmap;
     if (!encoded || !SkImageDecoder::DecodeMemory(encoded->data(),
                                                   encoded->size(),
                                                   &bitmap,
                                                   kUnknown_SkColorType,
                                                   SkImageDecoder::kDecodeBounds_Mode)) {
         return SkISize::Make(0,0);
     }
     return bitmap.dimensions();
 }
 
 Name ImageSrc::name() const {
-    Name name = SkOSPath::Basename(fPath.c_str());
-    if (fSubsets > 0) {
-        name.appendf("-%d-subsets", fSubsets);
-    }
-    return name;
+    return SkOSPath::Basename(fPath.c_str());
 }
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 static const SkRect kSKPViewport = {0,0, 1000,1000};
 
 SKPSrc::SKPSrc(Path path) : fPath(path) {}
 
 Error SKPSrc::draw(SkCanvas* canvas) const {
     SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(fPath.c_str()));
@@ skipping 271 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);
 }
 
 }  // namespace DM