Fix up GrAuditTrail to allow arbitrary reordering

include/private/GrAuditTrail.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrAuditTrail_DEFINED
 #define GrAuditTrail_DEFINED
 
@@ skipping 66 matching lines @@
     private:
         AutoEnable fAutoEnable;
         GrAuditTrail* fAuditTrail;
     };
 
     void pushFrame(const char* framename) {
         SkASSERT(fEnabled);
         fCurrentStackTrace.push_back(SkString(framename));
     }
 
-    void addBatch(const char* name, const SkRect& bounds);
+    void addBatch(const GrBatch* batch);
 
-    void batchingResultCombined(GrBatch* combiner);
-
-    void batchingResultNew(GrBatch* batch);
+    void batchingResultCombined(const GrBatch* consumer, const GrBatch* consumed);
 
     // Because batching is heavily dependent on sequence of draw calls, these calls will only
     // produce valid information for the given draw sequence which preceeded them.
     // Specifically, future draw calls may change the batching and thus would invalidate
     // the json.  What this means is that for some sequence of draw calls N, the below toJson
     // calls will only produce JSON which reflects N draw calls.  This JSON may or may not be
     // accurate for N + 1 or N - 1 draws depending on the actual batching algorithm used.
     SkString toJson(bool prettyPrint = false) const;
 
     // returns a json string of all of the batches associated with a given client id
@@ skipping 44 matching lines @@
         Batches fChildren;
         uint32_t fRenderTargetUniqueID;
     };
     typedef SkTArray<SkAutoTDelete<BatchNode>, true> BatchList;
 
     void copyOutFromBatchList(BatchInfo* outBatchInfo, int batchListID);
 
     template <typename T>
     static void JsonifyTArray(SkString* json, const char* name, const T& array,
                               bool addComma);
-
-    Batch* fCurrentBatch;
+    
     BatchPool fBatchPool;
-    SkTHashMap<GrBatch*, int> fIDLookup;
+    SkTHashMap<uint32_t, int> fIDLookup;
     SkTHashMap<int, Batches*> fClientIDLookup;
     BatchList fBatchList;
     SkTArray<SkString> fCurrentStackTrace;
 
     // The client cas pass in an optional client ID which we will use to mark the batches
     int fClientID;
     bool fEnabled;
 };
 
 #define GR_AUDIT_TRAIL_INVOKE_GUARD(audit_trail, invoke, ...) \
     if (audit_trail->isEnabled()) {                           \
         audit_trail->invoke(__VA_ARGS__);                     \
     }
 
 #define GR_AUDIT_TRAIL_AUTO_FRAME(audit_trail, framename) \
     GR_AUDIT_TRAIL_INVOKE_GUARD((audit_trail), pushFrame, framename);
 
 #define GR_AUDIT_TRAIL_RESET(audit_trail) \
     //GR_AUDIT_TRAIL_INVOKE_GUARD(audit_trail, fullReset);
 
-#define GR_AUDIT_TRAIL_ADDBATCH(audit_trail, batchname, bounds) \
-    GR_AUDIT_TRAIL_INVOKE_GUARD(audit_trail, addBatch, batchname, bounds);
+#define GR_AUDIT_TRAIL_ADDBATCH(audit_trail, batch) \
+    GR_AUDIT_TRAIL_INVOKE_GUARD(audit_trail, addBatch, batch);
 
-#define GR_AUDIT_TRAIL_BATCHING_RESULT_COMBINED(audit_trail, combiner) \
-    GR_AUDIT_TRAIL_INVOKE_GUARD(audit_trail, batchingResultCombined, combiner);
+#define GR_AUDIT_TRAIL_BATCHING_RESULT_COMBINED(audit_trail, combineWith, batch) \
+    GR_AUDIT_TRAIL_INVOKE_GUARD(audit_trail, batchingResultCombined, combineWith, batch);
 
 #define GR_AUDIT_TRAIL_BATCHING_RESULT_NEW(audit_trail, batch) \
-    GR_AUDIT_TRAIL_INVOKE_GUARD(audit_trail, batchingResultNew, batch);
+    // Doesn't do anything now, one day... 
 
 #endif