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

Unified Diff: src/animator/SkDrawExtraPathEffect.cpp

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 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/SkDrawEmboss.h ('k') | src/animator/SkDrawFull.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/animator/SkDrawExtraPathEffect.cpp
diff --git a/src/animator/SkDrawExtraPathEffect.cpp b/src/animator/SkDrawExtraPathEffect.cpp
index dc586055a72b7afaf2168b4e2885016c5ae61fc4..0e4582b6ea957dea7ebd8cb28f53adfb349b7ef3 100644
--- a/src/animator/SkDrawExtraPathEffect.cpp
+++ b/src/animator/SkDrawExtraPathEffect.cpp
@@ -20,8 +20,8 @@ class SkDrawShapePathEffect : public SkDrawPathEffect {
DECLARE_PRIVATE_MEMBER_INFO(DrawShapePathEffect);
SkDrawShapePathEffect();
virtual ~SkDrawShapePathEffect();
- virtual bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
- virtual SkPathEffect* getPathEffect() SK_OVERRIDE;
+ bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
+ SkPathEffect* getPathEffect() SK_OVERRIDE;
protected:
SkADrawable* addPath;
SkADrawable* addMatrix;
@@ -35,7 +35,7 @@ class SkDrawShape1DPathEffect : public SkDrawShapePathEffect {
DECLARE_EXTRAS_MEMBER_INFO(SkDrawShape1DPathEffect);
SkDrawShape1DPathEffect(SkDisplayTypes );
virtual ~SkDrawShape1DPathEffect();
- virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkString phase;
SkString spacing;
@@ -47,7 +47,7 @@ class SkDrawShape2DPathEffect : public SkDrawShapePathEffect {
DECLARE_EXTRAS_MEMBER_INFO(SkDrawShape2DPathEffect);
SkDrawShape2DPathEffect(SkDisplayTypes );
virtual ~SkDrawShape2DPathEffect();
- virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
private:
SkDrawMatrix* matrix;
friend class SkShape2DPathEffect;
@@ -58,9 +58,9 @@ class SkDrawComposePathEffect : public SkDrawPathEffect {
DECLARE_EXTRAS_MEMBER_INFO(SkDrawComposePathEffect);
SkDrawComposePathEffect(SkDisplayTypes );
virtual ~SkDrawComposePathEffect();
- virtual bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
- virtual SkPathEffect* getPathEffect() SK_OVERRIDE;
- virtual bool isPaint() const SK_OVERRIDE;
+ bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
+ SkPathEffect* getPathEffect() SK_OVERRIDE;
+ bool isPaint() const SK_OVERRIDE;
private:
SkDrawPathEffect* effect1;
SkDrawPathEffect* effect2;
@@ -70,7 +70,7 @@ class SkDrawCornerPathEffect : public SkDrawPathEffect {
DECLARE_EXTRAS_MEMBER_INFO(SkDrawCornerPathEffect);
SkDrawCornerPathEffect(SkDisplayTypes );
virtual ~SkDrawCornerPathEffect();
- virtual SkPathEffect* getPathEffect() SK_OVERRIDE;
+ SkPathEffect* getPathEffect() SK_OVERRIDE;
private:
SkScalar radius;
};
@@ -93,7 +93,7 @@ public:
Factory getFactory() const SK_OVERRIDE { sk_throw(); return NULL; }
protected:
- virtual SkScalar begin(SkScalar contourLength) const SK_OVERRIDE {
+ SkScalar begin(SkScalar contourLength) const SK_OVERRIDE {
SkScriptValue value;
SkAnimatorScript engine(*fMaker, NULL, SkType_Float);
engine.propertyCallBack(GetContourLength, &contourLength);
@@ -102,7 +102,7 @@ protected:
return value.fOperand.fScalar;
}
- virtual SkScalar next(SkPath* dst, SkScalar distance, SkPathMeasure&) const SK_OVERRIDE {
+ SkScalar next(SkPath* dst, SkScalar distance, SkPathMeasure&) const SK_OVERRIDE {
fMaker->setExtraPropertyCallBack(fDraw->fType, GetDistance, &distance);
SkDrawPath* drawPath = NULL;
if (fDraw->addPath->isPath()) {
@@ -233,11 +233,11 @@ public:
Factory getFactory() const SK_OVERRIDE { sk_throw(); return NULL; }
protected:
- virtual void begin(const SkIRect& uvBounds, SkPath*) const SK_OVERRIDE {
+ void begin(const SkIRect& uvBounds, SkPath*) const SK_OVERRIDE {
const_cast<SkShape2DPathEffect*>(this)->setUVBounds(uvBounds);
}
- virtual void next(const SkPoint& loc, int u, int v, SkPath* dst) const SK_OVERRIDE {
+ void next(const SkPoint& loc, int u, int v, SkPath* dst) const SK_OVERRIDE {
const_cast<SkShape2DPathEffect*>(this)->addPath(loc, u, v, dst);
}
« no previous file with comments | « src/animator/SkDrawEmboss.h ('k') | src/animator/SkDrawFull.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698