Cleanup: More override fixes - another round.
BUG=skia:3075
TEST=ninja -C out/Debug
TBR=reed@google.com
Review URL: https://codereview.chromium.org/831113002
diff --git a/src/animator/SkDisplayMath.h b/src/animator/SkDisplayMath.h
index 9153795..301e0f2 100644
--- a/src/animator/SkDisplayMath.h
+++ b/src/animator/SkDisplayMath.h
@@ -18,9 +18,9 @@
DECLARE_DISPLAY_MEMBER_INFO(Math);
virtual void executeFunction(SkDisplayable* , int index,
SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
- SkScriptValue* );
- virtual const SkFunctionParamType* getFunctionsParameters();
- virtual bool getProperty(int index, SkScriptValue* value) const;
+ SkScriptValue* ) SK_OVERRIDE;
+ virtual const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE;
+ virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
private:
mutable SkRandom fRandom;
static const SkScalar gConstants[];
diff --git a/src/animator/SkDraw3D.h b/src/animator/SkDraw3D.h
index 35066bd..b652d69 100644
--- a/src/animator/SkDraw3D.h
+++ b/src/animator/SkDraw3D.h
@@ -27,7 +27,7 @@
DECLARE_MEMBER_INFO(3D_Camera);
Sk3D_Camera();
virtual ~Sk3D_Camera();
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkScalar hackWidth;
SkScalar hackHeight;
@@ -40,8 +40,8 @@
private:
virtual void executeFunction(SkDisplayable* , int index,
SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
- SkScriptValue* );
- virtual const SkFunctionParamType* getFunctionsParameters();
+ SkScriptValue* ) SK_OVERRIDE;
+ virtual const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE;
SkPatch3D fPatch;
static const SkFunctionParamType fFunctionParameters[];
friend class Sk3D_Camera;
diff --git a/src/animator/SkDrawClip.h b/src/animator/SkDrawClip.h
index 1261a4d..7b21863 100644
--- a/src/animator/SkDrawClip.h
+++ b/src/animator/SkDrawClip.h
@@ -20,7 +20,7 @@
class SkDrawClip : public SkADrawable {
DECLARE_DRAW_MEMBER_INFO(Clip);
SkDrawClip();
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkDrawRect* rect;
SkDrawPath* path;
diff --git a/src/animator/SkDrawDash.h b/src/animator/SkDrawDash.h
index fafc4b0..b4f086a 100644
--- a/src/animator/SkDrawDash.h
+++ b/src/animator/SkDrawDash.h
@@ -15,7 +15,7 @@
DECLARE_MEMBER_INFO(Dash);
SkDash();
virtual ~SkDash();
- virtual SkPathEffect* getPathEffect();
+ virtual SkPathEffect* getPathEffect() SK_OVERRIDE;
private:
SkTDScalarArray intervals;
SkScalar phase;
diff --git a/src/animator/SkDrawDiscrete.h b/src/animator/SkDrawDiscrete.h
index d0f9239..7e11506 100644
--- a/src/animator/SkDrawDiscrete.h
+++ b/src/animator/SkDrawDiscrete.h
@@ -13,7 +13,7 @@
class SkDiscrete : public SkDrawPathEffect {
DECLARE_MEMBER_INFO(Discrete);
SkDiscrete();
- virtual SkPathEffect* getPathEffect();
+ virtual SkPathEffect* getPathEffect() SK_OVERRIDE;
private:
SkScalar deviation;
SkScalar segLength;
diff --git a/src/animator/SkDrawExtraPathEffect.cpp b/src/animator/SkDrawExtraPathEffect.cpp
index 19b9df9..cc097d0 100644
--- a/src/animator/SkDrawExtraPathEffect.cpp
+++ b/src/animator/SkDrawExtraPathEffect.cpp
@@ -21,7 +21,7 @@
SkDrawShapePathEffect();
virtual ~SkDrawShapePathEffect();
virtual bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
- virtual SkPathEffect* getPathEffect();
+ virtual SkPathEffect* getPathEffect() SK_OVERRIDE;
protected:
SkADrawable* addPath;
SkADrawable* addMatrix;
@@ -35,7 +35,7 @@
DECLARE_EXTRAS_MEMBER_INFO(SkDrawShape1DPathEffect);
SkDrawShape1DPathEffect(SkDisplayTypes );
virtual ~SkDrawShape1DPathEffect();
- virtual void onEndElement(SkAnimateMaker& );
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkString phase;
SkString spacing;
@@ -47,7 +47,7 @@
DECLARE_EXTRAS_MEMBER_INFO(SkDrawShape2DPathEffect);
SkDrawShape2DPathEffect(SkDisplayTypes );
virtual ~SkDrawShape2DPathEffect();
- virtual void onEndElement(SkAnimateMaker& );
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkDrawMatrix* matrix;
friend class SkShape2DPathEffect;
@@ -59,8 +59,8 @@
SkDrawComposePathEffect(SkDisplayTypes );
virtual ~SkDrawComposePathEffect();
virtual bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
- virtual SkPathEffect* getPathEffect();
- virtual bool isPaint() const;
+ virtual SkPathEffect* getPathEffect() SK_OVERRIDE;
+ virtual bool isPaint() const SK_OVERRIDE;
private:
SkDrawPathEffect* effect1;
SkDrawPathEffect* effect2;
@@ -70,7 +70,7 @@
DECLARE_EXTRAS_MEMBER_INFO(SkDrawCornerPathEffect);
SkDrawCornerPathEffect(SkDisplayTypes );
virtual ~SkDrawCornerPathEffect();
- virtual SkPathEffect* getPathEffect();
+ virtual SkPathEffect* getPathEffect() SK_OVERRIDE;
private:
SkScalar radius;
};
@@ -92,7 +92,7 @@
SK_DECLARE_UNFLATTENABLE_OBJECT()
protected:
- virtual SkScalar begin(SkScalar contourLength) const {
+ virtual SkScalar begin(SkScalar contourLength) const SK_OVERRIDE {
SkScriptValue value;
SkAnimatorScript engine(*fMaker, NULL, SkType_Float);
engine.propertyCallBack(GetContourLength, &contourLength);
@@ -101,7 +101,7 @@
return value.fOperand.fScalar;
}
- virtual SkScalar next(SkPath* dst, SkScalar distance, SkPathMeasure&) const {
+ virtual SkScalar next(SkPath* dst, SkScalar distance, SkPathMeasure&) const SK_OVERRIDE {
fMaker->setExtraPropertyCallBack(fDraw->fType, GetDistance, &distance);
SkDrawPath* drawPath = NULL;
if (fDraw->addPath->isPath()) {
diff --git a/src/animator/SkDrawFull.h b/src/animator/SkDrawFull.h
index a2dcf49..13c204e 100644
--- a/src/animator/SkDrawFull.h
+++ b/src/animator/SkDrawFull.h
@@ -14,7 +14,7 @@
class SkFull : public SkBoundable {
DECLARE_EMPTY_MEMBER_INFO(Full);
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
private:
typedef SkBoundable INHERITED;
};
diff --git a/src/animator/SkDrawGradient.h b/src/animator/SkDrawGradient.h
index e461d44..545179b 100644
--- a/src/animator/SkDrawGradient.h
+++ b/src/animator/SkDrawGradient.h
@@ -22,7 +22,7 @@
#ifdef SK_DUMP_ENABLED
virtual void dumpRest(SkAnimateMaker*);
#endif
- virtual void onEndElement(SkAnimateMaker& );
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
protected:
SkTDScalarArray offsets;
SkString unitMapper;
@@ -53,7 +53,7 @@
#ifdef SK_DUMP_ENABLED
virtual void dump(SkAnimateMaker*) SK_OVERRIDE;
#endif
- virtual SkShader* getShader();
+ virtual SkShader* getShader() SK_OVERRIDE;
protected:
SkPoint center;
SkScalar radius;
diff --git a/src/animator/SkDrawLine.h b/src/animator/SkDrawLine.h
index b287802..5665433 100644
--- a/src/animator/SkDrawLine.h
+++ b/src/animator/SkDrawLine.h
@@ -16,7 +16,7 @@
class SkLine : public SkBoundable {
DECLARE_MEMBER_INFO(Line);
SkLine();
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkScalar x1;
SkScalar x2;
diff --git a/src/animator/SkDrawPaint.h b/src/animator/SkDrawPaint.h
index b2b5dd6..5ac5a93 100644
--- a/src/animator/SkDrawPaint.h
+++ b/src/animator/SkDrawPaint.h
@@ -27,17 +27,17 @@
SkDrawPaint();
virtual ~SkDrawPaint();
virtual bool add(SkAnimateMaker* , SkDisplayable* child);
- virtual SkDisplayable* deepCopy(SkAnimateMaker* );
- virtual bool draw(SkAnimateMaker& );
+ virtual SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* );
+ virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
virtual void executeFunction(SkDisplayable* target, int index,
SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
- SkScriptValue* );
- virtual const SkFunctionParamType* getFunctionsParameters();
- virtual bool getProperty(int index, SkScriptValue* value) const;
- virtual bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* apply);
+ SkScriptValue* ) SK_OVERRIDE;
+ virtual const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE;
+ virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
+ virtual bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* apply) SK_OVERRIDE;
protected:
static const SkFunctionParamType fFunctionParameters[];
void setupPaint(SkPaint* paint) const;
diff --git a/src/animator/SkDrawPath.h b/src/animator/SkDrawPath.h
index 9c4d305..cce8cd5 100644
--- a/src/animator/SkDrawPath.h
+++ b/src/animator/SkDrawPath.h
@@ -21,20 +21,20 @@
virtual ~SkDrawPath();
virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
bool childHasID() { return SkToBool(fChildHasID); }
- virtual bool childrenNeedDisposing() const;
- virtual void dirty();
- virtual bool draw(SkAnimateMaker& );
- virtual SkDisplayable* getParent() const;
+ virtual bool childrenNeedDisposing() const SK_OVERRIDE;
+ virtual void dirty() SK_OVERRIDE;
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ virtual SkDisplayable* getParent() const SK_OVERRIDE;
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* );
+ virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
SkPath& getPath();
- virtual bool getProperty(int index, SkScriptValue* value) const;
- virtual bool setProperty(int index, SkScriptValue& value);
- virtual void onEndElement(SkAnimateMaker& );
- virtual void setChildHasID();
- virtual bool setParent(SkDisplayable* parent);
- virtual bool isPath() const { return true; }
+ virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
+ virtual bool setProperty(int index, SkScriptValue& value) SK_OVERRIDE;
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ virtual void setChildHasID() SK_OVERRIDE;
+ virtual bool setParent(SkDisplayable* parent) SK_OVERRIDE;
+ virtual bool isPath() const SK_OVERRIDE { return true; }
public:
SkPath fPath;
protected:
@@ -52,7 +52,7 @@
class SkPolyline : public SkDrawPath {
DECLARE_MEMBER_INFO(Polyline);
virtual bool addChild(SkAnimateMaker& , SkDisplayable*) SK_OVERRIDE;
- virtual void onEndElement(SkAnimateMaker& );
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
protected:
SkTDScalarArray points;
private:
@@ -61,7 +61,7 @@
class SkPolygon : public SkPolyline {
DECLARE_MEMBER_INFO(Polygon);
- virtual void onEndElement(SkAnimateMaker& );
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
private:
typedef SkPolyline INHERITED;
};
diff --git a/src/animator/SkDrawPoint.h b/src/animator/SkDrawPoint.h
index 0ecf447..69005a1 100644
--- a/src/animator/SkDrawPoint.h
+++ b/src/animator/SkDrawPoint.h
@@ -24,7 +24,7 @@
class SkDrawPoint : public SkDisplayable {
DECLARE_MEMBER_INFO(DrawPoint);
SkDrawPoint();
- virtual void getBounds(SkRect* );
+ virtual void getBounds(SkRect* ) SK_OVERRIDE;
private:
SkPoint fPoint;
typedef SkDisplayable INHERITED;
diff --git a/src/animator/SkDrawSaveLayer.h b/src/animator/SkDrawSaveLayer.h
index 5c3e068..50a5a37 100644
--- a/src/animator/SkDrawSaveLayer.h
+++ b/src/animator/SkDrawSaveLayer.h
@@ -20,11 +20,11 @@
DECLARE_MEMBER_INFO(SaveLayer);
SkSaveLayer();
virtual ~SkSaveLayer();
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* );
+ virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
- virtual void onEndElement(SkAnimateMaker& );
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
protected:
SkDrawPaint* paint;
SkDrawRect* bounds;
diff --git a/src/animator/SkDrawShader.h b/src/animator/SkDrawShader.h
index 2c46e07..43462de 100644
--- a/src/animator/SkDrawShader.h
+++ b/src/animator/SkDrawShader.h
@@ -16,8 +16,8 @@
class SkDrawBitmapShader : public SkDrawShader {
DECLARE_DRAW_MEMBER_INFO(BitmapShader);
SkDrawBitmapShader();
- virtual bool add();
- virtual SkShader* getShader();
+ virtual bool add() SK_OVERRIDE;
+ virtual SkShader* getShader() SK_OVERRIDE;
protected:
SkBool filterBitmap;
SkBaseBitmap* image;
diff --git a/src/animator/SkDrawText.h b/src/animator/SkDrawText.h
index 3ac2479..d0fb3be 100644
--- a/src/animator/SkDrawText.h
+++ b/src/animator/SkDrawText.h
@@ -17,11 +17,11 @@
DECLARE_MEMBER_INFO(Text);
SkText();
virtual ~SkText();
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* );
+ virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
- virtual bool getProperty(int index, SkScriptValue* value) const ;
+ virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
const char* getText() { return text.c_str(); }
size_t getSize() { return text.size(); }
protected:
diff --git a/src/animator/SkDrawTextBox.h b/src/animator/SkDrawTextBox.h
index 6155bef..4fa0872 100644
--- a/src/animator/SkDrawTextBox.h
+++ b/src/animator/SkDrawTextBox.h
@@ -18,12 +18,12 @@
SkDrawTextBox();
// overrides
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* );
+ virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
- virtual bool getProperty(int index, SkScriptValue* value) const;
- virtual bool setProperty(int index, SkScriptValue& );
+ virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
+ virtual bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE;
private:
SkString fText;
diff --git a/src/animator/SkDrawTo.h b/src/animator/SkDrawTo.h
index b6365af..93f9b49 100644
--- a/src/animator/SkDrawTo.h
+++ b/src/animator/SkDrawTo.h
@@ -19,9 +19,9 @@
DECLARE_MEMBER_INFO(DrawTo);
SkDrawTo();
// virtual ~SkDrawTo();
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* );
+ virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
protected:
SkBool drawOnce;
diff --git a/src/animator/SkDrawTransparentShader.h b/src/animator/SkDrawTransparentShader.h
index e0f61ed..58dc123 100644
--- a/src/animator/SkDrawTransparentShader.h
+++ b/src/animator/SkDrawTransparentShader.h
@@ -12,7 +12,7 @@
class SkDrawTransparentShader : public SkDrawShader {
DECLARE_EMPTY_MEMBER_INFO(TransparentShader);
- virtual SkShader* getShader();
+ virtual SkShader* getShader() SK_OVERRIDE;
};
#endif // SkDrawTransparentShader_DEFINED
diff --git a/src/animator/SkHitClear.h b/src/animator/SkHitClear.h
index 9c40209..02b0140 100644
--- a/src/animator/SkHitClear.h
+++ b/src/animator/SkHitClear.h
@@ -16,8 +16,8 @@
class SkHitClear : public SkDisplayable {
DECLARE_MEMBER_INFO(HitClear);
- virtual bool enable(SkAnimateMaker& );
- virtual bool hasEnable() const;
+ virtual bool enable(SkAnimateMaker& ) SK_OVERRIDE;
+ virtual bool hasEnable() const SK_OVERRIDE;
private:
SkTDDisplayableArray targets;
};
diff --git a/src/animator/SkHitTest.h b/src/animator/SkHitTest.h
index 410a384..eb9ea4e 100644
--- a/src/animator/SkHitTest.h
+++ b/src/animator/SkHitTest.h
@@ -16,10 +16,10 @@
class SkHitTest : public SkADrawable {
DECLARE_MEMBER_INFO(HitTest);
SkHitTest();
- virtual bool draw(SkAnimateMaker& );
- virtual bool enable(SkAnimateMaker& );
- virtual bool hasEnable() const;
- virtual const SkMemberInfo* preferredChild(SkDisplayTypes type);
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ virtual bool enable(SkAnimateMaker& ) SK_OVERRIDE;
+ virtual bool hasEnable() const SK_OVERRIDE;
+ virtual const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE;
private:
SkTDDisplayableArray bullets;
SkTDIntArray hits;
diff --git a/src/animator/SkMatrixParts.h b/src/animator/SkMatrixParts.h
index 51c9559..b0d6fcc 100644
--- a/src/animator/SkMatrixParts.h
+++ b/src/animator/SkMatrixParts.h
@@ -39,7 +39,7 @@
DECLARE_MEMBER_INFO(Rotate);
SkRotate();
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
SkScalar degrees;
SkPoint center;
};
@@ -48,7 +48,7 @@
DECLARE_MEMBER_INFO(Scale);
SkScale();
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
SkScalar x;
SkScalar y;
SkPoint center;
@@ -58,7 +58,7 @@
DECLARE_MEMBER_INFO(Skew);
SkSkew();
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
SkScalar x;
SkScalar y;
SkPoint center;
@@ -68,7 +68,7 @@
DECLARE_MEMBER_INFO(Translate);
SkTranslate();
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
SkScalar x;
SkScalar y;
};
@@ -78,7 +78,7 @@
SkFromPath();
virtual ~SkFromPath();
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
int32_t mode;
SkScalar offset;
SkDrawPath* path;
@@ -90,11 +90,11 @@
SkRectToRect();
virtual ~SkRectToRect();
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* );
+ virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
- virtual const SkMemberInfo* preferredChild(SkDisplayTypes type);
+ virtual const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE;
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
SkDrawRect* source;
SkDrawRect* destination;
};
@@ -104,12 +104,12 @@
SkPolyToPoly();
virtual ~SkPolyToPoly();
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* );
+ virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
- virtual void onEndElement(SkAnimateMaker& );
- virtual const SkMemberInfo* preferredChild(SkDisplayTypes type);
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ virtual const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE;
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
SkPolygon* source;
SkPolygon* destination;
};
diff --git a/src/animator/SkMemberInfo.h b/src/animator/SkMemberInfo.h
index f005bab..cf4b0a8 100644
--- a/src/animator/SkMemberInfo.h
+++ b/src/animator/SkMemberInfo.h
@@ -183,16 +183,16 @@
#define DECLARE_EMPTY_MEMBER_INFO(_type) \
public: \
- virtual SkDisplayTypes getType() const { return SkType_##_type; }
+ virtual SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; }
#define DECLARE_EXTRAS_MEMBER_INFO(_type) \
public: \
static const SkMemberInfo fInfo[]; \
static const int fInfoCount; \
- virtual const SkMemberInfo* getMember(int index); \
- virtual const SkMemberInfo* getMember(const char name[]); \
+ virtual const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
+ virtual const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
SkDisplayTypes fType; \
- virtual SkDisplayTypes getType() const { return fType; } \
+ virtual SkDisplayTypes getType() const SK_OVERRIDE { return fType; } \
typedef _type BASE_CLASS
#define DECLARE_NO_VIRTUALS_MEMBER_INFO(_type) \
diff --git a/src/animator/SkPaintPart.h b/src/animator/SkPaintPart.h
index 6f33cb4..1f5d4eb 100644
--- a/src/animator/SkPaintPart.h
+++ b/src/animator/SkPaintPart.h
@@ -35,14 +35,14 @@
DECLARE_EMPTY_MEMBER_INFO(MaskFilter);
virtual SkMaskFilter* getMaskFilter();
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
};
class SkDrawPathEffect : public SkPaintPart {
DECLARE_EMPTY_MEMBER_INFO(PathEffect);
virtual SkPathEffect* getPathEffect();
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
};
class SkDrawShader : public SkPaintPart {
@@ -50,7 +50,7 @@
SkDrawShader();
virtual SkShader* getShader();
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
SkMatrix* getMatrix(); // returns NULL if matrix is NULL
SkDrawMatrix* matrix;
int /*SkShader::TileMode*/ tileMode;
@@ -60,12 +60,12 @@
DECLARE_DRAW_MEMBER_INFO(Typeface);
SkDrawTypeface();
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker *);
+ virtual void dump(SkAnimateMaker *) SK_OVERRIDE;
#endif
SkTypeface* getTypeface() {
return SkTypeface::CreateFromName(fontName.c_str(), style); }
protected:
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
SkString fontName;
SkTypeface::Style style;
};
diff --git a/src/animator/SkPathParts.h b/src/animator/SkPathParts.h
index f82aa74..67a8853 100644
--- a/src/animator/SkPathParts.h
+++ b/src/animator/SkPathParts.h
@@ -34,7 +34,7 @@
class SkMoveTo : public SkPathPart {
DECLARE_MEMBER_INFO(MoveTo);
SkMoveTo();
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
protected:
SkScalar x;
SkScalar y;
@@ -42,7 +42,7 @@
class SkRMoveTo : public SkMoveTo {
DECLARE_MEMBER_INFO(RMoveTo);
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
private:
typedef SkMoveTo INHERITED;
};
@@ -50,7 +50,7 @@
class SkLineTo : public SkPathPart {
DECLARE_MEMBER_INFO(LineTo);
SkLineTo();
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
protected:
SkScalar x;
SkScalar y;
@@ -58,7 +58,7 @@
class SkRLineTo : public SkLineTo {
DECLARE_MEMBER_INFO(RLineTo);
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
private:
typedef SkLineTo INHERITED;
};
@@ -66,7 +66,7 @@
class SkQuadTo : public SkPathPart {
DECLARE_MEMBER_INFO(QuadTo);
SkQuadTo();
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
protected:
SkScalar x1;
SkScalar y1;
@@ -76,7 +76,7 @@
class SkRQuadTo : public SkQuadTo {
DECLARE_MEMBER_INFO(RQuadTo);
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
private:
typedef SkQuadTo INHERITED;
};
@@ -84,7 +84,7 @@
class SkCubicTo : public SkPathPart {
DECLARE_MEMBER_INFO(CubicTo);
SkCubicTo();
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
protected:
SkScalar x1;
SkScalar y1;
@@ -96,14 +96,14 @@
class SkRCubicTo : public SkCubicTo {
DECLARE_MEMBER_INFO(RCubicTo);
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
private:
typedef SkCubicTo INHERITED;
};
class SkClose : public SkPathPart {
DECLARE_EMPTY_MEMBER_INFO(Close);
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
};
class SkAddGeom : public SkPathPart {
@@ -116,7 +116,7 @@
class SkAddRect : public SkAddGeom {
DECLARE_MEMBER_INFO(AddRect);
SkAddRect();
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
protected:
SkRect fRect;
private:
@@ -125,7 +125,7 @@
class SkAddOval : public SkAddRect {
DECLARE_MEMBER_INFO(AddOval);
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
private:
typedef SkAddRect INHERITED;
};
@@ -133,7 +133,7 @@
class SkAddCircle : public SkAddGeom {
DECLARE_MEMBER_INFO(AddCircle);
SkAddCircle();
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
private:
SkScalar radius;
SkScalar x;
@@ -144,7 +144,7 @@
class SkAddRoundRect : public SkAddRect {
DECLARE_MEMBER_INFO(AddRoundRect);
SkAddRoundRect();
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
private:
SkScalar rx;
SkScalar ry;
@@ -154,7 +154,7 @@
class SkAddPath : public SkPathPart {
DECLARE_MEMBER_INFO(AddPath);
SkAddPath();
- virtual bool add();
+ virtual bool add() SK_OVERRIDE;
private:
typedef SkPathPart INHERITED;
SkDrawMatrix* matrix;
diff --git a/src/animator/SkSnapshot.h b/src/animator/SkSnapshot.h
index 110c36d..43f16692 100644
--- a/src/animator/SkSnapshot.h
+++ b/src/animator/SkSnapshot.h
@@ -18,7 +18,7 @@
class SkSnapshot: public SkADrawable {
DECLARE_MEMBER_INFO(Snapshot);
SkSnapshot();
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkString filename;
SkScalar quality;
diff --git a/src/animator/SkTextOnPath.h b/src/animator/SkTextOnPath.h
index b0ce234..9c55284 100644
--- a/src/animator/SkTextOnPath.h
+++ b/src/animator/SkTextOnPath.h
@@ -19,7 +19,7 @@
class SkTextOnPath : public SkBoundable {
DECLARE_MEMBER_INFO(TextOnPath);
SkTextOnPath();
- virtual bool draw(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkScalar offset;
SkDrawPath* path;
diff --git a/src/animator/SkTextToPath.h b/src/animator/SkTextToPath.h
index 9b72e5d..01c6601 100644
--- a/src/animator/SkTextToPath.h
+++ b/src/animator/SkTextToPath.h
@@ -20,8 +20,8 @@
class SkTextToPath : public SkADrawable {
DECLARE_MEMBER_INFO(TextToPath);
SkTextToPath();
- virtual bool draw(SkAnimateMaker& );
- virtual void onEndElement(SkAnimateMaker& );
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkDrawPaint* paint;
SkDrawPath* path;