| Index: src/animator/SkDrawRectangle.h
|
| diff --git a/src/animator/SkDrawRectangle.h b/src/animator/SkDrawRectangle.h
|
| index 44ed7c477dc7875d5c2e511b9c3d9699e1744181..036d52ed6286c4c847ae74dcc69078d957e692a7 100644
|
| --- a/src/animator/SkDrawRectangle.h
|
| +++ b/src/animator/SkDrawRectangle.h
|
| @@ -19,15 +19,15 @@ class SkRectToRect;
|
| class SkDrawRect : public SkBoundable {
|
| DECLARE_DRAW_MEMBER_INFO(Rect);
|
| SkDrawRect();
|
| - void dirty() SK_OVERRIDE;
|
| - bool draw(SkAnimateMaker& ) SK_OVERRIDE;
|
| + void dirty() override;
|
| + bool draw(SkAnimateMaker& ) override;
|
| #ifdef SK_DUMP_ENABLED
|
| - void dump(SkAnimateMaker* ) SK_OVERRIDE;
|
| + void dump(SkAnimateMaker* ) override;
|
| #endif
|
| - SkDisplayable* getParent() const SK_OVERRIDE;
|
| - bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
|
| - bool setParent(SkDisplayable* parent) SK_OVERRIDE;
|
| - bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE;
|
| + SkDisplayable* getParent() const override;
|
| + bool getProperty(int index, SkScriptValue* value) const override;
|
| + bool setParent(SkDisplayable* parent) override;
|
| + bool setProperty(int index, SkScriptValue& ) override;
|
| protected:
|
| SkRect fRect;
|
| SkDisplayable* fParent;
|
| @@ -41,9 +41,9 @@ private:
|
| class SkRoundRect : public SkDrawRect {
|
| DECLARE_MEMBER_INFO(RoundRect);
|
| SkRoundRect();
|
| - bool draw(SkAnimateMaker& ) SK_OVERRIDE;
|
| + bool draw(SkAnimateMaker& ) override;
|
| #ifdef SK_DUMP_ENABLED
|
| - void dump(SkAnimateMaker* ) SK_OVERRIDE;
|
| + void dump(SkAnimateMaker* ) override;
|
| #endif
|
| protected:
|
| SkScalar rx;
|
|
|