C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002
Review URL: https://codereview.chromium.org/1037793002
diff --git a/src/utils/debugger/SkDrawCommand.h b/src/utils/debugger/SkDrawCommand.h
index bcc97ca..9e25f4d 100644
--- a/src/utils/debugger/SkDrawCommand.h
+++ b/src/utils/debugger/SkDrawCommand.h
@@ -113,8 +113,8 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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;