Add batch information to json

tools/debugger/SkDrawCommand.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 "SkDrawCommand.h"
+
+#include "GrContext.h"
+#include "GrRenderTarget.h"
+
 #include "SkBlurMaskFilter.h"
 #include "SkColorFilter.h"
 #include "SkDashPathEffect.h"
 #include "SkImageFilter.h"
 #include "SkMaskFilter.h"
 #include "SkObjectParser.h"
 #include "SkPaintDefaults.h"
 #include "SkPathEffect.h"
 #include "SkPicture.h"
 #include "SkTextBlob.h"
@@ skipping 190 matching lines @@
 SkString SkDrawCommand::toString() const {
     return SkString(GetCommandString(fOpType));
 }
 
 Json::Value SkDrawCommand::toJSON(UrlDataManager& urlDataManager) const {
     Json::Value result;
     result[SKDEBUGCANVAS_ATTRIBUTE_COMMAND] = this->GetCommandString(fOpType);
     return result;
 }
 
+Json::Value SkDrawCommand::drawToAndCollectJSON(SkCanvas* canvas,
+                                                UrlDataManager& urlDataManager) const {
+    Json::Value result;
+    result[SKDEBUGCANVAS_ATTRIBUTE_COMMAND] = this->GetCommandString(fOpType);
+
+    if (canvas) {

[ethannicholas, 2016/02/17 16:16:07]

Why is the canvas to draw to optional in a method named "drawTo"?

[joshualitt, 2016/02/17 16:31:02]

Acknowledged.

+        GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget();
+        if (rt) {
+            GrContext* ctx = rt->getContext();
+            if(ctx) {
+                this->execute(canvas);
+                GrAuditTrail* at = ctx->getAuditTrail();
+
+                // 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;
+                SkDEBUGCODE(bool parsingSuccessful = )reader.parse(at->toJson().c_str(),
+                                                                   parsedFromString);
+                SkASSERT(parsingSuccessful);
+
+                result["batches"] = parsedFromString;

[ethannicholas, 2016/02/17 16:16:07]

Could we define a SKDEBUGCANVAS_ATTRIBUTE_BATCHES constant to match the usage
elsewhere?

[joshualitt, 2016/02/17 16:31:02]

Acknowledged.

+                at->reset();

[ethannicholas, 2016/02/17 16:16:07]

Resetting the auditor in between every single draw command doesn't interfere
with anything? Meaning we draw a rect, and say it's in batch 6. Then we reset,
and draw another rect... and the auditor correctly says it's in batch 6 as well?

[joshualitt, 2016/02/17 16:31:02]

discussed offline

+            }
+        }
+    }
+    return result;
+}
+
 #define INSTALL_FACTORY(name) factories.set(SkString(GetCommandString(k ## name ##_OpType)), \
                                             (FROM_JSON) Sk ## name ## Command::fromJSON)
 SkDrawCommand* SkDrawCommand::fromJSON(Json::Value& command, UrlDataManager& urlDataManager) {
     static SkTHashMap<SkString, FROM_JSON> factories;
     static bool initialized = false;
     if (!initialized) {
         initialized = true;
         INSTALL_FACTORY(Restore);
         INSTALL_FACTORY(ClipPath);
         INSTALL_FACTORY(ClipRegion);
@@ skipping 2837 matching lines @@
     result[SKDEBUGCANVAS_ATTRIBUTE_MATRIX] = make_json_matrix(fMatrix);
     return result;
 }
 
 SkSetMatrixCommand* SkSetMatrixCommand::fromJSON(Json::Value& command, 
                                                  UrlDataManager& urlDataManager) {
     SkMatrix matrix;
     extract_json_matrix(command[SKDEBUGCANVAS_ATTRIBUTE_MATRIX], &matrix);
     return new SkSetMatrixCommand(matrix);
 }