Add width, height, unique ID, alpha to debugger DrawImageCommand

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 79 matching lines @@
 #define SKDEBUGCANVAS_ATTRIBUTE_FONT              "font"
 #define SKDEBUGCANVAS_ATTRIBUTE_TYPEFACE          "typeface"
 #define SKDEBUGCANVAS_ATTRIBUTE_CUBICS            "cubics"
 #define SKDEBUGCANVAS_ATTRIBUTE_COLORS            "colors"
 #define SKDEBUGCANVAS_ATTRIBUTE_TEXTURECOORDS     "textureCoords"
 #define SKDEBUGCANVAS_ATTRIBUTE_FILTERQUALITY     "filterQuality"
 #define SKDEBUGCANVAS_ATTRIBUTE_STARTANGLE        "startAngle"
 #define SKDEBUGCANVAS_ATTRIBUTE_SWEEPANGLE        "sweepAngle"
 #define SKDEBUGCANVAS_ATTRIBUTE_USECENTER         "useCenter"
 #define SKDEBUGCANVAS_ATTRIBUTE_SHORTDESC         "shortDesc"
+#define SKDEBUGCANVAS_ATTRIBUTE_UNIQUE_ID         "uniqueID"
+#define SKDEBUGCANVAS_ATTRIBUTE_WIDTH             "width"
+#define SKDEBUGCANVAS_ATTRIBUTE_HEIGHT            "height"
+#define SKDEBUGCANVAS_ATTRIBUTE_ALPHA             "alpha"
 
 #define SKDEBUGCANVAS_VERB_MOVE                   "move"
 #define SKDEBUGCANVAS_VERB_LINE                   "line"
 #define SKDEBUGCANVAS_VERB_QUAD                   "quad"
 #define SKDEBUGCANVAS_VERB_CUBIC                  "cubic"
 #define SKDEBUGCANVAS_VERB_CONIC                  "conic"
 #define SKDEBUGCANVAS_VERB_CLOSE                  "close"
 
 #define SKDEBUGCANVAS_STYLE_FILL                  "fill"
 #define SKDEBUGCANVAS_STYLE_STROKE                "stroke"
@@ skipping 39 matching lines @@
 #define SKDEBUGCANVAS_COLORTYPE_RGBA8888          "RGBA8888"
 #define SKDEBUGCANVAS_COLORTYPE_BGRA8888          "BGRA8888"
 #define SKDEBUGCANVAS_COLORTYPE_565               "565"
 #define SKDEBUGCANVAS_COLORTYPE_GRAY8             "Gray8"
 #define SKDEBUGCANVAS_COLORTYPE_INDEX8            "Index8"
 #define SKDEBUGCANVAS_COLORTYPE_ALPHA8            "Alpha8"
 
 #define SKDEBUGCANVAS_ALPHATYPE_OPAQUE            "opaque"
 #define SKDEBUGCANVAS_ALPHATYPE_PREMUL            "premul"
 #define SKDEBUGCANVAS_ALPHATYPE_UNPREMUL          "unpremul"
+#define SKDEBUGCANVAS_ALPHATYPE_UNKNOWN           "unknown"
 
 #define SKDEBUGCANVAS_FILTERQUALITY_NONE          "none"
 #define SKDEBUGCANVAS_FILTERQUALITY_LOW           "low"
 #define SKDEBUGCANVAS_FILTERQUALITY_MEDIUM        "medium"
 #define SKDEBUGCANVAS_FILTERQUALITY_HIGH          "high"
 
 #define SKDEBUGCANVAS_HINTING_NONE                "none"
 #define SKDEBUGCANVAS_HINTING_SLIGHT              "slight"
 #define SKDEBUGCANVAS_HINTING_NORMAL              "normal"
 #define SKDEBUGCANVAS_HINTING_FULL                "full"
@@ skipping 1955 matching lines @@
 
 Json::Value SkDrawImageCommand::toJSON(UrlDataManager& urlDataManager) const {
     Json::Value result = INHERITED::toJSON(urlDataManager);
     Json::Value encoded;
     if (flatten(*fImage, &encoded, urlDataManager)) {
         result[SKDEBUGCANVAS_ATTRIBUTE_IMAGE] = encoded;
         result[SKDEBUGCANVAS_ATTRIBUTE_COORDS] = MakeJsonPoint(fLeft, fTop);
         if (fPaint.isValid()) {
             result[SKDEBUGCANVAS_ATTRIBUTE_PAINT] = MakeJsonPaint(*fPaint.get(), urlDataManager);
         }
+
+        result[SKDEBUGCANVAS_ATTRIBUTE_UNIQUE_ID] = fImage->uniqueID();
+        result[SKDEBUGCANVAS_ATTRIBUTE_WIDTH] = fImage->width();
+        result[SKDEBUGCANVAS_ATTRIBUTE_HEIGHT] = fImage->height();
+        switch (fImage->alphaType()) {
+            case kOpaque_SkAlphaType:
+                result[SKDEBUGCANVAS_ATTRIBUTE_ALPHA] = SKDEBUGCANVAS_ALPHATYPE_OPAQUE;
+                break;
+            case kPremul_SkAlphaType:
+                result[SKDEBUGCANVAS_ATTRIBUTE_ALPHA] = SKDEBUGCANVAS_ALPHATYPE_PREMUL;
+                break;
+            case kUnpremul_SkAlphaType:
+                result[SKDEBUGCANVAS_ATTRIBUTE_ALPHA] = SKDEBUGCANVAS_ALPHATYPE_UNPREMUL;
+                break;
+            default:
+                result[SKDEBUGCANVAS_ATTRIBUTE_ALPHA] = SKDEBUGCANVAS_ALPHATYPE_UNKNOWN;
+                break;
+        }
     }
     return result;
 }
 
 SkDrawImageCommand* SkDrawImageCommand::fromJSON(Json::Value& command,
                                                  UrlDataManager& urlDataManager) {
     sk_sp<SkImage> image = load_image(command[SKDEBUGCANVAS_ATTRIBUTE_IMAGE], urlDataManager);
     if (image == nullptr) {
         return nullptr;
     }
@@ skipping 1381 matching lines @@
 SkTranslateZCommand* SkTranslateZCommand::fromJSON(Json::Value& command,
                                        UrlDataManager& urlDataManager) {
     SkScalar z;
 #ifdef SK_EXPERIMENTAL_SHADOWING
     extract_json_scalar(command[SKDEBUGCANVAS_ATTRIBUTE_DRAWDEPTHTRANS], &z);
 #else
     z = 0;
 #endif
     return new SkTranslateZCommand(z);
 }