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