Index: src/animator/SkDrawGroup.h |
diff --git a/src/animator/SkDrawGroup.h b/src/animator/SkDrawGroup.h |
index abc3eb790755252c36a6ea17309d4a1045fbb787..a6bebf0e648a03b9100699732b426bb7ffeb6a7c 100644 |
--- a/src/animator/SkDrawGroup.h |
+++ b/src/animator/SkDrawGroup.h |
@@ -20,34 +20,34 @@ public: |
SkGroup(); |
virtual ~SkGroup(); |
virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; |
- virtual bool contains(SkDisplayable* ); |
+ virtual bool contains(SkDisplayable* ) SK_OVERRIDE; |
SkGroup* copy(); |
SkBool copySet(int index); |
- virtual SkDisplayable* deepCopy(SkAnimateMaker* ); |
- virtual bool doEvent(SkDisplayEvent::Kind , SkEventState* state ); |
- virtual bool draw(SkAnimateMaker& ); |
+ virtual SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; |
+ virtual bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) SK_OVERRIDE; |
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; |
#ifdef SK_DUMP_ENABLED |
- virtual void dump(SkAnimateMaker* ); |
+ virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; |
virtual void dumpDrawables(SkAnimateMaker* ); |
- virtual void dumpEvents(); |
+ virtual void dumpEvents() SK_OVERRIDE; |
#endif |
int findGroup(SkADrawable* drawable, SkTDDrawableArray** list, |
SkGroup** parent, SkGroup** found, SkTDDrawableArray** grandList); |
- virtual bool enable(SkAnimateMaker& ); |
+ virtual bool enable(SkAnimateMaker& ) SK_OVERRIDE; |
SkTDDrawableArray* getChildren() { return &fChildren; } |
SkGroup* getOriginal() { return fOriginal; } |
- virtual bool hasEnable() const; |
- virtual void initialize(); |
+ virtual bool hasEnable() const SK_OVERRIDE; |
+ virtual void initialize() SK_OVERRIDE; |
SkBool isACopy() { return fOriginal != NULL; } |
void markCopyClear(int index); |
void markCopySet(int index); |
void markCopySize(int index); |
bool markedForDelete(int index) const { return (fCopies[index >> 5] & 1 << (index & 0x1f)) == 0; } |
void reset(); |
- bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ); |
- virtual void setSteps(int steps); |
+ bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ) SK_OVERRIDE; |
+ virtual void setSteps(int steps) SK_OVERRIDE; |
#ifdef SK_DEBUG |
- virtual void validate(); |
+ virtual void validate() SK_OVERRIDE; |
#endif |
protected: |
bool ifCondition(SkAnimateMaker& maker, SkADrawable* drawable, |
@@ -64,7 +64,7 @@ private: |
class SkSave: public SkGroup { |
DECLARE_MEMBER_INFO(Save); |
- virtual bool draw(SkAnimateMaker& ); |
+ virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; |
private: |
typedef SkGroup INHERITED; |
}; |