Revert of SkDrawCommand scrubbing (patchset #2 id:20001 of https://codereview.chromium.org/706363002/)
Reason for revert:
Canary borkage.
Original issue's description:
> SkDrawCommand scrubbing
>
> Remove unused ctor, constify, etc.
>
> R=robertphillips@google.com
>
> Committed: https://skia.googlesource.com/skia/+/1931ec5b5dac68f1e452af0c65161bdce35b2dec
TBR=robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/712683002
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index 4901d62..59bfcca 100644
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -689,7 +689,8 @@
fCanvasWidget.drawTo(currentRow);
fImageWidget.draw();
}
- const SkTDArray<SkString*> *currInfo = fDebugger.getCommandInfo(currentRow);
+ SkTDArray<SkString*> *currInfo = fDebugger.getCommandInfo(
+ currentRow);
/* TODO(chudy): Add command type before parameters. Rename v
* to something more informative. */
diff --git a/debugger/SkDebugger.h b/debugger/SkDebugger.h
index 5359b10..53b480a 100644
--- a/debugger/SkDebugger.h
+++ b/debugger/SkDebugger.h
@@ -79,7 +79,7 @@
return fDebugCanvas->getCommandAtPoint(x, y, index);
}
- const SkTDArray<SkString*>* getCommandInfo(int index) const {
+ SkTDArray<SkString*>* getCommandInfo(int index) {
return fDebugCanvas->getCommandInfo(index);
}
diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp
index b07b383..3b68365 100644
--- a/src/utils/debugger/SkDebugCanvas.cpp
+++ b/src/utils/debugger/SkDebugCanvas.cpp
@@ -379,7 +379,7 @@
fCommandVector[index] = command;
}
-const SkTDArray<SkString*>* SkDebugCanvas::getCommandInfo(int index) const {
+SkTDArray<SkString*>* SkDebugCanvas::getCommandInfo(int index) {
SkASSERT(index < fCommandVector.count());
return fCommandVector[index]->Info();
}
diff --git a/src/utils/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h
index bdd04aa..0beb642 100644
--- a/src/utils/debugger/SkDebugCanvas.h
+++ b/src/utils/debugger/SkDebugCanvas.h
@@ -102,7 +102,7 @@
Returns information about the command at the given index.
@param index The index of the command
*/
- const SkTDArray<SkString*>* getCommandInfo(int index) const;
+ SkTDArray<SkString*>* getCommandInfo(int index);
/**
Returns the visibility of the command at the given index.
diff --git a/src/utils/debugger/SkDrawCommand.cpp b/src/utils/debugger/SkDrawCommand.cpp
index 142c4a4..93c436d 100644
--- a/src/utils/debugger/SkDrawCommand.cpp
+++ b/src/utils/debugger/SkDrawCommand.cpp
@@ -20,6 +20,11 @@
, fVisible(true) {
}
+SkDrawCommand::SkDrawCommand() {
+ fOffset = 0;
+ fVisible = true;
+}
+
SkDrawCommand::~SkDrawCommand() {
fInfo.deleteAll();
}
@@ -76,7 +81,7 @@
return NULL;
}
-SkString SkDrawCommand::toString() const {
+SkString SkDrawCommand::toString() {
return SkString(GetCommandString(fDrawType));
}
@@ -85,7 +90,7 @@
fInfo.push(SkObjectParser::CustomTextToString("No Parameters"));
}
-void SkClearCommand::execute(SkCanvas* canvas) const {
+void SkClearCommand::execute(SkCanvas* canvas) {
canvas->clear(fColor);
}
@@ -202,7 +207,7 @@
fInfo.push(SkObjectParser::BoolToString(doAA));
}
-void SkClipPathCommand::execute(SkCanvas* canvas) const {
+void SkClipPathCommand::execute(SkCanvas* canvas) {
canvas->clipPath(fPath, fOp, fDoAA);
}
@@ -220,7 +225,7 @@
fInfo.push(SkObjectParser::RegionOpToString(op));
}
-void SkClipRegionCommand::execute(SkCanvas* canvas) const {
+void SkClipRegionCommand::execute(SkCanvas* canvas) {
canvas->clipRegion(fRegion, fOp);
}
@@ -235,7 +240,7 @@
fInfo.push(SkObjectParser::BoolToString(doAA));
}
-void SkClipRectCommand::execute(SkCanvas* canvas) const {
+void SkClipRectCommand::execute(SkCanvas* canvas) {
canvas->clipRect(fRect, fOp, fDoAA);
}
@@ -250,7 +255,7 @@
fInfo.push(SkObjectParser::BoolToString(doAA));
}
-void SkClipRRectCommand::execute(SkCanvas* canvas) const {
+void SkClipRRectCommand::execute(SkCanvas* canvas) {
canvas->clipRRect(fRRect, fOp, fDoAA);
}
@@ -266,7 +271,7 @@
fInfo.push(SkObjectParser::MatrixToString(matrix));
}
-void SkConcatCommand::execute(SkCanvas* canvas) const {
+void SkConcatCommand::execute(SkCanvas* canvas) {
canvas->concat(fMatrix);
}
@@ -291,7 +296,7 @@
}
}
-void SkDrawBitmapCommand::execute(SkCanvas* canvas) const {
+void SkDrawBitmapCommand::execute(SkCanvas* canvas) {
canvas->drawBitmap(fBitmap, fLeft, fTop, fPaintPtr);
}
@@ -320,7 +325,7 @@
}
}
-void SkDrawBitmapMatrixCommand::execute(SkCanvas* canvas) const {
+void SkDrawBitmapMatrixCommand::execute(SkCanvas* canvas) {
canvas->drawBitmapMatrix(fBitmap, fMatrix, fPaintPtr);
}
@@ -350,7 +355,7 @@
}
}
-void SkDrawBitmapNineCommand::execute(SkCanvas* canvas) const {
+void SkDrawBitmapNineCommand::execute(SkCanvas* canvas) {
canvas->drawBitmapNine(fBitmap, fCenter, fDst, fPaintPtr);
}
@@ -390,7 +395,7 @@
fInfo.push(SkObjectParser::IntToString(fFlags, "Flags: "));
}
-void SkDrawBitmapRectCommand::execute(SkCanvas* canvas) const {
+void SkDrawBitmapRectCommand::execute(SkCanvas* canvas) {
canvas->drawBitmapRectToRect(fBitmap, this->srcRect(), fDst, fPaintPtr, fFlags);
}
@@ -411,7 +416,7 @@
fInfo.push(str);
}
-void SkDrawDataCommand::execute(SkCanvas* canvas) const {
+void SkDrawDataCommand::execute(SkCanvas* canvas) {
canvas->drawData(fData, fLength);
}
@@ -445,7 +450,7 @@
fInfo.push(SkObjectParser::PaintToString(paint));
}
-void SkDrawOvalCommand::execute(SkCanvas* canvas) const {
+void SkDrawOvalCommand::execute(SkCanvas* canvas) {
canvas->drawOval(fOval, fPaint);
}
@@ -472,7 +477,7 @@
fInfo.push(SkObjectParser::PaintToString(paint));
}
-void SkDrawPaintCommand::execute(SkCanvas* canvas) const {
+void SkDrawPaintCommand::execute(SkCanvas* canvas) {
canvas->drawPaint(fPaint);
}
@@ -491,7 +496,7 @@
fInfo.push(SkObjectParser::PaintToString(paint));
}
-void SkDrawPathCommand::execute(SkCanvas* canvas) const {
+void SkDrawPathCommand::execute(SkCanvas* canvas) {
canvas->drawPath(fPath, fPaint);
}
@@ -530,7 +535,7 @@
}
}
-void SkDrawPictureCommand::execute(SkCanvas* canvas) const {
+void SkDrawPictureCommand::execute(SkCanvas* canvas) {
canvas->drawPicture(fPicture, fMatrixPtr, fPaintPtr);
}
@@ -563,7 +568,7 @@
fInfo.push(SkObjectParser::PaintToString(paint));
}
-void SkDrawPointsCommand::execute(SkCanvas* canvas) const {
+void SkDrawPointsCommand::execute(SkCanvas* canvas) {
canvas->drawPoints(fMode, fCount, fPts, fPaint);
}
@@ -610,7 +615,7 @@
fInfo.push(SkObjectParser::PaintToString(paint));
}
-void SkDrawPosTextCommand::execute(SkCanvas* canvas) const {
+void SkDrawPosTextCommand::execute(SkCanvas* canvas) {
canvas->drawPosText(fText, fByteLength, fPos, fPaint);
}
@@ -637,7 +642,7 @@
fInfo.push(SkObjectParser::PaintToString(paint));
}
-void SkDrawPosTextHCommand::execute(SkCanvas* canvas) const {
+void SkDrawPosTextHCommand::execute(SkCanvas* canvas) {
canvas->drawPosTextH(fText, fByteLength, fXpos, fConstY, fPaint);
}
@@ -657,7 +662,7 @@
fInfo.push(SkObjectParser::PaintToString(paint));
}
-void SkDrawTextBlobCommand::execute(SkCanvas* canvas) const {
+void SkDrawTextBlobCommand::execute(SkCanvas* canvas) {
canvas->drawTextBlob(fBlob, fXPos, fYPos, fPaint);
}
@@ -684,7 +689,7 @@
fInfo.push(SkObjectParser::PaintToString(paint));
}
-void SkDrawRectCommand::execute(SkCanvas* canvas) const {
+void SkDrawRectCommand::execute(SkCanvas* canvas) {
canvas->drawRect(fRect, fPaint);
}
@@ -697,7 +702,7 @@
fInfo.push(SkObjectParser::PaintToString(paint));
}
-void SkDrawRRectCommand::execute(SkCanvas* canvas) const {
+void SkDrawRRectCommand::execute(SkCanvas* canvas) {
canvas->drawRRect(fRRect, fPaint);
}
@@ -719,7 +724,7 @@
fInfo.push(SkObjectParser::PaintToString(paint));
}
-void SkDrawDRRectCommand::execute(SkCanvas* canvas) const {
+void SkDrawDRRectCommand::execute(SkCanvas* canvas) {
canvas->drawDRRect(fOuter, fInner, fPaint);
}
@@ -749,7 +754,7 @@
}
}
-void SkDrawSpriteCommand::execute(SkCanvas* canvas) const {
+void SkDrawSpriteCommand::execute(SkCanvas* canvas) {
canvas->drawSprite(fBitmap, fLeft, fTop, fPaintPtr);
}
@@ -774,7 +779,7 @@
fInfo.push(SkObjectParser::PaintToString(paint));
}
-void SkDrawTextCommand::execute(SkCanvas* canvas) const {
+void SkDrawTextCommand::execute(SkCanvas* canvas) {
canvas->drawText(fText, fByteLength, fX, fY, fPaint);
}
@@ -801,7 +806,7 @@
fInfo.push(SkObjectParser::PaintToString(paint));
}
-void SkDrawTextOnPathCommand::execute(SkCanvas* canvas) const {
+void SkDrawTextOnPathCommand::execute(SkCanvas* canvas) {
canvas->drawTextOnPath(fText, fByteLength, fPath,
fMatrix.isIdentity() ? NULL : &fMatrix,
fPaint);
@@ -862,7 +867,7 @@
delete [] fIndices;
}
-void SkDrawVerticesCommand::execute(SkCanvas* canvas) const {
+void SkDrawVerticesCommand::execute(SkCanvas* canvas) {
canvas->drawVertices(fVmode, fVertexCount, fVertices,
fTexs, fColors, fXfermode, fIndices,
fIndexCount, fPaint);
@@ -873,7 +878,7 @@
fInfo.push(SkObjectParser::CustomTextToString("No Parameters"));
}
-void SkRestoreCommand::execute(SkCanvas* canvas) const {
+void SkRestoreCommand::execute(SkCanvas* canvas) {
canvas->restore();
}
@@ -888,7 +893,7 @@
fInfo.push(SkObjectParser::ScalarToString(degrees, "SkScalar degrees: "));
}
-void SkRotateCommand::execute(SkCanvas* canvas) const {
+void SkRotateCommand::execute(SkCanvas* canvas) {
canvas->rotate(fDegrees);
}
@@ -896,7 +901,7 @@
: INHERITED(SAVE) {
}
-void SkSaveCommand::execute(SkCanvas* canvas) const {
+void SkSaveCommand::execute(SkCanvas* canvas) {
canvas->save();
}
@@ -930,13 +935,13 @@
fInfo.push(SkObjectParser::SaveFlagsToString(flags));
}
-void SkSaveLayerCommand::execute(SkCanvas* canvas) const {
+void SkSaveLayerCommand::execute(SkCanvas* canvas) {
canvas->saveLayer(fBounds.isEmpty() ? NULL : &fBounds,
fPaintPtr,
fFlags);
}
-void SkSaveLayerCommand::vizExecute(SkCanvas* canvas) const {
+void SkSaveLayerCommand::vizExecute(SkCanvas* canvas) {
canvas->save();
}
@@ -953,7 +958,7 @@
fInfo.push(SkObjectParser::ScalarToString(sy, "SkScalar sy: "));
}
-void SkScaleCommand::execute(SkCanvas* canvas) const {
+void SkScaleCommand::execute(SkCanvas* canvas) {
canvas->scale(fSx, fSy);
}
@@ -969,7 +974,7 @@
fUserMatrix = userMatrix;
}
-void SkSetMatrixCommand::execute(SkCanvas* canvas) const {
+void SkSetMatrixCommand::execute(SkCanvas* canvas) {
SkMatrix temp = SkMatrix::Concat(fUserMatrix, fMatrix);
canvas->setMatrix(temp);
}
@@ -983,7 +988,7 @@
fInfo.push(SkObjectParser::ScalarToString(sy, "SkScalar sy: "));
}
-void SkSkewCommand::execute(SkCanvas* canvas) const {
+void SkSkewCommand::execute(SkCanvas* canvas) {
canvas->skew(fSx, fSy);
}
@@ -996,7 +1001,7 @@
fInfo.push(SkObjectParser::ScalarToString(dy, "SkScalar dy: "));
}
-void SkTranslateCommand::execute(SkCanvas* canvas) const {
+void SkTranslateCommand::execute(SkCanvas* canvas) {
canvas->translate(fDx, fDy);
}
@@ -1006,11 +1011,11 @@
fInfo.push(SkObjectParser::RectToString(cullRect));
}
-void SkPushCullCommand::execute(SkCanvas* canvas) const {
+void SkPushCullCommand::execute(SkCanvas* canvas) {
canvas->pushCull(fCullRect);
}
-void SkPushCullCommand::vizExecute(SkCanvas* canvas) const {
+void SkPushCullCommand::vizExecute(SkCanvas* canvas) {
canvas->pushCull(fCullRect);
SkPaint p;
@@ -1021,6 +1026,6 @@
SkPopCullCommand::SkPopCullCommand() : INHERITED(POP_CULL) { }
-void SkPopCullCommand::execute(SkCanvas* canvas) const {
+void SkPopCullCommand::execute(SkCanvas* canvas) {
canvas->popCull();
}
diff --git a/src/utils/debugger/SkDrawCommand.h b/src/utils/debugger/SkDrawCommand.h
index cae0e14..1d3d373 100644
--- a/src/utils/debugger/SkDrawCommand.h
+++ b/src/utils/debugger/SkDrawCommand.h
@@ -15,16 +15,18 @@
class SK_API SkDrawCommand {
public:
+ /* TODO(chudy): Remove subclasses. */
SkDrawCommand(DrawType drawType);
+ SkDrawCommand();
virtual ~SkDrawCommand();
- virtual SkString toString() const;
+ virtual SkString toString();
void setOffset(size_t offset) { fOffset = offset; }
- size_t offset() const { return fOffset; }
+ virtual size_t offset() { return fOffset; }
- virtual const char* toCString() const {
+ virtual const char* toCString() {
return GetCommandString(fDrawType);
}
@@ -36,15 +38,15 @@
fVisible = toggle;
}
- const SkTDArray<SkString*>* Info() const { return &fInfo; }
- virtual void execute(SkCanvas*) const = 0;
- virtual void vizExecute(SkCanvas*) const {}
+ SkTDArray<SkString*>* Info() {return &fInfo; };
+ virtual void execute(SkCanvas* canvas) = 0;
+ virtual void vizExecute(SkCanvas* canvas) { };
- virtual void setUserMatrix(const SkMatrix&) {}
+ virtual void setUserMatrix(const SkMatrix& userMtx) { };
/** Does nothing by default, but used by save() and restore()-type
subclasses to track unresolved save() calls. */
- virtual void trackSaveState(int* state) {}
+ virtual void trackSaveState(int* state) { };
// The next "active" system is only used by save, saveLayer, restore,
// pushCull and popCull. It is used in two ways:
@@ -68,7 +70,7 @@
virtual void setActive(bool active) {}
virtual bool active() const { return false; }
- DrawType getType() const { return fDrawType; }
+ DrawType getType() { return fDrawType; };
virtual bool render(SkCanvas* canvas) const { return false; }
@@ -86,7 +88,7 @@
class SkRestoreCommand : public SkDrawCommand {
public:
SkRestoreCommand();
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual void trackSaveState(int* state) SK_OVERRIDE;
virtual Action action() const SK_OVERRIDE { return kPopLayer_Action; }
@@ -97,7 +99,7 @@
class SkClearCommand : public SkDrawCommand {
public:
SkClearCommand(SkColor color);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private:
SkColor fColor;
@@ -107,7 +109,7 @@
class SkClipPathCommand : public SkDrawCommand {
public:
SkClipPathCommand(const SkPath& path, SkRegion::Op op, bool doAA);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
private:
SkPath fPath;
@@ -120,7 +122,7 @@
class SkClipRegionCommand : public SkDrawCommand {
public:
SkClipRegionCommand(const SkRegion& region, SkRegion::Op op);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private:
SkRegion fRegion;
SkRegion::Op fOp;
@@ -131,7 +133,7 @@
class SkClipRectCommand : public SkDrawCommand {
public:
SkClipRectCommand(const SkRect& rect, SkRegion::Op op, bool doAA);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
const SkRect& rect() const { return fRect; }
SkRegion::Op op() const { return fOp; }
@@ -148,7 +150,7 @@
class SkClipRRectCommand : public SkDrawCommand {
public:
SkClipRRectCommand(const SkRRect& rrect, SkRegion::Op op, bool doAA);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
const SkRRect& rrect() const { return fRRect; }
@@ -166,7 +168,7 @@
class SkConcatCommand : public SkDrawCommand {
public:
SkConcatCommand(const SkMatrix& matrix);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private:
SkMatrix fMatrix;
@@ -177,7 +179,7 @@
public:
SkDrawBitmapCommand(const SkBitmap& bitmap, SkScalar left, SkScalar top,
const SkPaint* paint);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
private:
SkBitmap fBitmap;
@@ -193,7 +195,7 @@
public:
SkDrawBitmapMatrixCommand(const SkBitmap& bitmap, const SkMatrix& matrix,
const SkPaint* paint);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
private:
SkBitmap fBitmap;
@@ -208,7 +210,7 @@
public:
SkDrawBitmapNineCommand(const SkBitmap& bitmap, const SkIRect& center,
const SkRect& dst, const SkPaint* paint);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
private:
SkBitmap fBitmap;
@@ -225,7 +227,7 @@
SkDrawBitmapRectCommand(const SkBitmap& bitmap, const SkRect* src,
const SkRect& dst, const SkPaint* paint,
SkCanvas::DrawBitmapRectFlags flags);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
const SkBitmap& bitmap() const { return fBitmap; }
@@ -263,7 +265,7 @@
public:
SkDrawDataCommand(const void* data, size_t length);
virtual ~SkDrawDataCommand() { delete [] fData; }
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private:
char* fData;
size_t fLength;
@@ -274,7 +276,7 @@
class SkBeginCommentGroupCommand : public SkDrawCommand {
public:
SkBeginCommentGroupCommand(const char* description);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE {
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE {
canvas->beginCommentGroup(fDescription.c_str());
};
private:
@@ -286,7 +288,7 @@
class SkCommentCommand : public SkDrawCommand {
public:
SkCommentCommand(const char* kywd, const char* value);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE {
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE {
canvas->addComment(fKywd.c_str(), fValue.c_str());
};
private:
@@ -299,7 +301,7 @@
class SkEndCommentGroupCommand : public SkDrawCommand {
public:
SkEndCommentGroupCommand();
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE {
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE {
canvas->endCommentGroup();
};
private:
@@ -309,7 +311,7 @@
class SkDrawOvalCommand : public SkDrawCommand {
public:
SkDrawOvalCommand(const SkRect& oval, const SkPaint& paint);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
private:
SkRect fOval;
@@ -321,7 +323,7 @@
class SkDrawPaintCommand : public SkDrawCommand {
public:
SkDrawPaintCommand(const SkPaint& paint);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
private:
SkPaint fPaint;
@@ -332,7 +334,7 @@
class SkDrawPathCommand : public SkDrawCommand {
public:
SkDrawPathCommand(const SkPath& path, const SkPaint& paint);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
private:
@@ -345,7 +347,7 @@
class SkDrawPictureCommand : public SkDrawCommand {
public:
SkDrawPictureCommand(const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
private:
@@ -363,7 +365,7 @@
SkDrawPointsCommand(SkCanvas::PointMode mode, size_t count, const SkPoint pts[],
const SkPaint& paint);
virtual ~SkDrawPointsCommand() { delete [] fPts; }
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
private:
SkCanvas::PointMode fMode;
@@ -379,7 +381,7 @@
SkDrawTextCommand(const void* text, size_t byteLength, SkScalar x, SkScalar y,
const SkPaint& paint);
virtual ~SkDrawTextCommand() { delete [] fText; }
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private:
char* fText;
size_t fByteLength;
@@ -395,7 +397,7 @@
SkDrawPosTextCommand(const void* text, size_t byteLength, const SkPoint pos[],
const SkPaint& paint);
virtual ~SkDrawPosTextCommand() { delete [] fPos; delete [] fText; }
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private:
char* fText;
size_t fByteLength;
@@ -410,7 +412,7 @@
SkDrawTextOnPathCommand(const void* text, size_t byteLength, const SkPath& path,
const SkMatrix* matrix, const SkPaint& paint);
virtual ~SkDrawTextOnPathCommand() { delete [] fText; }
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private:
char* fText;
size_t fByteLength;
@@ -426,7 +428,7 @@
SkDrawPosTextHCommand(const void* text, size_t byteLength, const SkScalar xpos[],
SkScalar constY, const SkPaint& paint);
virtual ~SkDrawPosTextHCommand() { delete [] fXpos; delete [] fText; }
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private:
SkScalar* fXpos;
char* fText;
@@ -441,7 +443,7 @@
public:
SkDrawTextBlobCommand(const SkTextBlob* blob, SkScalar x, SkScalar y, const SkPaint& paint);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
private:
@@ -456,7 +458,7 @@
class SkDrawRectCommand : public SkDrawCommand {
public:
SkDrawRectCommand(const SkRect& rect, const SkPaint& paint);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
const SkRect& rect() const { return fRect; }
const SkPaint& paint() const { return fPaint; }
@@ -470,7 +472,7 @@
class SkDrawRRectCommand : public SkDrawCommand {
public:
SkDrawRRectCommand(const SkRRect& rrect, const SkPaint& paint);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
private:
SkRRect fRRect;
@@ -483,7 +485,7 @@
public:
SkDrawDRRectCommand(const SkRRect& outer, const SkRRect& inner,
const SkPaint& paint);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
private:
SkRRect fOuter;
@@ -496,7 +498,7 @@
class SkDrawSpriteCommand : public SkDrawCommand {
public:
SkDrawSpriteCommand(const SkBitmap& bitmap, int left, int top, const SkPaint* paint);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
private:
SkBitmap fBitmap;
@@ -516,7 +518,7 @@
const uint16_t indices[], int indexCount,
const SkPaint& paint);
virtual ~SkDrawVerticesCommand();
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private:
SkCanvas::VertexMode fVmode;
int fVertexCount;
@@ -534,7 +536,7 @@
class SkRotateCommand : public SkDrawCommand {
public:
SkRotateCommand(SkScalar degrees);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private:
SkScalar fDegrees;
@@ -544,7 +546,7 @@
class SkSaveCommand : public SkDrawCommand {
public:
SkSaveCommand();
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual void trackSaveState(int* state) SK_OVERRIDE;
virtual Action action() const SK_OVERRIDE { return kPushLayer_Action; }
private:
@@ -555,8 +557,8 @@
public:
SkSaveLayerCommand(const SkRect* bounds, const SkPaint* paint,
SkCanvas::SaveFlags flags);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
- virtual void vizExecute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
+ virtual void vizExecute(SkCanvas* canvas) SK_OVERRIDE;
virtual void trackSaveState(int* state) SK_OVERRIDE;
virtual Action action() const SK_OVERRIDE{ return kPushLayer_Action; }
virtual void setActive(bool active) SK_OVERRIDE { fActive = active; }
@@ -578,7 +580,7 @@
class SkScaleCommand : public SkDrawCommand {
public:
SkScaleCommand(SkScalar sx, SkScalar sy);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
SkScalar x() const { return fSx; }
SkScalar y() const { return fSy; }
@@ -594,7 +596,7 @@
public:
SkSetMatrixCommand(const SkMatrix& matrix);
virtual void setUserMatrix(const SkMatrix&) SK_OVERRIDE;
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private:
SkMatrix fUserMatrix;
SkMatrix fMatrix;
@@ -605,7 +607,7 @@
class SkSkewCommand : public SkDrawCommand {
public:
SkSkewCommand(SkScalar sx, SkScalar sy);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
private:
SkScalar fSx;
SkScalar fSy;
@@ -616,7 +618,7 @@
class SkTranslateCommand : public SkDrawCommand {
public:
SkTranslateCommand(SkScalar dx, SkScalar dy);
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
SkScalar x() const { return fDx; }
SkScalar y() const { return fDy; }
@@ -631,8 +633,8 @@
class SkPushCullCommand : public SkDrawCommand {
public:
SkPushCullCommand(const SkRect&);
- virtual void execute(SkCanvas*) const SK_OVERRIDE;
- virtual void vizExecute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas*) SK_OVERRIDE;
+ virtual void vizExecute(SkCanvas* canvas) SK_OVERRIDE;
virtual Action action() const { return kPushCull_Action; }
virtual void setActive(bool active) { fActive = active; }
virtual bool active() const { return fActive; }
@@ -646,7 +648,7 @@
class SkPopCullCommand : public SkDrawCommand {
public:
SkPopCullCommand();
- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
virtual Action action() const { return kPopCull_Action; }
private:
typedef SkDrawCommand INHERITED;