Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified Diff: src/animator/SkDisplayApply.h

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/animator/SkDisplayAdd.h ('k') | src/animator/SkDisplayBounds.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/animator/SkDisplayApply.h
diff --git a/src/animator/SkDisplayApply.h b/src/animator/SkDisplayApply.h
index 9e7e12f078476db02602305761e6a30b26080412..12cf6cee7a96438328f80e07d58e65bad0f26aa2 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);
- bool contains(SkDisplayable*) SK_OVERRIDE;
+ bool contains(SkDisplayable*) override;
// void createActive(SkAnimateMaker& );
- SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
+ SkDisplayable* deepCopy(SkAnimateMaker* ) override;
void disable();
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
- bool enable(SkAnimateMaker& ) SK_OVERRIDE;
+ bool enable(SkAnimateMaker& ) override;
void enableCreate(SkAnimateMaker& );
void enableDynamic(SkAnimateMaker& );
void endSave(int index);
Mode getMode() { return mode; }
- bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
+ bool getProperty(int index, SkScriptValue* value) const override;
SkADrawable* getScope() { return scope; }
void getStep(SkScriptValue* );
SkADrawable* getTarget(SkAnimateBase* );
bool hasDelayedAnimator() const;
- bool hasEnable() const SK_OVERRIDE;
+ bool hasEnable() const override;
bool inactivate(SkAnimateMaker& maker);
- void initialize() SK_OVERRIDE;
+ void initialize() override;
bool interpolate(SkAnimateMaker& , SkMSec time);
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
- const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker& ) override;
+ const SkMemberInfo* preferredChild(SkDisplayTypes type) override;
void refresh(SkAnimateMaker& );
void reset();
- bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ) SK_OVERRIDE;
+ bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ) override;
bool resolveField(SkAnimateMaker& , SkDisplayable* parent, SkString* str);
void save(int index);
void setEmbedded() { fEmbedded = true; }
- bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE;
- void setSteps(int _steps) SK_OVERRIDE;
+ bool setProperty(int index, SkScriptValue& ) override;
+ void setSteps(int _steps) override;
// virtual void setTime(SkMSec time);
#ifdef SK_DEBUG
- void validate() SK_OVERRIDE;
+ void validate() override;
#endif
private:
SkMSec begin;
« no previous file with comments | « src/animator/SkDisplayAdd.h ('k') | src/animator/SkDisplayBounds.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698