diff options
author | mtklein <mtklein@chromium.org> | 2015-03-25 18:17:31 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-25 18:17:32 -0700 |
commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /src/animator/SkDisplayMovie.h | |
parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (diff) |
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002
Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'src/animator/SkDisplayMovie.h')
-rw-r--r-- | src/animator/SkDisplayMovie.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/animator/SkDisplayMovie.h b/src/animator/SkDisplayMovie.h index c1f184d8fe..76e2d9ccc7 100644 --- a/src/animator/SkDisplayMovie.h +++ b/src/animator/SkDisplayMovie.h @@ -21,21 +21,21 @@ class SkDisplayMovie : public SkADrawable { SkDisplayMovie(); virtual ~SkDisplayMovie(); void buildMovie(); - SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; - void dirty() SK_OVERRIDE; + SkDisplayable* deepCopy(SkAnimateMaker* ) override; + void dirty() override; bool doEvent(const SkEvent& evt) { return fLoaded && fMovie.doEvent(evt); } - bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) SK_OVERRIDE; - bool draw(SkAnimateMaker& ) SK_OVERRIDE; + bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) override; + bool draw(SkAnimateMaker& ) override; #ifdef SK_DUMP_ENABLED - void dump(SkAnimateMaker* ) SK_OVERRIDE; - void dumpEvents() SK_OVERRIDE; + void dump(SkAnimateMaker* ) override; + void dumpEvents() override; #endif - bool enable(SkAnimateMaker& ) SK_OVERRIDE; + bool enable(SkAnimateMaker& ) override; const SkAnimator* getAnimator() const { return &fMovie; } - bool hasEnable() const SK_OVERRIDE; - void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + bool hasEnable() const override; + void onEndElement(SkAnimateMaker& ) override; protected: SkString src; SkAnimator fMovie; |