| Index: include/effects/SkMorphologyImageFilter.h
|
| diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h
|
| index 901955bee61fdb548941aefcc31afdcb05068261..c5c5c7401e5e540a264e4441e635bae0452e9a8e 100644
|
| --- a/include/effects/SkMorphologyImageFilter.h
|
| +++ b/include/effects/SkMorphologyImageFilter.h
|
| @@ -30,7 +30,7 @@ public:
|
|
|
| protected:
|
| SkMorphologyImageFilter(int radiusX, int radiusY, SkImageFilter* input,
|
| - const CropRect* cropRect, uint32_t uniqueID);
|
| + const CropRect* cropRect);
|
| bool filterImageGeneric(Proc procX, Proc procY,
|
| Proxy*, const SkBitmap& src, const Context&,
|
| SkBitmap* result, SkIPoint* offset) const;
|
| @@ -53,12 +53,11 @@ class SK_API SkDilateImageFilter : public SkMorphologyImageFilter {
|
| public:
|
| static SkDilateImageFilter* Create(int radiusX, int radiusY,
|
| SkImageFilter* input = NULL,
|
| - const CropRect* cropRect = NULL,
|
| - uint32_t uniqueID = 0) {
|
| + const CropRect* cropRect = NULL) {
|
| if (radiusX < 0 || radiusY < 0) {
|
| return NULL;
|
| }
|
| - return SkNEW_ARGS(SkDilateImageFilter, (radiusX, radiusY, input, cropRect, uniqueID));
|
| + return SkNEW_ARGS(SkDilateImageFilter, (radiusX, radiusY, input, cropRect));
|
| }
|
|
|
| virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
|
| @@ -72,8 +71,8 @@ public:
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDilateImageFilter)
|
|
|
| protected:
|
| - SkDilateImageFilter(int radiusX, int radiusY, SkImageFilter* input, const CropRect* cropRect, uint32_t uniqueID)
|
| - : INHERITED(radiusX, radiusY, input, cropRect, uniqueID) {}
|
| + SkDilateImageFilter(int radiusX, int radiusY, SkImageFilter* input, const CropRect* cropRect)
|
| + : INHERITED(radiusX, radiusY, input, cropRect) {}
|
| private:
|
| typedef SkMorphologyImageFilter INHERITED;
|
| };
|
| @@ -82,12 +81,11 @@ class SK_API SkErodeImageFilter : public SkMorphologyImageFilter {
|
| public:
|
| static SkErodeImageFilter* Create(int radiusX, int radiusY,
|
| SkImageFilter* input = NULL,
|
| - const CropRect* cropRect = NULL,
|
| - uint32_t uniqueID = 0) {
|
| + const CropRect* cropRect = NULL) {
|
| if (radiusX < 0 || radiusY < 0) {
|
| return NULL;
|
| }
|
| - return SkNEW_ARGS(SkErodeImageFilter, (radiusX, radiusY, input, cropRect, uniqueID));
|
| + return SkNEW_ARGS(SkErodeImageFilter, (radiusX, radiusY, input, cropRect));
|
| }
|
|
|
| virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
|
| @@ -101,8 +99,8 @@ public:
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkErodeImageFilter)
|
|
|
| protected:
|
| - SkErodeImageFilter(int radiusX, int radiusY, SkImageFilter* input, const CropRect* cropRect, uint32_t uniqueID)
|
| - : INHERITED(radiusX, radiusY, input, cropRect, uniqueID) {}
|
| + SkErodeImageFilter(int radiusX, int radiusY, SkImageFilter* input, const CropRect* cropRect)
|
| + : INHERITED(radiusX, radiusY, input, cropRect) {}
|
|
|
| private:
|
| typedef SkMorphologyImageFilter INHERITED;
|
|
|