Add a "mode" tag to key in DM json output.

dm/DMWriteTask.cpp

 #include "DMWriteTask.h"
 
 #include "DMUtil.h"
 #include "SkColorPriv.h"
 #include "SkCommonFlags.h"
 #include "SkData.h"
 #include "SkImageEncoder.h"
 #include "SkMD5.h"
 #include "SkMallocPixelRef.h"
 #include "SkOSFile.h"
@@ skipping 60 matching lines @@
     hasher.finish(digest);
 
     SkString md5;
     for (int i = 0; i < 16; i++) {
         md5.appendf("%02x", digest.data[i]);
     }
     return md5;
 }
 
 struct JsonData {
-    SkString name;        // E.g. "ninepatch-stretch", "desk-gws_skp"
-    SkString config;      //      "gpu", "8888"
-    SkString sourceType;  //      "GM", "SKP"
-    SkString md5;  // In ASCII, so 32 bytes long.
+    SkString name;            // E.g. "ninepatch-stretch", "desk-gws_skp"
+    SkString config;          //      "gpu", "8888"
+    SkString mode;            //      "direct", "default-tilegrid", "pipe"
+    SkString sourceType;      //      "GM", "SKP"
+    SkString md5;             // In ASCII, so 32 bytes long.
 };
 SkTArray<JsonData> gJsonData;
 SK_DECLARE_STATIC_MUTEX(gJsonDataLock);
 
 void WriteTask::draw() {
     SkString md5;
     {
         SkAutoLockPixels lock(fBitmap);
         md5 = fData ? get_md5(fData->getMemoryBase(), fData->getLength())
                     : get_md5(fBitmap.getPixels(), fBitmap.getSize());
     }
 
-    JsonData entry = { fBaseName, fSuffixes[0], fSourceType, md5 };
+    SkASSERT(fSuffixes.count() > 0);
+    SkString config = fSuffixes.back();
+    SkString mode("direct");
+    if (fSuffixes.count() > 1) {
+        mode = fSuffixes.fromBack(1);
+    }
+
+    JsonData entry = { fBaseName, config, mode, fSourceType, md5 };
     {
         SkAutoMutexAcquire lock(&gJsonDataLock);
         gJsonData.push_back(entry);
     }
 
     SkString dir(FLAGS_writePath[0]);
 #if SK_BUILD_FOR_IOS
     if (dir.equals("@")) {
         dir.set(FLAGS_resourcePath[0]);
     }
@@ skipping 61 matching lines @@
     for (int i = 1; i < FLAGS_key.count(); i += 2) {
         root["key"][FLAGS_key[i-1]] = FLAGS_key[i];
     }
 
     {
         SkAutoMutexAcquire lock(&gJsonDataLock);
         for (int i = 0; i < gJsonData.count(); i++) {
             Json::Value result;
             result["key"]["name"]            = gJsonData[i].name.c_str();
             result["key"]["config"]          = gJsonData[i].config.c_str();
+            result["key"]["mode"]            = gJsonData[i].mode.c_str();
             result["options"]["source_type"] = gJsonData[i].sourceType.c_str();
             result["md5"]                    = gJsonData[i].md5.c_str();
 
             root["results"].append(result);
         }
     }
 
     SkString path = SkOSPath::Join(FLAGS_writePath[0], "dm.json");
     SkFILEWStream stream(path.c_str());
     stream.writeText(Json::StyledWriter().write(root).c_str());
     stream.flush();
 }
 
 }  // namespace DM