Added the framework for having canvas/recorder/picture record depth_set's.

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 "SkBlurMaskFilter.h"
@@ skipping 10 matching lines @@
 #include "SkTextBlobRunIterator.h"
 #include "SkTHash.h"
 #include "SkTypeface.h"
 #include "SkValidatingReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "picture_utils.h"
 
 #define SKDEBUGCANVAS_ATTRIBUTE_COMMAND           "command"
 #define SKDEBUGCANVAS_ATTRIBUTE_VISIBLE           "visible"
 #define SKDEBUGCANVAS_ATTRIBUTE_MATRIX            "matrix"
+#define SKDEBUGCANVAS_ATTRIBUTE_DRAWDEPTH         "drawDepth"
 #define SKDEBUGCANVAS_ATTRIBUTE_COORDS            "coords"
 #define SKDEBUGCANVAS_ATTRIBUTE_BOUNDS            "bounds"
 #define SKDEBUGCANVAS_ATTRIBUTE_PAINT             "paint"
 #define SKDEBUGCANVAS_ATTRIBUTE_OUTER             "outer"
 #define SKDEBUGCANVAS_ATTRIBUTE_INNER             "inner"
 #define SKDEBUGCANVAS_ATTRIBUTE_MODE              "mode"
 #define SKDEBUGCANVAS_ATTRIBUTE_POINTS            "points"
 #define SKDEBUGCANVAS_ATTRIBUTE_PATH              "path"
 #define SKDEBUGCANVAS_ATTRIBUTE_TEXT              "text"
 #define SKDEBUGCANVAS_ATTRIBUTE_COLOR             "color"
@@ skipping 162 matching lines @@
         case kDrawRRect_OpType: return "DrawRRect";
         case kDrawText_OpType: return "DrawText";
         case kDrawTextBlob_OpType: return "DrawTextBlob";
         case kDrawTextOnPath_OpType: return "DrawTextOnPath";
         case kDrawVertices_OpType: return "DrawVertices";
         case kEndDrawPicture_OpType: return "EndDrawPicture";
         case kRestore_OpType: return "Restore";
         case kSave_OpType: return "Save";
         case kSaveLayer_OpType: return "SaveLayer";
         case kSetMatrix_OpType: return "SetMatrix";
+        case kSetZ_OpType: return "SetZ";
         default:
             SkDebugf("OpType error 0x%08x\n", type);
             SkASSERT(0);
             break;
     }
     SkDEBUGFAIL("DrawType UNUSED\n");
     return nullptr;
 }
 
 SkString SkDrawCommand::toString() const {
@@ skipping 36 matching lines @@
         INSTALL_FACTORY(DrawTextOnPath);
         INSTALL_FACTORY(DrawTextBlob);
 
         INSTALL_FACTORY(DrawRect);
         INSTALL_FACTORY(DrawRRect);
         INSTALL_FACTORY(DrawDRRect);
         INSTALL_FACTORY(DrawPatch);
         INSTALL_FACTORY(Save);
         INSTALL_FACTORY(SaveLayer);
         INSTALL_FACTORY(SetMatrix);
+
+        INSTALL_FACTORY(SetZ);
     }
     SkString name = SkString(command[SKDEBUGCANVAS_ATTRIBUTE_COMMAND].asCString());
     FROM_JSON* factory = factories.find(name);
     if (factory == nullptr) {
         SkDebugf("no JSON factory for '%s'\n", name.c_str());
         return nullptr;
     }
     return (*factory)(command, urlDataManager);
 }
 
@@ skipping 182 matching lines @@
     row2.append(Json::Value(matrix[5]));
     result.append(row2);
     Json::Value row3(Json::arrayValue);
     row3.append(Json::Value(matrix[6]));
     row3.append(Json::Value(matrix[7]));
     row3.append(Json::Value(matrix[8]));
     result.append(row3);
     return result;
 }
 
+Json::Value SkDrawCommand::MakeJsonScalar(SkScalar z) {
+    Json::Value result(z);
+    return result;
+}
+
 Json::Value SkDrawCommand::MakeJsonPath(const SkPath& path) {
     Json::Value result(Json::objectValue);
     switch (path.getFillType()) {
         case SkPath::kWinding_FillType:
             result[SKDEBUGCANVAS_ATTRIBUTE_FILLTYPE] = SKDEBUGCANVAS_FILLTYPE_WINDING;
             break;
         case SkPath::kEvenOdd_FillType:
             result[SKDEBUGCANVAS_ATTRIBUTE_FILLTYPE] = SKDEBUGCANVAS_FILLTYPE_EVENODD;
             break;
         case SkPath::kInverseWinding_FillType:
@@ skipping 992 matching lines @@
 
 static void extract_json_matrix(Json::Value& matrix, SkMatrix* result) {
     SkScalar values[] = {
         matrix[0][0].asFloat(), matrix[0][1].asFloat(), matrix[0][2].asFloat(),
         matrix[1][0].asFloat(), matrix[1][1].asFloat(), matrix[1][2].asFloat(),
         matrix[2][0].asFloat(), matrix[2][1].asFloat(), matrix[2][2].asFloat()
     };
     result->set9(values);
 }
 
+static void extract_json_scalar(Json::Value& scalar, SkScalar* result) {
+    SkScalar value = scalar.asFloat();
+    *result = value;
+}
+
 static void extract_json_path(Json::Value& path, SkPath* result) {
     const char* fillType = path[SKDEBUGCANVAS_ATTRIBUTE_FILLTYPE].asCString();
     if (!strcmp(fillType, SKDEBUGCANVAS_FILLTYPE_WINDING)) {
         result->setFillType(SkPath::kWinding_FillType);
     }
     else if (!strcmp(fillType, SKDEBUGCANVAS_FILLTYPE_EVENODD)) {
         result->setFillType(SkPath::kEvenOdd_FillType);
     }
     else if (!strcmp(fillType, SKDEBUGCANVAS_FILLTYPE_INVERSEWINDING)) {
         result->setFillType(SkPath::kInverseWinding_FillType);
@@ skipping 1724 matching lines @@
     result[SKDEBUGCANVAS_ATTRIBUTE_MATRIX] = MakeJsonMatrix(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);
 }
+
+SkSetZCommand::SkSetZCommand(SkScalar z)
+    : INHERITED(kSetZ_OpType) {
+    fCurDrawDepth = z;
+    fInfo.push(SkObjectParser::ScalarToString(z, "drawDepth"));
+}
+
+void SkSetZCommand::execute(SkCanvas* canvas) const {
+    canvas->setZ(fCurDrawDepth);
+}
+
+Json::Value SkSetZCommand::toJSON(UrlDataManager& urlDataManager) const {
+    Json::Value result = INHERITED::toJSON(urlDataManager);
+    result[SKDEBUGCANVAS_ATTRIBUTE_DRAWDEPTH] = MakeJsonScalar(fCurDrawDepth);
+    return result;
+}
+
+SkSetZCommand* SkSetZCommand::fromJSON(Json::Value& command,

[robertphillips, 2016/07/11 20:57:27]

line this up with the prior parameter ?

[vjiaoblack, 2016/07/12 13:14:23]

Done.

+                                                 UrlDataManager& urlDataManager) {
+    SkScalar z;
+    extract_json_scalar(command[SKDEBUGCANVAS_ATTRIBUTE_DRAWDEPTH], &z);
+    return new SkSetZCommand(z);
+}