diff options
Diffstat (limited to 'include/effects')
-rw-r--r-- | include/effects/Sk1DPathEffect.h | 6 | ||||
-rw-r--r-- | include/effects/Sk2DPathEffect.h | 2 | ||||
-rw-r--r-- | include/effects/SkCornerPathEffect.h | 2 | ||||
-rw-r--r-- | include/effects/SkDashPathEffect.h | 4 | ||||
-rw-r--r-- | include/effects/SkDiscretePathEffect.h | 4 |
5 files changed, 6 insertions, 12 deletions
diff --git a/include/effects/Sk1DPathEffect.h b/include/effects/Sk1DPathEffect.h index 25b6ff32d8..eafac36b89 100644 --- a/include/effects/Sk1DPathEffect.h +++ b/include/effects/Sk1DPathEffect.h @@ -18,8 +18,7 @@ class SkPathMeasure; // This class is not exported to java. class Sk1DPathEffect : public SkPathEffect { public: - // override from SkPathEffect - virtual bool filterPath(SkPath* dst, const SkPath& src, SkScalar* width); + virtual bool filterPath(SkPath* dst, const SkPath& src, SkStrokeRec*) SK_OVERRIDE; protected: /** Called at the start of each contour, returns the initial offset @@ -56,8 +55,7 @@ public: */ SkPath1DPathEffect(const SkPath& path, SkScalar advance, SkScalar phase, Style); - // override from SkPathEffect - virtual bool filterPath(SkPath*, const SkPath&, SkScalar* width) SK_OVERRIDE; + virtual bool filterPath(SkPath*, const SkPath&, SkStrokeRec*) SK_OVERRIDE; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPath1DPathEffect) diff --git a/include/effects/Sk2DPathEffect.h b/include/effects/Sk2DPathEffect.h index 30bbe1ab16..724fb8f3a1 100644 --- a/include/effects/Sk2DPathEffect.h +++ b/include/effects/Sk2DPathEffect.h @@ -19,7 +19,7 @@ public: Sk2DPathEffect(const SkMatrix& mat); // overrides - virtual bool filterPath(SkPath*, const SkPath&, SkScalar* width) SK_OVERRIDE; + virtual bool filterPath(SkPath*, const SkPath&, SkStrokeRec*) SK_OVERRIDE; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Sk2DPathEffect) diff --git a/include/effects/SkCornerPathEffect.h b/include/effects/SkCornerPathEffect.h index 01dae7e6f3..02fe6d9b9f 100644 --- a/include/effects/SkCornerPathEffect.h +++ b/include/effects/SkCornerPathEffect.h @@ -27,7 +27,7 @@ public: // overrides for SkPathEffect // This method is not exported to java. - virtual bool filterPath(SkPath* dst, const SkPath& src, SkScalar* width); + virtual bool filterPath(SkPath* dst, const SkPath& src, SkStrokeRec*) SK_OVERRIDE; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkCornerPathEffect) diff --git a/include/effects/SkDashPathEffect.h b/include/effects/SkDashPathEffect.h index 0c9e53cc31..87580aa37d 100644 --- a/include/effects/SkDashPathEffect.h +++ b/include/effects/SkDashPathEffect.h @@ -41,9 +41,7 @@ public: SkDashPathEffect(const SkScalar intervals[], int count, SkScalar phase, bool scaleToFit = false); virtual ~SkDashPathEffect(); - // overrides for SkPathEffect - // This method is not exported to java. - virtual bool filterPath(SkPath* dst, const SkPath& src, SkScalar* width); + virtual bool filterPath(SkPath* dst, const SkPath& src, SkStrokeRec*) SK_OVERRIDE; // overrides for SkFlattenable // This method is not exported to java. diff --git a/include/effects/SkDiscretePathEffect.h b/include/effects/SkDiscretePathEffect.h index 30d07d3c21..29fd3c5242 100644 --- a/include/effects/SkDiscretePathEffect.h +++ b/include/effects/SkDiscretePathEffect.h @@ -24,9 +24,7 @@ public: */ SkDiscretePathEffect(SkScalar segLength, SkScalar deviation); - // overrides for SkPathEffect - // This method is not exported to java. - virtual bool filterPath(SkPath* dst, const SkPath& src, SkScalar* width); + virtual bool filterPath(SkPath* dst, const SkPath& src, SkStrokeRec*) SK_OVERRIDE; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDiscretePathEffect) |