From adab5a2a4b2ae4d7fa832093fe81a640e848746c Mon Sep 17 00:00:00 2001 From: joshualitt Date: Thu, 18 Feb 2016 05:04:39 -0800 Subject: [PATCH] fix comma in GrAuditTrail json BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1704133002 Review URL: https://codereview.chromium.org/1704133002 --- include/private/GrAuditTrail.h | 3 ++- src/gpu/GrAuditTrail.cpp | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/include/private/GrAuditTrail.h b/include/private/GrAuditTrail.h index 67eecad..2123656 100644 --- a/include/private/GrAuditTrail.h +++ b/include/private/GrAuditTrail.h @@ -92,7 +92,8 @@ private: SkRect fBounds; }; - static void JsonifyTArray(SkString* json, const char* name, const FrameArray& array); + static void JsonifyTArray(SkString* json, const char* name, const FrameArray& array, + bool addComma); FrameArray fFrames; SkTArray fStack; diff --git a/src/gpu/GrAuditTrail.cpp b/src/gpu/GrAuditTrail.cpp index 4329cbe..aa527fb 100644 --- a/src/gpu/GrAuditTrail.cpp +++ b/src/gpu/GrAuditTrail.cpp @@ -7,8 +7,12 @@ #include "GrAuditTrail.h" -void GrAuditTrail::JsonifyTArray(SkString* json, const char* name, const FrameArray& array) { +void GrAuditTrail::JsonifyTArray(SkString* json, const char* name, const FrameArray& array, + bool addComma) { if (array.count()) { + if (addComma) { + json->appendf(","); + } json->appendf("\"%s\": [", name); for (int i = 0; i < array.count(); i++) { json->append(array[i]->toJson()); @@ -90,7 +94,7 @@ static SkString pretty_print_json(SkString json) { SkString GrAuditTrail::toJson(bool prettyPrint) const { SkString json; json.append("{"); - JsonifyTArray(&json, "Stacks", fFrames); + JsonifyTArray(&json, "Stacks", fFrames, false); json.append("}"); if (prettyPrint) { @@ -103,8 +107,8 @@ SkString GrAuditTrail::toJson(bool prettyPrint) const { SkString GrAuditTrail::Frame::toJson() const { SkString json; json.append("{"); - json.appendf("\"Name\": \"%s\",", fName); - JsonifyTArray(&json, "Frames", fChildren); + json.appendf("\"Name\": \"%s\"", fName); + JsonifyTArray(&json, "Frames", fChildren, true); json.append("}"); return json; } -- 2.7.4