Chromium Code Reviews| Index: dm/DM.cpp |
| diff --git a/dm/DM.cpp b/dm/DM.cpp |
| index 900eb58a0322aad2f1016f6b1c99f8987bcbd64a..bf5e8d8d66e388f75eec99c9c4cf05a1307e981f 100644 |
| --- 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) { |
|
mtklein
2015/01/30 15:12:19
Rest of the file uses i++.
hal.canary
2015/01/30 15:19:59
Done.
|
| + 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))); |
|
mtklein
2015/01/30 15:12:19
I think SKPSrc(path) will work fine here?
hal.canary
2015/01/30 15:19:59
It does not.
|
| } |
| } |
| if (!FLAGS_images.isEmpty()) { |