SkMultiPictureDocument & SkMultiPictureDocumentReader

dm/DM.cpp

Index: dm/DM.cpp
diff --git a/dm/DM.cpp b/dm/DM.cpp
index f29726e04c7f8db93b89079cedf81ea1e7f321a3..cd07a6b852fae6384d680280af5eed5fac96dafc 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -72,6 +72,8 @@ DEFINE_int32(shards, 1, "We're splitting source data into this many shards.");
 DEFINE_int32(shard,  0, "Which shard do I run?");
 DEFINE_bool(simpleCodec, false, "Only decode images to native scale");
 
+DEFINE_string(mskps, "", "Directory to read mskps from.");
+
 using namespace DM;
 using sk_gpu_test::GrContextFactory;
 using sk_gpu_test::GLTestContext;
@@ -702,6 +704,19 @@ static bool gather_srcs() {
         }
     }
 
+    for (int i = 0; i < FLAGS_mskps.count(); i++) {
+        const char* path = FLAGS_mskps[i];
+        if (sk_isdir(path)) {
+            SkOSFile::Iter it(path, "mskp");
+            for (SkString file; it.next(&file);) {
+                push_src("mskp", "",
+                         new MSKPSrc(SkOSPath::Join(path, file.c_str())));
+            }
+        } else {
+            push_src("mskp", "", new MSKPSrc(path));

[tomhudson, 2016/06/01 16:54:59]

The documentation says mskps is a directory, but we also allow it to be an
individual file?

[hal.canary, 2016/06/02 13:24:04]

Done.  (doc fixed)

+        }
+    }
+
     SkTArray<SkString> images;
     if (!CollectImages(FLAGS_images, &images)) {
         return false;