image subsetting as part of the name instead of a separate source type

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"
 
 namespace DM {
@@ skipping 71 matching lines @@
     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 { return SkOSPath::Basename(fPath.c_str()); }
+Name ImageSrc::name() const {
+    Name name = SkOSPath::Basename(fPath.c_str());
+    if (fSubsets > 0) {
+        name.appendf("-%d-subsets", fSubsets);
+    }
+    return name;
+}
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 static const SkRect kSKPViewport = {0,0, 1000,1000};
 
 SKPSrc::SKPSrc(SkString path) : fPath(path) {}
 
 Error SKPSrc::draw(SkCanvas* canvas) const {
     SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(fPath.c_str()));
     if (!stream) {
@@ skipping 238 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