Fix up GrAuditTrail to allow arbitrary reordering

tools/debugger/SkDebugCanvas.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvasPriv.h"
 #include "SkClipStack.h"
 #include "SkDebugCanvas.h"
@@ skipping 316 matching lines @@
 
     if (fPaintFilterCanvas) {
         fPaintFilterCanvas->removeAll();
     }
 
 #if SK_SUPPORT_GPU
     // draw any batches if required and issue a full reset onto GrAuditTrail
     if (at) {
         // just in case there is global reordering, we flush the canvas before querying
         // GrAuditTrail
+        GrAuditTrail::AutoEnable ae(at);
         canvas->flush();
 
         // we pick three colorblind-safe colors, 75% alpha
         static const SkColor kTotalBounds = SkColorSetARGB(0xC0, 0x6A, 0x3D, 0x9A);
         static const SkColor kOpBatchBounds = SkColorSetARGB(0xC0, 0xE3, 0x1A, 0x1C);
         static const SkColor kOtherBatchBounds = SkColorSetARGB(0xC0, 0xFF, 0x7F, 0x00);
 
         // get the render target of the top device so we can ignore batches drawn offscreen
         SkBaseDevice* bd = canvas->getDevice_just_for_deprecated_compatibility_testing();
         SkGpuDevice* gbd = reinterpret_cast<SkGpuDevice*>(bd);
         uint32_t rtID = gbd->accessRenderTarget()->getUniqueID();
 
         // get the bounding boxes to draw
-        GrAuditTrail::AutoEnable ae(at);
         SkTArray<GrAuditTrail::BatchInfo> childrenBounds;
         if (m == -1) {
             at->getBoundsByClientID(&childrenBounds, index);
         } else {
             // the client wants us to draw the mth batch
             at->getBoundsByBatchListID(&childrenBounds.push_back(), m);
         }
         SkPaint paint;
         paint.setStyle(SkPaint::kStroke_Style);
         paint.setStrokeWidth(1);
@@ skipping 66 matching lines @@
             at = ctx->getAuditTrail();
 
             // loop over all of the commands and draw them, this is to collect reordering
             // information
             for (int i = 0; i < this->getSize() && i <= n; i++) {
                 GrAuditTrail::AutoCollectBatches enable(at, i);
                 fCommandVector[i]->execute(canvas);
             }
 
             // in case there is some kind of global reordering
-            canvas->flush();
+            {
+                GrAuditTrail::AutoEnable ae(at);
+                canvas->flush();
+            }
         }
     }
 #endif
     
     // now collect json
     Json::Value result = Json::Value(Json::objectValue);
     result[SKDEBUGCANVAS_ATTRIBUTE_VERSION] = Json::Value(SKDEBUGCANVAS_VERSION);
     Json::Value commands = Json::Value(Json::arrayValue);
     for (int i = 0; i < this->getSize() && i <= n; i++) {
         commands[i] = this->getDrawCommandAt(i)->toJSON(urlDataManager);
 #if SK_SUPPORT_GPU
         if (at) {
             // TODO if this is inefficient we could add a method to GrAuditTrail which takes
             // a Json::Value and is only compiled in this file
             Json::Value parsedFromString;
             Json::Reader reader;
             SkAssertResult(reader.parse(at->toJson(i).c_str(), parsedFromString));
 
             commands[i][SKDEBUGCANVAS_ATTRIBUTE_AUDITTRAIL] = parsedFromString;
         }
 #endif
     }
 #if SK_SUPPORT_GPU
     if (at) {
+        GrAuditTrail::AutoEnable ae(at);
         at->fullReset();
     }
 #endif
     result[SKDEBUGCANVAS_ATTRIBUTE_COMMANDS] = commands;
     return result;
 }
 
 void SkDebugCanvas::updatePaintFilterCanvas() {
     if (!fOverdrawViz && !fOverrideFilterQuality) {
         fPaintFilterCanvas.reset(nullptr);
@@ skipping 296 matching lines @@
 }
 
 bool SkDebugCanvas::lastClipStackData(const SkPath& devPath) {
     if (fCalledAddStackData) {
         fClipStackData.appendf("<br>");
         addPathData(devPath, "pathOut");
         return true;
     }
     return false;
 }