src/utils/debugger/SkDrawCommand.h - Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}

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

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master

Patch Set: git cl web Created 5 years, 9 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 bcc97ca7916bf1f2d15d55e2a9509ef58fa747a3..9e25f4d20d4ed8c877396d18ab0797f507dbdf8f 100644

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

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

@@ -113,8 +113,8 @@ private:

class SkRestoreCommand : public SkDrawCommand {

public:

SkRestoreCommand();

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

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

+ void execute(SkCanvas* canvas) const override;

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

private:

typedef SkDrawCommand INHERITED;

@@ -123,7 +123,7 @@ private:

class SkClearCommand : public SkDrawCommand {

public:

SkClearCommand(SkColor color);

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

private:

SkColor fColor;

@@ -133,8 +133,8 @@ private:

class SkClipPathCommand : public SkDrawCommand {

public:

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

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

- bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

+ bool render(SkCanvas* canvas) const override;

private:

SkPath fPath;

SkRegion::Op fOp;

@@ -146,7 +146,7 @@ private:

class SkClipRegionCommand : public SkDrawCommand {

public:

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

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

private:

SkRegion fRegion;

SkRegion::Op fOp;

@@ -157,7 +157,7 @@ private:

class SkClipRectCommand : public SkDrawCommand {

public:

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

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

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

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

@@ -174,8 +174,8 @@ private:

class SkClipRRectCommand : public SkDrawCommand {

public:

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

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

- bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

+ bool render(SkCanvas* canvas) const override;

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

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

@@ -192,7 +192,7 @@ private:

class SkConcatCommand : public SkDrawCommand {

public:

SkConcatCommand(const SkMatrix& matrix);

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

private:

SkMatrix fMatrix;

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

public:

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

const SkPaint* paint);

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

- bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

+ bool render(SkCanvas* canvas) const override;

private:

SkBitmap fBitmap;

SkScalar fLeft;

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

public:

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

const SkRect& dst, const SkPaint* paint);

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

- bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

+ bool render(SkCanvas* canvas) const override;

private:

SkBitmap fBitmap;

SkIRect fCenter;

@@ -236,8 +236,8 @@ public:

SkDrawBitmapRectCommand(const SkBitmap& bitmap, const SkRect* src,

const SkRect& dst, const SkPaint* paint,

SkCanvas::DrawBitmapRectFlags flags);

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

- bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

+ bool render(SkCanvas* canvas) const override;

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

@@ -273,7 +273,7 @@ private:

class SkBeginCommentGroupCommand : public SkDrawCommand {

public:

SkBeginCommentGroupCommand(const char* description);

- void execute(SkCanvas* canvas) const SK_OVERRIDE {

+ void execute(SkCanvas* canvas) const override {

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

};

private:

@@ -285,7 +285,7 @@ private:

class SkCommentCommand : public SkDrawCommand {

public:

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

- void execute(SkCanvas* canvas) const SK_OVERRIDE {

+ void execute(SkCanvas* canvas) const override {

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

};

private:

@@ -298,7 +298,7 @@ private:

class SkEndCommentGroupCommand : public SkDrawCommand {

public:

SkEndCommentGroupCommand();

- void execute(SkCanvas* canvas) const SK_OVERRIDE {

+ void execute(SkCanvas* canvas) const override {

canvas->endCommentGroup();

};

private:

@@ -308,8 +308,8 @@ private:

class SkDrawOvalCommand : public SkDrawCommand {

public:

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

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

- bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

+ bool render(SkCanvas* canvas) const override;

private:

SkRect fOval;

SkPaint fPaint;

@@ -320,8 +320,8 @@ private:

class SkDrawPaintCommand : public SkDrawCommand {

public:

SkDrawPaintCommand(const SkPaint& paint);

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

- bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

+ bool render(SkCanvas* canvas) const override;

private:

SkPaint fPaint;

@@ -331,8 +331,8 @@ private:

class SkDrawPathCommand : public SkDrawCommand {

public:

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

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

- bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

+ bool render(SkCanvas* canvas) const override;

private:

SkPath fPath;

@@ -344,8 +344,8 @@ private:

class SkDrawPictureCommand : public SkDrawCommand {

public:

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

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

- bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

+ bool render(SkCanvas* canvas) const override;

private:

SkAutoTUnref<const SkPicture> fPicture;

@@ -362,8 +362,8 @@ public:

SkDrawPointsCommand(SkCanvas::PointMode mode, size_t count, const SkPoint pts[],

const SkPaint& paint);

virtual ~SkDrawPointsCommand() { delete [] fPts; }

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

- bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

+ bool render(SkCanvas* canvas) const override;

private:

SkCanvas::PointMode fMode;

size_t fCount;

@@ -378,7 +378,7 @@ public:

SkDrawTextCommand(const void* text, size_t byteLength, SkScalar x, SkScalar y,

const SkPaint& paint);

virtual ~SkDrawTextCommand() { delete [] fText; }

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

private:

char* fText;

size_t fByteLength;

@@ -394,7 +394,7 @@ public:

SkDrawPosTextCommand(const void* text, size_t byteLength, const SkPoint pos[],

const SkPaint& paint);

virtual ~SkDrawPosTextCommand() { delete [] fPos; delete [] fText; }

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

private:

char* fText;

size_t fByteLength;

@@ -409,7 +409,7 @@ public:

SkDrawTextOnPathCommand(const void* text, size_t byteLength, const SkPath& path,

const SkMatrix* matrix, const SkPaint& paint);

virtual ~SkDrawTextOnPathCommand() { delete [] fText; }

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

private:

char* fText;

size_t fByteLength;

@@ -425,7 +425,7 @@ public:

SkDrawPosTextHCommand(const void* text, size_t byteLength, const SkScalar xpos[],

SkScalar constY, const SkPaint& paint);

virtual ~SkDrawPosTextHCommand() { delete [] fXpos; delete [] fText; }

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

private:

SkScalar* fXpos;

char* fText;

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

public:

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

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

- bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

+ bool render(SkCanvas* canvas) const override;

private:

SkAutoTUnref<const SkTextBlob> fBlob;

@@ -457,7 +457,7 @@ public:

SkDrawPatchCommand(const SkPoint cubics[12], const SkColor colors[4],

const SkPoint texCoords[4], SkXfermode* xmode,

const SkPaint& paint);

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

private:

SkPoint fCubics[12];

@@ -473,7 +473,7 @@ private:

class SkDrawRectCommand : public SkDrawCommand {

public:

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

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

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

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

@@ -487,8 +487,8 @@ private:

class SkDrawRRectCommand : public SkDrawCommand {

public:

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

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

- bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

+ bool render(SkCanvas* canvas) const override;

private:

SkRRect fRRect;

SkPaint fPaint;

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

public:

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

const SkPaint& paint);

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

- bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

+ bool render(SkCanvas* canvas) const override;

private:

SkRRect fOuter;

SkRRect fInner;

@@ -513,8 +513,8 @@ private:

class SkDrawSpriteCommand : public SkDrawCommand {

public:

SkDrawSpriteCommand(const SkBitmap& bitmap, int left, int top, const SkPaint* paint);

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

- bool render(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

+ bool render(SkCanvas* canvas) const override;

private:

SkBitmap fBitmap;

int fLeft;

@@ -533,7 +533,7 @@ public:

const uint16_t indices[], int indexCount,

const SkPaint& paint);

virtual ~SkDrawVerticesCommand();

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void execute(SkCanvas* canvas) const override;

private:

SkCanvas::VertexMode fVmode;

int fVertexCount;

@@ -551,8 +551,8 @@ private:

class SkSaveCommand : public SkDrawCommand {

public:

SkSaveCommand();

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

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

+ void execute(SkCanvas* canvas) const override;

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

private:

typedef SkDrawCommand INHERITED;

};

@@ -561,11 +561,11 @@ class SkSaveLayerCommand : public SkDrawCommand {

public:

SkSaveLayerCommand(const SkRect* bounds, const SkPaint* paint,

SkCanvas::SaveFlags flags);

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

- void vizExecute(SkCanvas* canvas) const 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; }

+ void execute(SkCanvas* canvas) const override;

+ void vizExecute(SkCanvas* canvas) const override;

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

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

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

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

@@ -583,8 +583,8 @@ private:

class SkSetMatrixCommand : public SkDrawCommand {

public:

SkSetMatrixCommand(const SkMatrix& matrix);

- void setUserMatrix(const SkMatrix&) SK_OVERRIDE;

- void execute(SkCanvas* canvas) const SK_OVERRIDE;

+ void setUserMatrix(const SkMatrix&) override;

+ void execute(SkCanvas* canvas) const override;

private:

SkMatrix fUserMatrix;

SkMatrix fMatrix;

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