commit aa458fb20a4350da581f8ceec69ea16eec295ced
author tfarina <tfarina@chromium.org> Mon Jan 05 17:18:51 2015 -0800
committer Commit bot <commit-bot@chromium.org> Mon Jan 05 17:18:51 2015 -0800
tree db81877fcdf6d4bf361ddfce5f81072ea5cc996b
parent 4dd6b72b31d091968c6cc92558684d87cc7b2008

Cleanup: More override fixes - another round.

BUG=skia:3075
TEST=ninja -C out/Debug
TBR=reed@google.com

Review URL: https://codereview.chromium.org/831113002

src/animator/SkDrawPath.h

diff --git a/src/animator/SkDrawPath.h b/src/animator/SkDrawPath.h
index 9c4d305..cce8cd5 100644
--- a/src/animator/SkDrawPath.h
+++ b/src/animator/SkDrawPath.h
@@ -21,20 +21,20 @@
     virtual ~SkDrawPath();
     virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
     bool childHasID() { return SkToBool(fChildHasID); }
-    virtual bool childrenNeedDisposing() const;
-    virtual void dirty();
-    virtual bool draw(SkAnimateMaker& );
-    virtual SkDisplayable* getParent() const;
+    virtual bool childrenNeedDisposing() const SK_OVERRIDE;
+    virtual void dirty() SK_OVERRIDE;
+    virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+    virtual SkDisplayable* getParent() const SK_OVERRIDE;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
 #endif
     SkPath& getPath();
-    virtual bool getProperty(int index, SkScriptValue* value) const;
-    virtual bool setProperty(int index, SkScriptValue& value);
-    virtual void onEndElement(SkAnimateMaker& );
-    virtual void setChildHasID();
-    virtual bool setParent(SkDisplayable* parent);
-    virtual bool isPath() const { return true; }
+    virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
+    virtual bool setProperty(int index, SkScriptValue& value) SK_OVERRIDE;
+    virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+    virtual void setChildHasID() SK_OVERRIDE;
+    virtual bool setParent(SkDisplayable* parent) SK_OVERRIDE;
+    virtual bool isPath() const SK_OVERRIDE { return true; }
 public:
     SkPath fPath;
 protected:
@@ -52,7 +52,7 @@
 class SkPolyline : public SkDrawPath {
     DECLARE_MEMBER_INFO(Polyline);
     virtual bool addChild(SkAnimateMaker& , SkDisplayable*) SK_OVERRIDE;
-    virtual void onEndElement(SkAnimateMaker& );
+    virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
 protected:
     SkTDScalarArray points;
 private:
@@ -61,7 +61,7 @@
 
 class SkPolygon : public SkPolyline {
     DECLARE_MEMBER_INFO(Polygon);
-    virtual void onEndElement(SkAnimateMaker& );
+    virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
 private:
     typedef SkPolyline INHERITED;
 };