SkMultiPictureDocument & SkMultiPictureDocumentReader

dm/DM.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "CrashHandler.h"
 #include "DMJsonWriter.h"
 #include "DMSrcSink.h"
@@ skipping 54 matching lines @@
 DEFINE_string2(readPath, r, "", "If set check for equality with golden results in this directory.");
 
 DEFINE_string(uninterestingHashesFile, "",
         "File containing a list of uninteresting hashes. If a result hashes to something in "
         "this list, no image is written for that result.");
 
 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;
 using sk_gpu_test::ContextInfo;
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 static const double kStartMs = SkTime::GetMSecs();
 
 static FILE* gVLog;
@@ skipping 610 matching lines @@
         if (sk_isdir(path)) {
             SkOSFile::Iter it(path, "skp");
             for (SkString file; it.next(&file); ) {
                 push_src("skp", "", new SKPSrc(SkOSPath::Join(path, file.c_str())));
             }
         } else {
             push_src("skp", "", new SKPSrc(path));
         }
     }
 
+    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;
     }
 
     for (auto image : images) {
         push_codec_srcs(image);
         if (FLAGS_simpleCodec) {
             continue;
         }
@@ skipping 668 matching lines @@
 #endif
 }
 } // namespace skiatest
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif