DM: write failed comparison mode .pngs one more level deep in the tree.

dm/DM.cpp

 // Main binary for DM.
 // For a high-level overview, please see dm/README.
 
 #include "GrContext.h"
 #include "GrContextFactory.h"
 #include "SkCommandLineFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
+#include "SkString.h"
 #include "gm.h"
 
 #include "DMReporter.h"
 #include "DMTask.h"
 #include "DMTaskRunner.h"
 #include "DMCpuTask.h"
 #include "DMGpuTask.h"
 
 #include <string.h>
 
@@ skipping 13 matching lines @@
                           "^ requires the start of the GM to match\n"
                           "$ requires the end of the GM to match\n"
                           "^ and $ requires an exact match\n"
                           "If a GM does not match any list entry,\n"
                           "it is skipped unless some list entry starts with ~");
 DEFINE_string(config, "8888 gpu",
         "Options: 565 8888 gpu msaa4 msaa16 gpunull gpudebug angle mesa"); // TODO(mtklein): pdf
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
-// Split str on any characters in delimiters into out.  (Think, strtok with a sane API.)
-static void split(const char* str, const char* delimiters, SkTArray<SkString>* out) {
-    const char* end = str + strlen(str);
-    while (str != end) {
-        // Find a token.
-        const size_t len = strcspn(str, delimiters);
-        out->push_back().set(str, len);
-        str += len;
-        // Skip any delimiters.
-        str += strspn(str, delimiters);
-    }
-}
-
 // "FooBar" -> "foobar".  Obviously, ASCII only.
 static SkString lowercase(SkString s) {
     for (size_t i = 0; i < s.size(); i++) {
         s[i] = tolower(s[i]);
     }
     return s;
 }
 
 static void kick_off_tasks(const SkTDArray<GMRegistry::Factory>& gms,
                            const SkTArray<SkString>& configs,
@@ skipping 62 matching lines @@
 };
 
 int tool_main(int argc, char** argv);
 int tool_main(int argc, char** argv) {
     SkGraphics::Init();
 
     SkCommandLineFlags::Parse(argc, argv);
     GM::SetResourcePath(FLAGS_resources[0]);
     SkTArray<SkString> configs;
     for (int i = 0; i < FLAGS_config.count(); i++) {
-        split(FLAGS_config[i], ", ", &configs);
+        SkStrSplit(FLAGS_config[i], ", ", &configs);
     }
 
     SkTDArray<GMRegistry::Factory> gms;
     for (const GMRegistry* reg = GMRegistry::Head(); reg != NULL; reg = reg->next()) {
         SkAutoTDelete<GM> gmForName(reg->factory()(NULL));
         if (!SkCommandLineFlags::ShouldSkip(FLAGS_match, gmForName->shortName())) {
             *gms.append() = reg->factory();
         }
     }
     SkDebugf("%d GMs x %d configs\n", gms.count(), configs.count());
@@ skipping 15 matching lines @@
     SkGraphics::Term();
 
     return reporter.failed() > 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char** argv) {
     return tool_main(argc, argv);
 }
 #endif