diff options
| author |  tfarina <tfarina@chromium.org> | 2014-12-20 06:53:43 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-20 06:53:43 -0800 |
| commit | 752e7eb157f8a18c26b88b7b85eecdbd5549d52e (patch) | |
| tree | 796bd41d42d1ebc0dfb65c01173d974b60aebaf8 /src/animator/SkDrawGroup.h | |
| parent | bb1af8dd75c1db1a4bec34e584d552ebbcb1fedc (diff) | |
Cleanup: Another round of override fixes.
BUG=skia:3075
TEST=ninja -C out/Debug
TBR=mtklein@google.com
Review URL: https://codereview.chromium.org/815883002
Diffstat (limited to 'src/animator/SkDrawGroup.h')
| -rw-r--r-- | src/animator/SkDrawGroup.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/animator/SkDrawGroup.h b/src/animator/SkDrawGroup.h index abc3eb7907..a6bebf0e64 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; }; |