Index: src/animator/SkDisplayApply.h |
diff --git a/src/animator/SkDisplayApply.h b/src/animator/SkDisplayApply.h |
index 0cfab51031000830209ec6467f4bcd26dabfc408..2d09fbec1eedfa0d486cc55c1e9f28ca6e21ec78 100644 |
--- a/src/animator/SkDisplayApply.h |
+++ b/src/animator/SkDisplayApply.h |
@@ -38,41 +38,41 @@ public: |
void appendActive(SkActive* ); |
void applyValues(int animatorIndex, SkOperand* values, int count, |
SkDisplayTypes , SkMSec time); |
- virtual bool contains(SkDisplayable*); |
+ virtual bool contains(SkDisplayable*) SK_OVERRIDE; |
// void createActive(SkAnimateMaker& ); |
- virtual SkDisplayable* deepCopy(SkAnimateMaker* ); |
+ virtual SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; |
void disable(); |
- 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 enable(SkAnimateMaker& ); |
+ virtual bool enable(SkAnimateMaker& ) SK_OVERRIDE; |
void enableCreate(SkAnimateMaker& ); |
void enableDynamic(SkAnimateMaker& ); |
void endSave(int index); |
Mode getMode() { return mode; } |
- virtual bool getProperty(int index, SkScriptValue* value) const; |
+ virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; |
SkADrawable* getScope() { return scope; } |
void getStep(SkScriptValue* ); |
SkADrawable* getTarget(SkAnimateBase* ); |
bool hasDelayedAnimator() const; |
- virtual bool hasEnable() const; |
+ virtual bool hasEnable() const SK_OVERRIDE; |
bool inactivate(SkAnimateMaker& maker); |
- virtual void initialize(); |
+ virtual void initialize() SK_OVERRIDE; |
bool interpolate(SkAnimateMaker& , SkMSec time); |
- virtual void onEndElement(SkAnimateMaker& ); |
- virtual const SkMemberInfo* preferredChild(SkDisplayTypes type); |
+ virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; |
+ virtual const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE; |
void refresh(SkAnimateMaker& ); |
void reset(); |
- virtual bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ); |
+ virtual bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ) SK_OVERRIDE; |
bool resolveField(SkAnimateMaker& , SkDisplayable* parent, SkString* str); |
void save(int index); |
void setEmbedded() { fEmbedded = true; } |
- virtual bool setProperty(int index, SkScriptValue& ); |
- virtual void setSteps(int _steps); |
+ virtual bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; |
+ virtual void setSteps(int _steps) SK_OVERRIDE; |
// virtual void setTime(SkMSec time); |
#ifdef SK_DEBUG |
- virtual void validate(); |
+ virtual void validate() SK_OVERRIDE; |
#endif |
private: |
SkMSec begin; |