src/utils/debugger/SkDrawCommand.h - Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases.

Unified Diff: src/utils/debugger/SkDrawCommand.h

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: rebase Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/utils/debugger/SkDrawCommand.h

diff --git a/src/utils/debugger/SkDrawCommand.h b/src/utils/debugger/SkDrawCommand.h

index 831dffcfa04f8bc005b9439a52c65748223454bb..22ee700dd7ebd820640a7f48b78ba76aa7875cce 100644

--- a/src/utils/debugger/SkDrawCommand.h

+++ b/src/utils/debugger/SkDrawCommand.h

@@ -79,9 +79,9 @@ private:

class SkRestoreCommand : public SkDrawCommand {

public:

SkRestoreCommand();

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

- virtual void trackSaveState(int* state) SK_OVERRIDE;

- virtual Action action() const SK_OVERRIDE { return kPopLayer_Action; }

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void trackSaveState(int* state) SK_OVERRIDE;

+ Action action() const SK_OVERRIDE { return kPopLayer_Action; }

private:

typedef SkDrawCommand INHERITED;

@@ -90,7 +90,7 @@ private:

class SkClearCommand : public SkDrawCommand {

public:

SkClearCommand(SkColor color);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkColor fColor;

@@ -100,8 +100,8 @@ private:

class SkClipPathCommand : public SkDrawCommand {

public:

SkClipPathCommand(const SkPath& path, SkRegion::Op op, bool doAA);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

- virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ bool render(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkPath fPath;

SkRegion::Op fOp;

@@ -113,7 +113,7 @@ private:

class SkClipRegionCommand : public SkDrawCommand {

public:

SkClipRegionCommand(const SkRegion& region, SkRegion::Op op);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkRegion fRegion;

SkRegion::Op fOp;

@@ -124,7 +124,7 @@ private:

class SkClipRectCommand : public SkDrawCommand {

public:

SkClipRectCommand(const SkRect& rect, SkRegion::Op op, bool doAA);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

const SkRect& rect() const { return fRect; }

SkRegion::Op op() const { return fOp; }

@@ -141,8 +141,8 @@ private:

class SkClipRRectCommand : public SkDrawCommand {

public:

SkClipRRectCommand(const SkRRect& rrect, SkRegion::Op op, bool doAA);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

- virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ bool render(SkCanvas* canvas) const SK_OVERRIDE;

const SkRRect& rrect() const { return fRRect; }

SkRegion::Op op() const { return fOp; }

@@ -159,7 +159,7 @@ private:

class SkConcatCommand : public SkDrawCommand {

public:

SkConcatCommand(const SkMatrix& matrix);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkMatrix fMatrix;

@@ -170,8 +170,8 @@ class SkDrawBitmapCommand : public SkDrawCommand {

public:

SkDrawBitmapCommand(const SkBitmap& bitmap, SkScalar left, SkScalar top,

const SkPaint* paint);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

- virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ bool render(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkBitmap fBitmap;

SkScalar fLeft;

@@ -186,8 +186,8 @@ class SkDrawBitmapNineCommand : public SkDrawCommand {

public:

SkDrawBitmapNineCommand(const SkBitmap& bitmap, const SkIRect& center,

const SkRect& dst, const SkPaint* paint);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

- virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ bool render(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkBitmap fBitmap;

SkIRect fCenter;

@@ -203,8 +203,8 @@ public:

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 bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ bool render(SkCanvas* canvas) const SK_OVERRIDE;

const SkBitmap& bitmap() const { return fBitmap; }

@@ -240,7 +240,7 @@ private:

class SkBeginCommentGroupCommand : public SkDrawCommand {

public:

SkBeginCommentGroupCommand(const char* description);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE {

+ void execute(SkCanvas* canvas) const SK_OVERRIDE {

canvas->beginCommentGroup(fDescription.c_str());

};

private:

@@ -252,7 +252,7 @@ private:

class SkCommentCommand : public SkDrawCommand {

public:

SkCommentCommand(const char* kywd, const char* value);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE {

+ void execute(SkCanvas* canvas) const SK_OVERRIDE {

canvas->addComment(fKywd.c_str(), fValue.c_str());

};

private:

@@ -265,7 +265,7 @@ private:

class SkEndCommentGroupCommand : public SkDrawCommand {

public:

SkEndCommentGroupCommand();

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE {

+ void execute(SkCanvas* canvas) const SK_OVERRIDE {

canvas->endCommentGroup();

};

private:

@@ -275,8 +275,8 @@ private:

class SkDrawOvalCommand : public SkDrawCommand {

public:

SkDrawOvalCommand(const SkRect& oval, const SkPaint& paint);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

- virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ bool render(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkRect fOval;

SkPaint fPaint;

@@ -287,8 +287,8 @@ private:

class SkDrawPaintCommand : public SkDrawCommand {

public:

SkDrawPaintCommand(const SkPaint& paint);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

- virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ bool render(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkPaint fPaint;

@@ -298,8 +298,8 @@ private:

class SkDrawPathCommand : public SkDrawCommand {

public:

SkDrawPathCommand(const SkPath& path, const SkPaint& paint);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

- virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ bool render(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkPath fPath;

@@ -311,8 +311,8 @@ private:

class SkDrawPictureCommand : public SkDrawCommand {

public:

SkDrawPictureCommand(const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

- virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ bool render(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkAutoTUnref<const SkPicture> fPicture;

@@ -329,8 +329,8 @@ public:

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 bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ bool render(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkCanvas::PointMode fMode;

size_t fCount;

@@ -345,7 +345,7 @@ public:

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;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

private:

char* fText;

size_t fByteLength;

@@ -361,7 +361,7 @@ public:

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;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

private:

char* fText;

size_t fByteLength;

@@ -376,7 +376,7 @@ public:

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;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

private:

char* fText;

size_t fByteLength;

@@ -392,7 +392,7 @@ public:

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;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkScalar* fXpos;

char* fText;

@@ -407,8 +407,8 @@ class SkDrawTextBlobCommand : public SkDrawCommand {

public:

SkDrawTextBlobCommand(const SkTextBlob* blob, SkScalar x, SkScalar y, const SkPaint& paint);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

- virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ bool render(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkAutoTUnref<const SkTextBlob> fBlob;

@@ -422,7 +422,7 @@ private:

class SkDrawRectCommand : public SkDrawCommand {

public:

SkDrawRectCommand(const SkRect& rect, const SkPaint& paint);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

const SkRect& rect() const { return fRect; }

const SkPaint& paint() const { return fPaint; }

@@ -436,8 +436,8 @@ private:

class SkDrawRRectCommand : public SkDrawCommand {

public:

SkDrawRRectCommand(const SkRRect& rrect, const SkPaint& paint);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

- virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ bool render(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkRRect fRRect;

SkPaint fPaint;

@@ -449,8 +449,8 @@ class SkDrawDRRectCommand : public SkDrawCommand {

public:

SkDrawDRRectCommand(const SkRRect& outer, const SkRRect& inner,

const SkPaint& paint);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

- virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ bool render(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkRRect fOuter;

SkRRect fInner;

@@ -462,8 +462,8 @@ private:

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 bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ bool render(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkBitmap fBitmap;

int fLeft;

@@ -482,7 +482,7 @@ public:

const uint16_t indices[], int indexCount,

const SkPaint& paint);

virtual ~SkDrawVerticesCommand();

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkCanvas::VertexMode fVmode;

int fVertexCount;

@@ -500,7 +500,7 @@ private:

class SkRotateCommand : public SkDrawCommand {

public:

SkRotateCommand(SkScalar degrees);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkScalar fDegrees;

@@ -510,9 +510,9 @@ private:

class SkSaveCommand : public SkDrawCommand {

public:

SkSaveCommand();

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

- virtual void trackSaveState(int* state) SK_OVERRIDE;

- virtual Action action() const SK_OVERRIDE { return kPushLayer_Action; }

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void trackSaveState(int* state) SK_OVERRIDE;

+ Action action() const SK_OVERRIDE { return kPushLayer_Action; }

private:

typedef SkDrawCommand INHERITED;

};

@@ -521,12 +521,12 @@ class SkSaveLayerCommand : public SkDrawCommand {

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 trackSaveState(int* state) SK_OVERRIDE;

- virtual Action action() const SK_OVERRIDE{ return kPushLayer_Action; }

- virtual void setActive(bool active) SK_OVERRIDE { fActive = active; }

- virtual bool active() const SK_OVERRIDE { return fActive; }

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void vizExecute(SkCanvas* canvas) const SK_OVERRIDE;

+ void trackSaveState(int* state) SK_OVERRIDE;

+ Action action() const SK_OVERRIDE{ return kPushLayer_Action; }

+ void setActive(bool active) SK_OVERRIDE { fActive = active; }

+ bool active() const SK_OVERRIDE { return fActive; }

const SkPaint* paint() const { return fPaintPtr; }

@@ -544,7 +544,7 @@ private:

class SkScaleCommand : public SkDrawCommand {

public:

SkScaleCommand(SkScalar sx, SkScalar sy);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

SkScalar x() const { return fSx; }

SkScalar y() const { return fSy; }

@@ -559,8 +559,8 @@ private:

class SkSetMatrixCommand : public SkDrawCommand {

public:

SkSetMatrixCommand(const SkMatrix& matrix);

- virtual void setUserMatrix(const SkMatrix&) SK_OVERRIDE;

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void setUserMatrix(const SkMatrix&) SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkMatrix fUserMatrix;

SkMatrix fMatrix;

@@ -571,7 +571,7 @@ private:

class SkSkewCommand : public SkDrawCommand {

public:

SkSkewCommand(SkScalar sx, SkScalar sy);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

private:

SkScalar fSx;

SkScalar fSy;

@@ -582,7 +582,7 @@ private:

class SkTranslateCommand : public SkDrawCommand {

public:

SkTranslateCommand(SkScalar dx, SkScalar dy);

- virtual void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const SK_OVERRIDE;

SkScalar x() const { return fDx; }

SkScalar y() const { return fDy; }

« no previous file with comments | « src/utils/debugger/SkDebugCanvas.cpp ('k') | src/utils/win/SkDWriteFontFileStream.h » ('j') | no next file with comments »