DM: set source options only when non-empty.

dm/DMJsonWriter.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "DMJsonWriter.h"
 
 #include "ProcStats.h"
@@ skipping 34 matching lines @@
         root[FLAGS_properties[i-1]] = FLAGS_properties[i];
     }
     for (int i = 1; i < FLAGS_key.count(); i += 2) {
         root["key"][FLAGS_key[i-1]] = FLAGS_key[i];
     }
 
     {
         SkAutoMutexAcquire lock(&gBitmapResultLock);
         for (int i = 0; i < gBitmapResults.count(); i++) {
             Json::Value result;
-            result["key"]["name"]           = gBitmapResults[i].name.c_str();
-            result["key"]["config"]         = gBitmapResults[i].config.c_str();
-            result["key"]["source_type"]    = gBitmapResults[i].sourceType.c_str();
-            result["key"]["source_options"] = gBitmapResults[i].sourceOptions.c_str();
-            result["options"]["ext"]        = gBitmapResults[i].ext.c_str();
-            result["md5"]                   = gBitmapResults[i].md5.c_str();
+            result["key"]["name"]        = gBitmapResults[i].name.c_str();
+            result["key"]["config"]      = gBitmapResults[i].config.c_str();
+            result["key"]["source_type"] = gBitmapResults[i].sourceType.c_str();
+            result["options"]["ext"]     = gBitmapResults[i].ext.c_str();
+            result["md5"]                = gBitmapResults[i].md5.c_str();
+
+            // Source options only need to be part of the key if they exist.
+            // Source type by source type, we either always set options or never set options.
+            if (!gBitmapResults[i].sourceOptions.isEmpty()) {
+                result["key"]["source_options"] = gBitmapResults[i].sourceOptions.c_str();
+            }
 
             root["results"].append(result);
         }
     }
 
     {
         SkAutoMutexAcquire lock(gFailureLock);
         for (int i = 0; i < gFailures.count(); i++) {
             Json::Value result;
             result["file_name"]     = gFailures[i].fileName;
@@ skipping 39 matching lines @@
         br.sourceType    = r["key"]["source_type"].asCString();
         br.sourceOptions = r["key"]["source_options"].asCString();
         br.ext           = r["options"]["ext"].asCString();
         br.md5           = r["md5"].asCString();
         callback(br);
     }
     return true;
 }
 
 } // namespace DM