diff options
| author |  robertphillips <robertphillips@google.com> | 2016-04-08 08:01:20 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-08 08:01:20 -0700 |
| commit | ef6a47b4af1ebf621682b3398916fefb90fc912e (patch) | |
| tree | e9ddad02013f8a95a993b5ad8ef53cab16e65329 /include | |
| parent | 2bb3b6d2bb2cb3cc72ba254b34fadde5319c141a (diff) | |
Update MatrixConvolutionImageFilter to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1869833002
Review URL: https://codereview.chromium.org/1869833002
Diffstat (limited to 'include')
| -rw-r--r-- | include/effects/SkMatrixConvolutionImageFilter.h | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/include/effects/SkMatrixConvolutionImageFilter.h b/include/effects/SkMatrixConvolutionImageFilter.h index 092af08f0c..7a36c84af2 100644 --- a/include/effects/SkMatrixConvolutionImageFilter.h +++ b/include/effects/SkMatrixConvolutionImageFilter.h @@ -52,6 +52,20 @@ public: passed to filterImage() is used instead. @param cropRect The rectangle to which the output processing will be limited. */ + static sk_sp<SkImageFilter> Make(const SkISize& kernelSize, + const SkScalar* kernel, + SkScalar gain, + SkScalar bias, + const SkIPoint& kernelOffset, + TileMode tileMode, + bool convolveAlpha, + sk_sp<SkImageFilter> input, + const CropRect* cropRect = nullptr); + + SK_TO_STRING_OVERRIDE() + SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMatrixConvolutionImageFilter) + +#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR static SkImageFilter* Create(const SkISize& kernelSize, const SkScalar* kernel, SkScalar gain, @@ -60,10 +74,11 @@ public: TileMode tileMode, bool convolveAlpha, SkImageFilter* input = NULL, - const CropRect* cropRect = NULL); - - SK_TO_STRING_OVERRIDE() - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMatrixConvolutionImageFilter) + const CropRect* cropRect = NULL) { + return Make(kernelSize, kernel, gain, bias, kernelOffset, tileMode, convolveAlpha, + sk_ref_sp<SkImageFilter>(input), cropRect).release(); + } +#endif protected: SkMatrixConvolutionImageFilter(const SkISize& kernelSize, @@ -73,7 +88,7 @@ protected: const SkIPoint& kernelOffset, TileMode tileMode, bool convolveAlpha, - SkImageFilter* input, + sk_sp<SkImageFilter> input, const CropRect* cropRect); void flatten(SkWriteBuffer&) const override; @@ -95,7 +110,6 @@ private: SkIPoint fKernelOffset; TileMode fTileMode; bool fConvolveAlpha; - typedef SkImageFilter INHERITED; template <class PixelFetcher, bool convolveAlpha> void filterPixels(const SkBitmap& src, @@ -115,6 +129,8 @@ private: SkBitmap* result, const SkIRect& rect, const SkIRect& bounds) const; + + typedef SkImageFilter INHERITED; }; #endif |