aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@chromium.org>2016-02-18 05:04:39 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-02-18 05:04:39 -0800
commitadab5a2a4b2ae4d7fa832093fe81a640e848746c (patch)
treeaada33f8a2338ae230ab081b708e06bfd2f3df1c /src/gpu
parent8e7b19d0f04f286ec283747ec128e9696c842858 (diff)
fix comma in GrAuditTrail json
Diffstat (limited to 'src/gpu')
-rw-r--r--src/gpu/GrAuditTrail.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/gpu/GrAuditTrail.cpp b/src/gpu/GrAuditTrail.cpp
index 4329cbe062..aa527fb4b0 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;
}