| Index: include/effects/Sk1DPathEffect.h
|
| diff --git a/include/effects/Sk1DPathEffect.h b/include/effects/Sk1DPathEffect.h
|
| index 4599276e7bba47267baba558e824bd1ac4878cb6..fc7dc77139bcc2b4d06915e7ba11389a7aad414d 100644
|
| --- a/include/effects/Sk1DPathEffect.h
|
| +++ b/include/effects/Sk1DPathEffect.h
|
| @@ -15,6 +15,8 @@ class SkPathMeasure;
|
|
|
| // This class is not exported to java.
|
| class SK_API Sk1DPathEffect : public SkPathEffect {
|
| + typedef SkPathEffect INHERITED;
|
| +
|
| public:
|
| virtual bool filterPath(SkPath* dst, const SkPath& src,
|
| SkStrokeRec*, const SkRect*) const SK_OVERRIDE;
|
| @@ -30,12 +32,11 @@ protected:
|
| contour is done.
|
| */
|
| virtual SkScalar next(SkPath* dst, SkScalar dist, SkPathMeasure&) const = 0;
|
| -
|
| -private:
|
| - typedef SkPathEffect INHERITED;
|
| };
|
|
|
| class SK_API SkPath1DPathEffect : public Sk1DPathEffect {
|
| + typedef Sk1DPathEffect INHERITED;
|
| +
|
| public:
|
| enum Style {
|
| kTranslate_Style, // translate the shape to each position
|
| @@ -72,8 +73,6 @@ private:
|
| SkScalar fAdvance; // copied from constructor
|
| SkScalar fInitialOffset; // computed from phase
|
| Style fStyle; // copied from constructor
|
| -
|
| - typedef Sk1DPathEffect INHERITED;
|
| };
|
|
|
| #endif
|
|
|