Index: src/animator/SkDrawBitmap.h |
diff --git a/src/animator/SkDrawBitmap.h b/src/animator/SkDrawBitmap.h |
index a1b74b6502d8fad4269045969153945754131866..270545d0ee98a2674bf33ac1879b2d7482fc251c 100644 |
--- a/src/animator/SkDrawBitmap.h |
+++ b/src/animator/SkDrawBitmap.h |
@@ -20,7 +20,7 @@ class SkBaseBitmap : public SkBoundable { |
DECLARE_MEMBER_INFO(BaseBitmap); |
SkBaseBitmap(); |
virtual ~SkBaseBitmap(); |
- bool draw(SkAnimateMaker& ) SK_OVERRIDE; |
+ bool draw(SkAnimateMaker& ) override; |
protected: |
SkBitmap fBitmap; |
SkScalar x; |
@@ -36,10 +36,10 @@ class SkDrawBitmap : public SkBaseBitmap { |
SkDrawBitmap(); |
virtual ~SkDrawBitmap(); |
#ifdef SK_DUMP_ENABLED |
- void dump(SkAnimateMaker* ) SK_OVERRIDE; |
+ void dump(SkAnimateMaker* ) override; |
#endif |
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; |
- bool setProperty(int index, SkScriptValue& value) SK_OVERRIDE; |
+ void onEndElement(SkAnimateMaker& ) override; |
+ bool setProperty(int index, SkScriptValue& value) override; |
protected: |
int /*SkBitmap::Config*/ format; |
int32_t height; |
@@ -54,11 +54,11 @@ class SkImageBaseBitmap : public SkBaseBitmap { |
DECLARE_MEMBER_INFO(ImageBaseBitmap); |
SkImageBaseBitmap(); |
virtual ~SkImageBaseBitmap(); |
- SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; |
- void dirty() SK_OVERRIDE; |
- bool draw(SkAnimateMaker& ) SK_OVERRIDE; |
- bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; |
- void onEndElement(SkAnimateMaker& maker) SK_OVERRIDE; |
+ SkDisplayable* deepCopy(SkAnimateMaker* ) override; |
+ void dirty() override; |
+ bool draw(SkAnimateMaker& ) override; |
+ bool getProperty(int index, SkScriptValue* value) const override; |
+ void onEndElement(SkAnimateMaker& maker) override; |
private: |
void resolve() const { (const_cast<SkImageBaseBitmap*>(this))->resolve(); } |
void resolve(); |