Suggestions and merge in the other CL.

dm/DMSrcSink.h

 #ifndef DMSrcSink_DEFINED
 #define DMSrcSink_DEFINED
 
 #include "DMGpuSupport.h"
 #include "SkBBHFactory.h"
 #include "SkBBoxHierarchy.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkGPipe.h"
@@ skipping 43 matching lines @@
 
     Error draw(SkCanvas*) const SK_OVERRIDE;
     SkISize size() const SK_OVERRIDE;
     Name name() const SK_OVERRIDE;
 private:
     skiagm::GMRegistry::Factory fFactory;
 };
 
 class ImageSrc : public Src {
 public:
-    explicit ImageSrc(Path path, int subsets = 0);
+    // divisor == 0 means decode the whole image
+    // divisor > 0 means decode in subsets, dividing into a divisor x divisor grid.
+    explicit ImageSrc(Path path, int divisor = 0);
 
     Error draw(SkCanvas*) const SK_OVERRIDE;
     SkISize size() const SK_OVERRIDE;
     Name name() const SK_OVERRIDE;
 private:
     Path fPath;

[scroggo, 2015/01/30 21:15:09]

The other CL made this const. Is it deliberately not const?

[mtklein, 2015/01/30 21:16:42]

Oh no, not really.  It doesn't make much of a difference when all the methods
are const anyway.

-    int  fSubsets;
+    const int  fDivisor;
 };
 
 class SKPSrc : public Src {
 public:
     explicit SKPSrc(Path path);
 
     Error draw(SkCanvas*) const SK_OVERRIDE;
     SkISize size() const SK_OVERRIDE;
     Name name() const SK_OVERRIDE;
 private:
@@ skipping 100 matching lines @@
     Error draw(const Src& src, SkBitmap*, SkWStream* out) const SK_OVERRIDE {
         return src.draw(SkCreateNullCanvas());
     }
     int enclave() const SK_OVERRIDE { return kAnyThread_Enclave; }
     const char* fileExtension() const SK_OVERRIDE { return ""; }
 };
 
 }  // namespace DM
 
 #endif//DMSrcSink_DEFINED