From 82079fb7aaf000591300e0662301594901d56d06 Mon Sep 17 00:00:00 2001 From: mtklein Date: Tue, 17 Feb 2015 13:18:04 -0800 Subject: DM: move ext into key BUG=skia: Review URL: https://codereview.chromium.org/925523003 --- dm/DMJsonWriter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dm/DMJsonWriter.cpp') diff --git a/dm/DMJsonWriter.cpp b/dm/DMJsonWriter.cpp index 8f1fa7ed3c..e4a3d12d5b 100644 --- a/dm/DMJsonWriter.cpp +++ b/dm/DMJsonWriter.cpp @@ -54,7 +54,7 @@ void JsonWriter::DumpJson() { 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["ext"] = gBitmapResults[i].ext.c_str(); + result["options"]["ext"] = gBitmapResults[i].ext.c_str(); result["md5"] = gBitmapResults[i].md5.c_str(); root["results"].append(result); @@ -101,7 +101,7 @@ bool JsonWriter::ReadJson(const char* path, void(*callback)(BitmapResult)) { br.name = r["key"]["name"].asCString(); br.config = r["key"]["config"].asCString(); br.sourceType = r["key"]["source_type"].asCString(); - br.ext = r["ext"].asCString(); + br.ext = r["options"]["ext"].asCString(); br.md5 = r["md5"].asCString(); callback(br); } -- cgit v1.2.3