Convert GrAuditTrail to use scoped frames

include/private/GrAuditTrail.h

Index: include/private/GrAuditTrail.h
diff --git a/include/private/GrAuditTrail.h b/include/private/GrAuditTrail.h
index 53f44f2173e64f7b87df0c5597bec31a5883e8ba..59a8a8c16aac55b8861fd3d3a4c8105793fa72b3 100644
--- a/include/private/GrAuditTrail.h
+++ b/include/private/GrAuditTrail.h
@@ -19,24 +19,59 @@
  */
 class GrAuditTrail {
 public:
-    void addOp(const SkString& name) {
+    class AutoFrame {
+    public:
+        AutoFrame(GrAuditTrail* auditTrail, const char* name)
+            : fAuditTrail(auditTrail) {
+            if (GR_BATCH_DEBUGGING_OUTPUT) {
+                fAuditTrail->pushFrame(name);
+            }
+        }
+
+        ~AutoFrame() {
+            if (GR_BATCH_DEBUGGING_OUTPUT) {
+                fAuditTrail->popFrame();
+            }
+        }
+
+    private:
+        GrAuditTrail* fAuditTrail;
+    };
+
+    void pushFrame(const char* name) {
         SkASSERT(GR_BATCH_DEBUGGING_OUTPUT);
-        fOps.push_back().fName = name;
+        Frame* frame;
+        if (fStack.empty()) {
+            frame = &fFrames.push_back();
+        } else {
+            SkASSERT(fStack.back()->fBatches.empty());
+            frame = &fStack.back()->fChildren.push_back();
+        }
+
+        frame->fName = name;
+        fStack.push_back(frame);
     }
 
-    void addBatch(const SkString& name, const SkRect& bounds) {
+    void popFrame() {
         SkASSERT(GR_BATCH_DEBUGGING_OUTPUT);
-        Op::Batch& batch = fOps.back().fBatches.push_back();
+        fStack.pop_back();
+    }
+
+    void addBatch(const char* name, const SkRect& bounds) {
+        // TODO when every internal callsite pushes a frame, we can add the assert
+        SkASSERT(GR_BATCH_DEBUGGING_OUTPUT /*&& !fStack.empty() &&
+                 fStack.back()->fChildren.empty()*/);
+        Frame::Batch& batch = fStack.back()->fBatches.push_back();
         batch.fName = name;
         batch.fBounds = bounds;
     }
 
     SkString toJson() const;
 
-    void reset() { SkASSERT(GR_BATCH_DEBUGGING_OUTPUT); fOps.reset(); }
+    void reset() { SkASSERT(GR_BATCH_DEBUGGING_OUTPUT && fStack.empty()); fFrames.reset(); }
 
 private:

[robertphillips, 2016/01/12 15:56:21]

// A Frame can have either batches or children but not both

?

-    struct Op {
+    struct Frame {
         SkString toJson() const;
         struct Batch {
             SkString toJson() const;
@@ -46,9 +81,11 @@ private:
 
         SkString fName;
         SkTArray<Batch> fBatches;
+        SkTArray<Frame> fChildren;
     };
 
-    SkTArray<Op> fOps;
+    SkTArray<Frame> fFrames;
+    SkTArray<Frame*> fStack;
 };
 
 #define GR_AUDIT_TRAIL_INVOKE_GUARD(invoke, ...) \
@@ -56,13 +93,13 @@ private:
         invoke(__VA_ARGS__);                     \
     }
 
-#define GR_AUDIT_TRAIL_ADDOP(audit_trail, opname) \
-    GR_AUDIT_TRAIL_INVOKE_GUARD(audit_trail->addOp, opname);
+#define GR_AUDIT_TRAIL_AUTO_FRAME(audit_trail, framename) \
+    GrAuditTrail::AutoFrame SK_MACRO_APPEND_LINE(auto_frame)(audit_trail, framename);
 
 #define GR_AUDIT_TRAIL_RESET(audit_trail) \
     GR_AUDIT_TRAIL_INVOKE_GUARD(audit_trail->reset);
 
 #define GR_AUDIT_TRAIL_ADDBATCH(audit_trail, batchname, bounds) \
-    GR_AUDIT_TRAIL_INVOKE_GUARD(audit_trail->addBatch, SkString(batchname), bounds);
+    GR_AUDIT_TRAIL_INVOKE_GUARD(audit_trail->addBatch, batchname, bounds);
 
 #endif