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

Unified Diff: src/animator/SkDrawRectangle.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/SkDrawPoint.h ('k') | src/animator/SkDrawSaveLayer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « src/animator/SkDrawPoint.h ('k') | src/animator/SkDrawSaveLayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698