Rename batch->op in GrAuditTrail json and skiaserver's url handlers

Requires Infra change https://skia-review.googlesource.com/c/6397/

Change-Id: Ic04ea07a0450a99b291f1bc06d4a501d86f65f51
Reviewed-on: https://skia-review.googlesource.com/6398
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gpu/GrAuditTrail.cpp b/src/gpu/GrAuditTrail.cpp
index 35139b7623..133ffea10f 100644
--- a/src/gpu/GrAuditTrail.cpp
+++ b/src/gpu/GrAuditTrail.cpp
@@ -226,7 +226,7 @@ static SkString pretty_print_json(SkString json) {
 SkString GrAuditTrail::toJson(bool prettyPrint) const {
     SkString json;
     json.append("{");
-    JsonifyTArray(&json, "Batches", fOpList, false);
+    JsonifyTArray(&json, "Ops", fOpList, false);
     json.append("}");
 
     if (prettyPrint) {
@@ -241,7 +241,7 @@ SkString GrAuditTrail::toJson(int clientID, bool prettyPrint) const {
     json.append("{");
     Ops** ops = fClientIDLookup.find(clientID);
     if (ops) {
-        JsonifyTArray(&json, "Batches", **ops, false);
+        JsonifyTArray(&json, "Ops", **ops, false);
     }
     json.appendf("}");
 
@@ -266,7 +266,7 @@ SkString GrAuditTrail::Op::toJson() const {
     json.append("{");
     json.appendf("\"Name\": \"%s\",", fName.c_str());
     json.appendf("\"ClientID\": \"%d\",", fClientID);
-    json.appendf("\"BatchListID\": \"%d\",", fOpListID);
+    json.appendf("\"OpListID\": \"%d\",", fOpListID);
     json.appendf("\"ChildID\": \"%d\",", fChildID);
     skrect_to_json(&json, "Bounds", fBounds);
     if (fStackTrace.count()) {
@@ -288,7 +288,7 @@ SkString GrAuditTrail::OpNode::toJson() const {
     json.append("{");
     json.appendf("\"RenderTarget\": \"%u\",", fRenderTargetUniqueID.asUInt());
     skrect_to_json(&json, "Bounds", fBounds);
-    JsonifyTArray(&json, "Batches", fChildren, true);
+    JsonifyTArray(&json, "Ops", fChildren, true);
     json.append("}");
     return json;
 }