| Index: include/effects/Sk2DPathEffect.h
|
| diff --git a/include/effects/Sk2DPathEffect.h b/include/effects/Sk2DPathEffect.h
|
| index f037e335085674ae3108d8626e563b1e30056ccb..2adf598012c355934d443329e4a002cfcaa33300 100644
|
| --- a/include/effects/Sk2DPathEffect.h
|
| +++ b/include/effects/Sk2DPathEffect.h
|
| @@ -43,14 +43,10 @@ protected:
|
| const SkMatrix& getMatrix() const { return fMatrix; }
|
|
|
| // protected so that subclasses can call this during unflattening
|
| - Sk2DPathEffect(SkReadBuffer&);
|
| + explicit Sk2DPathEffect(const SkMatrix& mat);
|
| + explicit Sk2DPathEffect(SkReadBuffer&);
|
| virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
|
|
| -#ifdef SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS
|
| -public:
|
| -#endif
|
| - Sk2DPathEffect(const SkMatrix& mat);
|
| -
|
| private:
|
| SkMatrix fMatrix, fInverse;
|
| bool fMatrixIsInvertible;
|
| @@ -75,17 +71,13 @@ public:
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLine2DPathEffect)
|
|
|
| protected:
|
| - virtual void nextSpan(int u, int v, int ucount, SkPath*) const SK_OVERRIDE;
|
| -
|
| - SkLine2DPathEffect(SkReadBuffer&);
|
| + SkLine2DPathEffect(SkScalar width, const SkMatrix& matrix)
|
| + : Sk2DPathEffect(matrix), fWidth(width) {}
|
| + explicit SkLine2DPathEffect(SkReadBuffer&);
|
|
|
| virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
|
|
| -#ifdef SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS
|
| -public:
|
| -#endif
|
| - SkLine2DPathEffect(SkScalar width, const SkMatrix& matrix)
|
| - : Sk2DPathEffect(matrix), fWidth(width) {}
|
| + virtual void nextSpan(int u, int v, int ucount, SkPath*) const SK_OVERRIDE;
|
|
|
| private:
|
| SkScalar fWidth;
|
| @@ -106,16 +98,12 @@ public:
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPath2DPathEffect)
|
|
|
| protected:
|
| - SkPath2DPathEffect(SkReadBuffer& buffer);
|
| + SkPath2DPathEffect(const SkMatrix&, const SkPath&);
|
| + explicit SkPath2DPathEffect(SkReadBuffer& buffer);
|
| virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
|
|
| virtual void next(const SkPoint&, int u, int v, SkPath*) const SK_OVERRIDE;
|
|
|
| -#ifdef SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS
|
| -public:
|
| -#endif
|
| - SkPath2DPathEffect(const SkMatrix&, const SkPath&);
|
| -
|
| private:
|
| SkPath fPath;
|
|
|
|
|