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/SkDrawGradient.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/SkDrawGradient.h')
| -rw-r--r-- | src/animator/SkDrawGradient.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/animator/SkDrawGradient.h b/src/animator/SkDrawGradient.h index d6dd14491c..87df37624c 100644 --- a/src/animator/SkDrawGradient.h +++ b/src/animator/SkDrawGradient.h @@ -18,11 +18,11 @@ class SkDrawGradient : public SkDrawShader { DECLARE_PRIVATE_MEMBER_INFO(DrawGradient); SkDrawGradient(); virtual ~SkDrawGradient(); - bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; + bool addChild(SkAnimateMaker& , SkDisplayable* child) override; #ifdef SK_DUMP_ENABLED virtual void dumpRest(SkAnimateMaker*); #endif - void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) override; protected: SkTDScalarArray offsets; SkString unitMapper; @@ -36,11 +36,11 @@ private: class SkDrawLinearGradient : public SkDrawGradient { DECLARE_MEMBER_INFO(DrawLinearGradient); SkDrawLinearGradient(); - void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; + void onEndElement(SkAnimateMaker& ) override; #ifdef SK_DUMP_ENABLED - void dump(SkAnimateMaker*) SK_OVERRIDE; + void dump(SkAnimateMaker*) override; #endif - SkShader* getShader() SK_OVERRIDE; + SkShader* getShader() override; protected: SkTDScalarArray points; private: @@ -51,9 +51,9 @@ class SkDrawRadialGradient : public SkDrawGradient { DECLARE_MEMBER_INFO(DrawRadialGradient); SkDrawRadialGradient(); #ifdef SK_DUMP_ENABLED - void dump(SkAnimateMaker*) SK_OVERRIDE; + void dump(SkAnimateMaker*) override; #endif - SkShader* getShader() SK_OVERRIDE; + SkShader* getShader() override; protected: SkPoint center; SkScalar radius; |