Virtualize Frames in GrAuditTrail

src/gpu/GrAuditTrail.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAuditTrail.h"
 
-template <class T>
-static void jsonify_tarray(SkString* json, const char* name, const SkTArray<T>& array) {
+void GrAuditTrail::JsonifyTArray(SkString* json, const char* name, const FrameArray& array) {
     if (array.count()) {
         json->appendf("\"%s\": [", name);
         for (int i = 0; i < array.count(); i++) {
-            json->append(array[i].toJson());
+            json->append(array[i]->toJson());
             if (i < array.count() - 1) {
                 json->append(",");
             }
         }
         json->append("]");
     }
 }
 
 // This will pretty print a very small subset of json
 // The parsing rules are straightforward, aside from the fact that we do not want an extra newline
@@ skipping 58 matching lines @@
 };
 
 static SkString pretty_print_json(SkString json) {
     class PrettyPrintJson prettyPrintJson;
     return prettyPrintJson.prettify(json);
 }
 
 SkString GrAuditTrail::toJson() const {
     SkString json;
     json.append("{");
-    jsonify_tarray(&json, "Stacks", fFrames);
+    JsonifyTArray(&json, "Stacks", fFrames);
     json.append("}");
 
     // TODO if this becomes a performance issue we should make pretty print configurable
     return pretty_print_json(json);
 }
 
 SkString GrAuditTrail::Frame::toJson() const {
     SkString json;
     json.append("{");
     json.appendf("\"Name\": \"%s\",", fName);
-    jsonify_tarray(&json, "Batches", fBatches);
-    jsonify_tarray(&json, "Frames", fChildren);
+    JsonifyTArray(&json, "Frames", fChildren);
     json.append("}");
     return json;
 }
 
-SkString GrAuditTrail::Frame::Batch::toJson() const {
+SkString GrAuditTrail::Batch::toJson() const {
     SkString json;
     json.append("{");
     json.appendf("\"Name\": \"%s\",", fName);
     json.append("\"Bounds\": {");
     json.appendf("\"Left\": %f,", fBounds.fLeft);
     json.appendf("\"Right\": %f,", fBounds.fRight);
     json.appendf("\"Top\": %f,", fBounds.fTop);
     json.appendf("\"Bottom\": %f", fBounds.fBottom);
     json.append("}");
     json.append("}");
     return json;
 }