dm: allow multiple --skp flags, allow single files

Review URL: https://codereview.chromium.org/885353002

diff --git a/dm/DM.cpp b/dm/DM.cpp
index 900eb58a0322aad2f1016f6b1c99f8987bcbd64a..dd4e48fc5dd116cacee09ad87806182b2bd53564 100644 (file)
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -122,10 +122,15 @@ static void gather_srcs() {
     for (const skiagm::GMRegistry* r = skiagm::GMRegistry::Head(); r; r = r->next()) {
         push_src("gm", new GMSrc(r->factory()));
     }
-    if (!FLAGS_skps.isEmpty()) {
-        SkOSFile::Iter it(FLAGS_skps[0], "skp");
-        for (SkString file; it.next(&file); ) {
-            push_src("skp", new SKPSrc(SkOSPath::Join(FLAGS_skps[0], file.c_str())));
+    for (int i = 0; i < FLAGS_skps.count(); i++) {
+        const char* path = FLAGS_skps[i];
+        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(SkString(path)));
         }
     }
     if (!FLAGS_images.isEmpty()) {