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

Unified Diff: src/animator/SkDrawGroup.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/SkDrawGradient.h ('k') | src/animator/SkDrawLine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/animator/SkDrawGroup.h
diff --git a/src/animator/SkDrawGroup.h b/src/animator/SkDrawGroup.h
index 5d33dfe596dbf2f7de7ad24c361aa8779b8f4d20..83e6771d2d7931634d25d9bc8ace8ecc65e19541 100644
--- a/src/animator/SkDrawGroup.h
+++ b/src/animator/SkDrawGroup.h
@@ -19,35 +19,35 @@ public:
DECLARE_MEMBER_INFO(Group);
SkGroup();
virtual ~SkGroup();
- bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
- bool contains(SkDisplayable* ) SK_OVERRIDE;
+ bool addChild(SkAnimateMaker& , SkDisplayable* child) override;
+ bool contains(SkDisplayable* ) override;
SkGroup* copy();
SkBool copySet(int index);
- SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
- bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) SK_OVERRIDE;
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ SkDisplayable* deepCopy(SkAnimateMaker* ) override;
+ bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) override;
+ bool draw(SkAnimateMaker& ) override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
virtual void dumpDrawables(SkAnimateMaker* );
- void dumpEvents() SK_OVERRIDE;
+ void dumpEvents() override;
#endif
int findGroup(SkADrawable* drawable, SkTDDrawableArray** list,
SkGroup** parent, SkGroup** found, SkTDDrawableArray** grandList);
- bool enable(SkAnimateMaker& ) SK_OVERRIDE;
+ bool enable(SkAnimateMaker& ) override;
SkTDDrawableArray* getChildren() { return &fChildren; }
SkGroup* getOriginal() { return fOriginal; }
- bool hasEnable() const SK_OVERRIDE;
- void initialize() SK_OVERRIDE;
+ bool hasEnable() const override;
+ void initialize() 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* ) SK_OVERRIDE;
- void setSteps(int steps) SK_OVERRIDE;
+ bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ) override;
+ void setSteps(int steps) override;
#ifdef SK_DEBUG
- void validate() SK_OVERRIDE;
+ void validate() override;
#endif
protected:
bool ifCondition(SkAnimateMaker& maker, SkADrawable* drawable,
@@ -64,7 +64,7 @@ private:
class SkSave: public SkGroup {
DECLARE_MEMBER_INFO(Save);
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
private:
typedef SkGroup INHERITED;
};
« no previous file with comments | « src/animator/SkDrawGradient.h ('k') | src/animator/SkDrawLine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698