| Index: include/core/SkPathEffect.h
|
| diff --git a/include/core/SkPathEffect.h b/include/core/SkPathEffect.h
|
| index 3b4541de5681944c870d7c5594ee7c3f2fb5060c..0b26b765a0ba6757d4af30c0424204dfe311d8a0 100644
|
| --- a/include/core/SkPathEffect.h
|
| +++ b/include/core/SkPathEffect.h
|
| @@ -28,6 +28,8 @@ class SkPath;
|
| Dashing is implemented as a subclass of SkPathEffect.
|
| */
|
| class SK_API SkPathEffect : public SkFlattenable {
|
| + typedef SkFlattenable INHERITED;
|
| +
|
| public:
|
| SK_DECLARE_INST_COUNT(SkPathEffect)
|
|
|
| @@ -113,8 +115,6 @@ private:
|
| // illegal
|
| SkPathEffect(const SkPathEffect&);
|
| SkPathEffect& operator=(const SkPathEffect&);
|
| -
|
| - typedef SkFlattenable INHERITED;
|
| };
|
|
|
| /** \class SkPairPathEffect
|
| @@ -124,6 +124,8 @@ private:
|
| for managing the lifetimes of its two arguments.
|
| */
|
| class SkPairPathEffect : public SkPathEffect {
|
| + typedef SkPathEffect INHERITED;
|
| +
|
| public:
|
| SkPairPathEffect(SkPathEffect* pe0, SkPathEffect* pe1);
|
| virtual ~SkPairPathEffect();
|
| @@ -134,9 +136,6 @@ protected:
|
|
|
| // these are visible to our subclasses
|
| SkPathEffect* fPE0, *fPE1;
|
| -
|
| -private:
|
| - typedef SkPathEffect INHERITED;
|
| };
|
|
|
| /** \class SkComposePathEffect
|
| @@ -145,6 +144,8 @@ private:
|
| a compound pathEffect.
|
| */
|
| class SkComposePathEffect : public SkPairPathEffect {
|
| + typedef SkPairPathEffect INHERITED;
|
| +
|
| public:
|
| /** Construct a pathEffect whose effect is to apply first the inner pathEffect
|
| and the the outer pathEffect (e.g. outer(inner(path)))
|
| @@ -166,8 +167,6 @@ private:
|
| // illegal
|
| SkComposePathEffect(const SkComposePathEffect&);
|
| SkComposePathEffect& operator=(const SkComposePathEffect&);
|
| -
|
| - typedef SkPairPathEffect INHERITED;
|
| };
|
|
|
| /** \class SkSumPathEffect
|
| @@ -176,6 +175,8 @@ private:
|
| Its filterPath() returns true if either of the effects succeeded.
|
| */
|
| class SkSumPathEffect : public SkPairPathEffect {
|
| + typedef SkPairPathEffect INHERITED;
|
| +
|
| public:
|
| /** Construct a pathEffect whose effect is to apply two effects, in sequence.
|
| (e.g. first(path) + second(path))
|
| @@ -197,8 +198,6 @@ private:
|
| // illegal
|
| SkSumPathEffect(const SkSumPathEffect&);
|
| SkSumPathEffect& operator=(const SkSumPathEffect&);
|
| -
|
| - typedef SkPairPathEffect INHERITED;
|
| };
|
|
|
| #endif
|
|
|