Suggestions and merge in the other CL.

dm/DMSrcSink.h

Index: dm/DMSrcSink.h
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h
index 16f7c144eba5f43b7c0ba249244501349848155e..bf8e7d6810d7465957b72b0b23402a62b7b62e88 100644
--- a/dm/DMSrcSink.h
+++ b/dm/DMSrcSink.h
@@ -61,14 +61,16 @@ private:
 
 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 {