| Index: src/animator/SkMatrixParts.h
|
| diff --git a/src/animator/SkMatrixParts.h b/src/animator/SkMatrixParts.h
|
| index 51c95599b7634dbf0bd998c0ea3d00eaee27b710..b0d6fccb8d3e56875ce5306707595e71744cf01c 100644
|
| --- a/src/animator/SkMatrixParts.h
|
| +++ b/src/animator/SkMatrixParts.h
|
| @@ -39,7 +39,7 @@ class SkRotate : public SkMatrixPart {
|
| DECLARE_MEMBER_INFO(Rotate);
|
| SkRotate();
|
| protected:
|
| - virtual bool add();
|
| + virtual bool add() SK_OVERRIDE;
|
| SkScalar degrees;
|
| SkPoint center;
|
| };
|
| @@ -48,7 +48,7 @@ class SkScale : public SkMatrixPart {
|
| DECLARE_MEMBER_INFO(Scale);
|
| SkScale();
|
| protected:
|
| - virtual bool add();
|
| + virtual bool add() SK_OVERRIDE;
|
| SkScalar x;
|
| SkScalar y;
|
| SkPoint center;
|
| @@ -58,7 +58,7 @@ class SkSkew : public SkMatrixPart {
|
| DECLARE_MEMBER_INFO(Skew);
|
| SkSkew();
|
| protected:
|
| - virtual bool add();
|
| + virtual bool add() SK_OVERRIDE;
|
| SkScalar x;
|
| SkScalar y;
|
| SkPoint center;
|
| @@ -68,7 +68,7 @@ class SkTranslate : public SkMatrixPart {
|
| DECLARE_MEMBER_INFO(Translate);
|
| SkTranslate();
|
| protected:
|
| - virtual bool add();
|
| + virtual bool add() SK_OVERRIDE;
|
| SkScalar x;
|
| SkScalar y;
|
| };
|
| @@ -78,7 +78,7 @@ class SkFromPath : public SkMatrixPart {
|
| SkFromPath();
|
| virtual ~SkFromPath();
|
| protected:
|
| - virtual bool add();
|
| + virtual bool add() SK_OVERRIDE;
|
| int32_t mode;
|
| SkScalar offset;
|
| SkDrawPath* path;
|
| @@ -90,11 +90,11 @@ class SkRectToRect : public SkMatrixPart {
|
| 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 @@ class SkPolyToPoly : public SkMatrixPart {
|
| 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;
|
| };
|
|
|