Revert of Revert of SkDrawCommand scrubbing

src/utils/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 "SkObjectParser.h"
 
 #include "SkTextBlob.h"
 
 // TODO(chudy): Refactor into non subclass model.
 
 SkDrawCommand::SkDrawCommand(DrawType type)
     : fDrawType(type)
     , fOffset(0)
     , fVisible(true) {
 }
 
-SkDrawCommand::SkDrawCommand() {
-    fOffset = 0;
-    fVisible = true;
-}
-
 SkDrawCommand::~SkDrawCommand() {
     fInfo.deleteAll();
 }
 
 const char* SkDrawCommand::GetCommandString(DrawType type) {
     switch (type) {
         case UNUSED: SkDEBUGFAIL("DrawType UNUSED\n"); break;
         case DRAW_CLEAR: return "Clear";
         case CLIP_PATH: return "Clip Path";
         case CLIP_REGION: return "Clip Region";
@@ skipping 36 matching lines @@
         case POP_CULL: return "PopCull";
         default:
             SkDebugf("DrawType error 0x%08x\n", type);
             SkASSERT(0);
             break;
     }
     SkDEBUGFAIL("DrawType UNUSED\n");
     return NULL;
 }
 
-SkString SkDrawCommand::toString() {
+SkString SkDrawCommand::toString() const {
     return SkString(GetCommandString(fDrawType));
 }
 
 SkClearCommand::SkClearCommand(SkColor color) : INHERITED(DRAW_CLEAR) {
     fColor = color;
     fInfo.push(SkObjectParser::CustomTextToString("No Parameters"));
 }
 
-void SkClearCommand::execute(SkCanvas* canvas) {
+void SkClearCommand::execute(SkCanvas* canvas) const {
     canvas->clear(fColor);
 }
 
 namespace {
 
 void xlate_and_scale_to_bounds(SkCanvas* canvas, const SkRect& bounds) {
     const SkISize& size = canvas->getDeviceSize();
 
     static const SkScalar kInsetFrac = 0.9f; // Leave a border around object
 
@@ skipping 96 matching lines @@
     : INHERITED(CLIP_PATH) {
     fPath = path;
     fOp = op;
     fDoAA = doAA;
 
     fInfo.push(SkObjectParser::PathToString(path));
     fInfo.push(SkObjectParser::RegionOpToString(op));
     fInfo.push(SkObjectParser::BoolToString(doAA));
 }
 
-void SkClipPathCommand::execute(SkCanvas* canvas) {
+void SkClipPathCommand::execute(SkCanvas* canvas) const {
     canvas->clipPath(fPath, fOp, fDoAA);
 }
 
 bool SkClipPathCommand::render(SkCanvas* canvas) const {
     render_path(canvas, fPath);
     return true;
 }
 
 SkClipRegionCommand::SkClipRegionCommand(const SkRegion& region, SkRegion::Op op)
     : INHERITED(CLIP_REGION) {
     fRegion = region;
     fOp = op;
 
     fInfo.push(SkObjectParser::RegionToString(region));
     fInfo.push(SkObjectParser::RegionOpToString(op));
 }
 
-void SkClipRegionCommand::execute(SkCanvas* canvas) {
+void SkClipRegionCommand::execute(SkCanvas* canvas) const {
     canvas->clipRegion(fRegion, fOp);
 }
 
 SkClipRectCommand::SkClipRectCommand(const SkRect& rect, SkRegion::Op op, bool doAA)
     : INHERITED(CLIP_RECT) {
     fRect = rect;
     fOp = op;
     fDoAA = doAA;
 
     fInfo.push(SkObjectParser::RectToString(rect));
     fInfo.push(SkObjectParser::RegionOpToString(op));
     fInfo.push(SkObjectParser::BoolToString(doAA));
 }
 
-void SkClipRectCommand::execute(SkCanvas* canvas) {
+void SkClipRectCommand::execute(SkCanvas* canvas) const {
     canvas->clipRect(fRect, fOp, fDoAA);
 }
 
 SkClipRRectCommand::SkClipRRectCommand(const SkRRect& rrect, SkRegion::Op op, bool doAA)
     : INHERITED(CLIP_RRECT) {
     fRRect = rrect;
     fOp = op;
     fDoAA = doAA;
 
     fInfo.push(SkObjectParser::RRectToString(rrect));
     fInfo.push(SkObjectParser::RegionOpToString(op));
     fInfo.push(SkObjectParser::BoolToString(doAA));
 }
 
-void SkClipRRectCommand::execute(SkCanvas* canvas) {
+void SkClipRRectCommand::execute(SkCanvas* canvas) const {
     canvas->clipRRect(fRRect, fOp, fDoAA);
 }
 
 bool SkClipRRectCommand::render(SkCanvas* canvas) const {
     render_rrect(canvas, fRRect);
     return true;
 }
 
 SkConcatCommand::SkConcatCommand(const SkMatrix& matrix)
     : INHERITED(CONCAT) {
     fMatrix = matrix;
 
     fInfo.push(SkObjectParser::MatrixToString(matrix));
 }
 
-void SkConcatCommand::execute(SkCanvas* canvas) {
+void SkConcatCommand::execute(SkCanvas* canvas) const {
     canvas->concat(fMatrix);
 }
 
 SkDrawBitmapCommand::SkDrawBitmapCommand(const SkBitmap& bitmap, SkScalar left, SkScalar top,
                                          const SkPaint* paint)
     : INHERITED(DRAW_BITMAP) {
     fBitmap = bitmap;
     fLeft = left;
     fTop = top;
     if (paint) {
         fPaint = *paint;
         fPaintPtr = &fPaint;
     } else {
         fPaintPtr = NULL;
     }
 
     fInfo.push(SkObjectParser::BitmapToString(bitmap));
     fInfo.push(SkObjectParser::ScalarToString(left, "SkScalar left: "));
     fInfo.push(SkObjectParser::ScalarToString(top, "SkScalar top: "));
     if (paint) {
         fInfo.push(SkObjectParser::PaintToString(*paint));
     }
 }
 
-void SkDrawBitmapCommand::execute(SkCanvas* canvas) {
+void SkDrawBitmapCommand::execute(SkCanvas* canvas) const {
     canvas->drawBitmap(fBitmap, fLeft, fTop, fPaintPtr);
 }
 
 bool SkDrawBitmapCommand::render(SkCanvas* canvas) const {
     render_bitmap(canvas, fBitmap);
     return true;
 }
 
 SkDrawBitmapMatrixCommand::SkDrawBitmapMatrixCommand(const SkBitmap& bitmap,
                                                      const SkMatrix& matrix,
                                                      const SkPaint* paint)
     : INHERITED(DRAW_BITMAP_MATRIX) {
     fBitmap = bitmap;
     fMatrix = matrix;
     if (paint) {
         fPaint = *paint;
         fPaintPtr = &fPaint;
     } else {
         fPaintPtr = NULL;
     }
 
     fInfo.push(SkObjectParser::BitmapToString(bitmap));
     fInfo.push(SkObjectParser::MatrixToString(matrix));
     if (paint) {
         fInfo.push(SkObjectParser::PaintToString(*paint));
     }
 }
 
-void SkDrawBitmapMatrixCommand::execute(SkCanvas* canvas) {
+void SkDrawBitmapMatrixCommand::execute(SkCanvas* canvas) const {
     canvas->drawBitmapMatrix(fBitmap, fMatrix, fPaintPtr);
 }
 
 bool SkDrawBitmapMatrixCommand::render(SkCanvas* canvas) const {
     render_bitmap(canvas, fBitmap);
     return true;
 }
 
 SkDrawBitmapNineCommand::SkDrawBitmapNineCommand(const SkBitmap& bitmap, const SkIRect& center,
                                                  const SkRect& dst, const SkPaint* paint)
     : INHERITED(DRAW_BITMAP_NINE) {
     fBitmap = bitmap;
     fCenter = center;
     fDst = dst;
     if (paint) {
         fPaint = *paint;
         fPaintPtr = &fPaint;
     } else {
         fPaintPtr = NULL;
     }
 
     fInfo.push(SkObjectParser::BitmapToString(bitmap));
     fInfo.push(SkObjectParser::IRectToString(center));
     fInfo.push(SkObjectParser::RectToString(dst, "Dst: "));
     if (paint) {
         fInfo.push(SkObjectParser::PaintToString(*paint));
     }
 }
 
-void SkDrawBitmapNineCommand::execute(SkCanvas* canvas) {
+void SkDrawBitmapNineCommand::execute(SkCanvas* canvas) const {
     canvas->drawBitmapNine(fBitmap, fCenter, fDst, fPaintPtr);
 }
 
 bool SkDrawBitmapNineCommand::render(SkCanvas* canvas) const {
     render_bitmap(canvas, fBitmap);
     return true;
 }
 
 SkDrawBitmapRectCommand::SkDrawBitmapRectCommand(const SkBitmap& bitmap, const SkRect* src,
                                                  const SkRect& dst, const SkPaint* paint,
@@ skipping 19 matching lines @@
     if (src) {
         fInfo.push(SkObjectParser::RectToString(*src, "Src: "));
     }
     fInfo.push(SkObjectParser::RectToString(dst, "Dst: "));
     if (paint) {
         fInfo.push(SkObjectParser::PaintToString(*paint));
     }
     fInfo.push(SkObjectParser::IntToString(fFlags, "Flags: "));
 }
 
-void SkDrawBitmapRectCommand::execute(SkCanvas* canvas) {
+void SkDrawBitmapRectCommand::execute(SkCanvas* canvas) const {
     canvas->drawBitmapRectToRect(fBitmap, this->srcRect(), fDst, fPaintPtr, fFlags);
 }
 
 bool SkDrawBitmapRectCommand::render(SkCanvas* canvas) const {
     render_bitmap(canvas, fBitmap, this->srcRect());
     return true;
 }
 
 SkDrawDataCommand::SkDrawDataCommand(const void* data, size_t length)
     : INHERITED(DRAW_DATA) {
     fData = new char[length];
     memcpy(fData, data, length);
     fLength = length;
 
     // TODO: add display of actual data?
     SkString* str = new SkString;
     str->appendf("length: %d", (int) length);
     fInfo.push(str);
 }
 
-void SkDrawDataCommand::execute(SkCanvas* canvas) {
+void SkDrawDataCommand::execute(SkCanvas* canvas) const {
     canvas->drawData(fData, fLength);
 }
 
 SkBeginCommentGroupCommand::SkBeginCommentGroupCommand(const char* description)
     : INHERITED(BEGIN_COMMENT_GROUP)
     , fDescription(description) {
     SkString* temp = new SkString;
     temp->appendf("Description: %s", description);
     fInfo.push(temp);
 }
@@ skipping 13 matching lines @@
 
 SkDrawOvalCommand::SkDrawOvalCommand(const SkRect& oval, const SkPaint& paint)
     : INHERITED(DRAW_OVAL) {
     fOval = oval;
     fPaint = paint;
 
     fInfo.push(SkObjectParser::RectToString(oval));
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawOvalCommand::execute(SkCanvas* canvas) {
+void SkDrawOvalCommand::execute(SkCanvas* canvas) const {
     canvas->drawOval(fOval, fPaint);
 }
 
 bool SkDrawOvalCommand::render(SkCanvas* canvas) const {
     canvas->clear(0xFFFFFFFF);
     canvas->save();
 
     xlate_and_scale_to_bounds(canvas, fOval);
 
     SkPaint p;
     p.setColor(SK_ColorBLACK);
     p.setStyle(SkPaint::kStroke_Style);
 
     canvas->drawOval(fOval, p);
     canvas->restore();
 
     return true;
 }
 
 SkDrawPaintCommand::SkDrawPaintCommand(const SkPaint& paint)
     : INHERITED(DRAW_PAINT) {
     fPaint = paint;
 
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawPaintCommand::execute(SkCanvas* canvas) {
+void SkDrawPaintCommand::execute(SkCanvas* canvas) const {
     canvas->drawPaint(fPaint);
 }
 
 bool SkDrawPaintCommand::render(SkCanvas* canvas) const {
     canvas->clear(0xFFFFFFFF);
     canvas->drawPaint(fPaint);
     return true;
 }
 
 SkDrawPathCommand::SkDrawPathCommand(const SkPath& path, const SkPaint& paint)
     : INHERITED(DRAW_PATH) {
     fPath = path;
     fPaint = paint;
 
     fInfo.push(SkObjectParser::PathToString(path));
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawPathCommand::execute(SkCanvas* canvas) {
+void SkDrawPathCommand::execute(SkCanvas* canvas) const {
     canvas->drawPath(fPath, fPaint);
 }
 
 bool SkDrawPathCommand::render(SkCanvas* canvas) const {
     render_path(canvas, fPath);
     return true;
 }
 
 SkDrawPictureCommand::SkDrawPictureCommand(const SkPicture* picture,
                                            const SkMatrix* matrix,
@@ skipping 18 matching lines @@
                   picture->cullRect().fRight, picture->cullRect().fBottom);
     fInfo.push(temp);
     if (matrix) {
         fInfo.push(SkObjectParser::MatrixToString(*matrix));
     }
     if (paint) {
         fInfo.push(SkObjectParser::PaintToString(*paint));
     }
 }
 
-void SkDrawPictureCommand::execute(SkCanvas* canvas) {
+void SkDrawPictureCommand::execute(SkCanvas* canvas) const {
     canvas->drawPicture(fPicture, fMatrixPtr, fPaintPtr);
 }
 
 bool SkDrawPictureCommand::render(SkCanvas* canvas) const {
     canvas->clear(0xFFFFFFFF);
     canvas->save();
 
     xlate_and_scale_to_bounds(canvas, fPicture->cullRect());
 
     canvas->drawPicture(fPicture.get());
@@ skipping 12 matching lines @@
     memcpy(fPts, pts, count * sizeof(SkPoint));
     fPaint = paint;
 
     fInfo.push(SkObjectParser::PointsToString(pts, count));
     fInfo.push(SkObjectParser::ScalarToString(SkIntToScalar((unsigned int)count),
                                               "Points: "));
     fInfo.push(SkObjectParser::PointModeToString(mode));
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawPointsCommand::execute(SkCanvas* canvas) {
+void SkDrawPointsCommand::execute(SkCanvas* canvas) const {
     canvas->drawPoints(fMode, fCount, fPts, fPaint);
 }
 
 bool SkDrawPointsCommand::render(SkCanvas* canvas) const {
     canvas->clear(0xFFFFFFFF);
     canvas->save();
 
     SkRect bounds;
 
     bounds.setEmpty();
@@ skipping 26 matching lines @@
     memcpy(fPos, pos, numPts * sizeof(SkPoint));
 
     fPaint = paint;
 
     fInfo.push(SkObjectParser::TextToString(text, byteLength, paint.getTextEncoding()));
     // TODO(chudy): Test that this works.
     fInfo.push(SkObjectParser::PointsToString(pos, 1));
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawPosTextCommand::execute(SkCanvas* canvas) {
+void SkDrawPosTextCommand::execute(SkCanvas* canvas) const {
     canvas->drawPosText(fText, fByteLength, fPos, fPaint);
 }
 
 
 SkDrawPosTextHCommand::SkDrawPosTextHCommand(const void* text, size_t byteLength,
                                              const SkScalar xpos[], SkScalar constY,
                                              const SkPaint& paint)
     : INHERITED(DRAW_POS_TEXT_H) {
     size_t numPts = paint.countText(text, byteLength);
 
     fText = new char[byteLength];
     memcpy(fText, text, byteLength);
     fByteLength = byteLength;
 
     fXpos = new SkScalar[numPts];
     memcpy(fXpos, xpos, numPts * sizeof(SkScalar));
 
     fConstY = constY;
     fPaint = paint;
 
     fInfo.push(SkObjectParser::TextToString(text, byteLength, paint.getTextEncoding()));
     fInfo.push(SkObjectParser::ScalarToString(xpos[0], "XPOS: "));
     fInfo.push(SkObjectParser::ScalarToString(constY, "SkScalar constY: "));
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawPosTextHCommand::execute(SkCanvas* canvas) {
+void SkDrawPosTextHCommand::execute(SkCanvas* canvas) const {
     canvas->drawPosTextH(fText, fByteLength, fXpos, fConstY, fPaint);
 }
 
 SkDrawTextBlobCommand::SkDrawTextBlobCommand(const SkTextBlob* blob, SkScalar x, SkScalar y,
                                              const SkPaint& paint)
     : INHERITED(DRAW_TEXT_BLOB)
     , fBlob(blob)
     , fXPos(x)
     , fYPos(y)
     , fPaint(paint) {
 
     blob->ref();
 
     // FIXME: push blob info
     fInfo.push(SkObjectParser::ScalarToString(x, "XPOS: "));
     fInfo.push(SkObjectParser::ScalarToString(x, "YPOS: "));
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawTextBlobCommand::execute(SkCanvas* canvas) {
+void SkDrawTextBlobCommand::execute(SkCanvas* canvas) const {
     canvas->drawTextBlob(fBlob, fXPos, fYPos, fPaint);
 }
 
 bool SkDrawTextBlobCommand::render(SkCanvas* canvas) const {
     canvas->clear(SK_ColorWHITE);
     canvas->save();
 
     SkRect bounds = fBlob->bounds().makeOffset(fXPos, fYPos);
     xlate_and_scale_to_bounds(canvas, bounds);
 
     canvas->drawTextBlob(fBlob.get(), fXPos, fYPos, fPaint);
 
     canvas->restore();
 
     return true;
 }
 
 SkDrawRectCommand::SkDrawRectCommand(const SkRect& rect, const SkPaint& paint)
     : INHERITED(DRAW_RECT) {
     fRect = rect;
     fPaint = paint;
 
     fInfo.push(SkObjectParser::RectToString(rect));
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawRectCommand::execute(SkCanvas* canvas) {
+void SkDrawRectCommand::execute(SkCanvas* canvas) const {
     canvas->drawRect(fRect, fPaint);
 }
 
 SkDrawRRectCommand::SkDrawRRectCommand(const SkRRect& rrect, const SkPaint& paint)
     : INHERITED(DRAW_RRECT) {
     fRRect = rrect;
     fPaint = paint;
 
     fInfo.push(SkObjectParser::RRectToString(rrect));
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawRRectCommand::execute(SkCanvas* canvas) {
+void SkDrawRRectCommand::execute(SkCanvas* canvas) const {
     canvas->drawRRect(fRRect, fPaint);
 }
 
 bool SkDrawRRectCommand::render(SkCanvas* canvas) const {
     render_rrect(canvas, fRRect);
     return true;
 }
 
 SkDrawDRRectCommand::SkDrawDRRectCommand(const SkRRect& outer,
                                          const SkRRect& inner,
                                          const SkPaint& paint)
     : INHERITED(DRAW_DRRECT) {
     fOuter = outer;
     fInner = inner;
     fPaint = paint;
 
     fInfo.push(SkObjectParser::RRectToString(outer));
     fInfo.push(SkObjectParser::RRectToString(inner));
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawDRRectCommand::execute(SkCanvas* canvas) {
+void SkDrawDRRectCommand::execute(SkCanvas* canvas) const {
     canvas->drawDRRect(fOuter, fInner, fPaint);
 }
 
 bool SkDrawDRRectCommand::render(SkCanvas* canvas) const {
     render_drrect(canvas, fOuter, fInner);
     return true;
 }
 
 SkDrawSpriteCommand::SkDrawSpriteCommand(const SkBitmap& bitmap, int left, int top,
                                          const SkPaint* paint)
     : INHERITED(DRAW_SPRITE) {
     fBitmap = bitmap;
     fLeft = left;
     fTop = top;
     if (paint) {
         fPaint = *paint;
         fPaintPtr = &fPaint;
     } else {
         fPaintPtr = NULL;
     }
 
     fInfo.push(SkObjectParser::BitmapToString(bitmap));
     fInfo.push(SkObjectParser::IntToString(left, "Left: "));
     fInfo.push(SkObjectParser::IntToString(top, "Top: "));
     if (paint) {
         fInfo.push(SkObjectParser::PaintToString(*paint));
     }
 }
 
-void SkDrawSpriteCommand::execute(SkCanvas* canvas) {
+void SkDrawSpriteCommand::execute(SkCanvas* canvas) const {
     canvas->drawSprite(fBitmap, fLeft, fTop, fPaintPtr);
 }
 
 bool SkDrawSpriteCommand::render(SkCanvas* canvas) const {
     render_bitmap(canvas, fBitmap);
     return true;
 }
 
 SkDrawTextCommand::SkDrawTextCommand(const void* text, size_t byteLength, SkScalar x, SkScalar y,
                                      const SkPaint& paint)
     : INHERITED(DRAW_TEXT) {
     fText = new char[byteLength];
     memcpy(fText, text, byteLength);
     fByteLength = byteLength;
     fX = x;
     fY = y;
     fPaint = paint;
 
     fInfo.push(SkObjectParser::TextToString(text, byteLength, paint.getTextEncoding()));
     fInfo.push(SkObjectParser::ScalarToString(x, "SkScalar x: "));
     fInfo.push(SkObjectParser::ScalarToString(y, "SkScalar y: "));
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawTextCommand::execute(SkCanvas* canvas) {
+void SkDrawTextCommand::execute(SkCanvas* canvas) const {
     canvas->drawText(fText, fByteLength, fX, fY, fPaint);
 }
 
 SkDrawTextOnPathCommand::SkDrawTextOnPathCommand(const void* text, size_t byteLength,
                                                  const SkPath& path, const SkMatrix* matrix,
                                                  const SkPaint& paint)
     : INHERITED(DRAW_TEXT_ON_PATH) {
     fText = new char[byteLength];
     memcpy(fText, text, byteLength);
     fByteLength = byteLength;
     fPath = path;
     if (matrix) {
         fMatrix = *matrix;
     } else {
         fMatrix.setIdentity();
     }
     fPaint = paint;
 
     fInfo.push(SkObjectParser::TextToString(text, byteLength, paint.getTextEncoding()));
     fInfo.push(SkObjectParser::PathToString(path));
     if (matrix) {
         fInfo.push(SkObjectParser::MatrixToString(*matrix));
     }
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawTextOnPathCommand::execute(SkCanvas* canvas) {
+void SkDrawTextOnPathCommand::execute(SkCanvas* canvas) const {
     canvas->drawTextOnPath(fText, fByteLength, fPath,
                            fMatrix.isIdentity() ? NULL : &fMatrix,
                            fPaint);
 }
 
 SkDrawVerticesCommand::SkDrawVerticesCommand(SkCanvas::VertexMode vmode, int vertexCount,
                                              const SkPoint vertices[], const SkPoint texs[],
                                              const SkColor colors[], SkXfermode* xfermode,
                                              const uint16_t indices[], int indexCount,
                                              const SkPaint& paint)
@@ skipping 40 matching lines @@
 }
 
 SkDrawVerticesCommand::~SkDrawVerticesCommand() {
     delete [] fVertices;
     delete [] fTexs;
     delete [] fColors;
     SkSafeUnref(fXfermode);
     delete [] fIndices;
 }
 
-void SkDrawVerticesCommand::execute(SkCanvas* canvas) {
+void SkDrawVerticesCommand::execute(SkCanvas* canvas) const {
     canvas->drawVertices(fVmode, fVertexCount, fVertices,
                          fTexs, fColors, fXfermode, fIndices,
                          fIndexCount, fPaint);
 }
 
 SkRestoreCommand::SkRestoreCommand()
     : INHERITED(RESTORE) {
     fInfo.push(SkObjectParser::CustomTextToString("No Parameters"));
 }
 
-void SkRestoreCommand::execute(SkCanvas* canvas) {
+void SkRestoreCommand::execute(SkCanvas* canvas) const {
     canvas->restore();
 }
 
 void SkRestoreCommand::trackSaveState(int* state) {
     (*state)--;
 }
 
 SkRotateCommand::SkRotateCommand(SkScalar degrees)
     : INHERITED(ROTATE) {
     fDegrees = degrees;
 
     fInfo.push(SkObjectParser::ScalarToString(degrees, "SkScalar degrees: "));
 }
 
-void SkRotateCommand::execute(SkCanvas* canvas) {
+void SkRotateCommand::execute(SkCanvas* canvas) const {
     canvas->rotate(fDegrees);
 }
 
 SkSaveCommand::SkSaveCommand()
     : INHERITED(SAVE) {
 }
 
-void SkSaveCommand::execute(SkCanvas* canvas) {
+void SkSaveCommand::execute(SkCanvas* canvas) const {
     canvas->save();
 }
 
 void SkSaveCommand::trackSaveState(int* state) {
     (*state)++;
 }
 
 SkSaveLayerCommand::SkSaveLayerCommand(const SkRect* bounds, const SkPaint* paint,
                                        SkCanvas::SaveFlags flags)
     : INHERITED(SAVE_LAYER) {
@@ skipping 13 matching lines @@
 
     if (bounds) {
         fInfo.push(SkObjectParser::RectToString(*bounds, "Bounds: "));
     }
     if (paint) {
         fInfo.push(SkObjectParser::PaintToString(*paint));
     }
     fInfo.push(SkObjectParser::SaveFlagsToString(flags));
 }
 
-void SkSaveLayerCommand::execute(SkCanvas* canvas) {
+void SkSaveLayerCommand::execute(SkCanvas* canvas) const {
     canvas->saveLayer(fBounds.isEmpty() ? NULL : &fBounds,
                       fPaintPtr,
                       fFlags);
 }
 
-void SkSaveLayerCommand::vizExecute(SkCanvas* canvas) {
+void SkSaveLayerCommand::vizExecute(SkCanvas* canvas) const {
     canvas->save();
 }
 
 void SkSaveLayerCommand::trackSaveState(int* state) {
     (*state)++;
 }
 
 SkScaleCommand::SkScaleCommand(SkScalar sx, SkScalar sy)
     : INHERITED(SCALE) {
     fSx = sx;
     fSy = sy;
 
     fInfo.push(SkObjectParser::ScalarToString(sx, "SkScalar sx: "));
     fInfo.push(SkObjectParser::ScalarToString(sy, "SkScalar sy: "));
 }
 
-void SkScaleCommand::execute(SkCanvas* canvas) {
+void SkScaleCommand::execute(SkCanvas* canvas) const {
     canvas->scale(fSx, fSy);
 }
 
 SkSetMatrixCommand::SkSetMatrixCommand(const SkMatrix& matrix)
     : INHERITED(SET_MATRIX) {
     fUserMatrix.reset();
     fMatrix = matrix;
 
     fInfo.push(SkObjectParser::MatrixToString(matrix));
 }
 
 void SkSetMatrixCommand::setUserMatrix(const SkMatrix& userMatrix) {
     fUserMatrix = userMatrix;
 }
 
-void SkSetMatrixCommand::execute(SkCanvas* canvas) {
+void SkSetMatrixCommand::execute(SkCanvas* canvas) const {
     SkMatrix temp = SkMatrix::Concat(fUserMatrix, fMatrix);
     canvas->setMatrix(temp);
 }
 
 SkSkewCommand::SkSkewCommand(SkScalar sx, SkScalar sy)
     : INHERITED(SKEW) {
     fSx = sx;
     fSy = sy;
 
     fInfo.push(SkObjectParser::ScalarToString(sx, "SkScalar sx: "));
     fInfo.push(SkObjectParser::ScalarToString(sy, "SkScalar sy: "));
 }
 
-void SkSkewCommand::execute(SkCanvas* canvas) {
+void SkSkewCommand::execute(SkCanvas* canvas) const {
     canvas->skew(fSx, fSy);
 }
 
 SkTranslateCommand::SkTranslateCommand(SkScalar dx, SkScalar dy)
     : INHERITED(TRANSLATE) {
     fDx = dx;
     fDy = dy;
 
     fInfo.push(SkObjectParser::ScalarToString(dx, "SkScalar dx: "));
     fInfo.push(SkObjectParser::ScalarToString(dy, "SkScalar dy: "));
 }
 
-void SkTranslateCommand::execute(SkCanvas* canvas) {
+void SkTranslateCommand::execute(SkCanvas* canvas) const {
     canvas->translate(fDx, fDy);
 }
 
 SkPushCullCommand::SkPushCullCommand(const SkRect& cullRect)
     : INHERITED(PUSH_CULL)
     , fCullRect(cullRect) {
     fInfo.push(SkObjectParser::RectToString(cullRect));
 }
 
-void SkPushCullCommand::execute(SkCanvas* canvas) {
+void SkPushCullCommand::execute(SkCanvas* canvas) const {
     canvas->pushCull(fCullRect);
 }
 
-void SkPushCullCommand::vizExecute(SkCanvas* canvas) {
+void SkPushCullCommand::vizExecute(SkCanvas* canvas) const {
     canvas->pushCull(fCullRect);
 
     SkPaint p;
     p.setColor(SK_ColorCYAN);
     p.setStyle(SkPaint::kStroke_Style);
     canvas->drawRect(fCullRect, p);
 }
 
 SkPopCullCommand::SkPopCullCommand() : INHERITED(POP_CULL) { }
 
-void SkPopCullCommand::execute(SkCanvas* canvas) {
+void SkPopCullCommand::execute(SkCanvas* canvas) const {
     canvas->popCull();
 }