| Index: src/animator/SkDrawPath.h
|
| diff --git a/src/animator/SkDrawPath.h b/src/animator/SkDrawPath.h
|
| index 9c4d3059d06165df76b22cfd372fa1e00481b9e2..cce8cd56b75844902e87afb64cab62c21770082e 100644
|
| --- a/src/animator/SkDrawPath.h
|
| +++ b/src/animator/SkDrawPath.h
|
| @@ -21,20 +21,20 @@ class SkDrawPath : public SkBoundable {
|
| 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 @@ private:
|
| 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 @@ private:
|
|
|
| class SkPolygon : public SkPolyline {
|
| DECLARE_MEMBER_INFO(Polygon);
|
| - virtual void onEndElement(SkAnimateMaker& );
|
| + virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
|
| private:
|
| typedef SkPolyline INHERITED;
|
| };
|
|
|