diff --git a/src/core/SkLocalMatrixImageFilter.cpp b/src/core/SkLocalMatrixImageFilter.cpp index 3214d2d93b..f4ecb293ba 100644 --- a/src/core/SkLocalMatrixImageFilter.cpp +++ b/src/core/SkLocalMatrixImageFilter.cpp @@ -23,8 +23,9 @@ SkImageFilter* SkLocalMatrixImageFilter::Create(const SkMatrix& localM, SkImageF } SkLocalMatrixImageFilter::SkLocalMatrixImageFilter(const SkMatrix& localM, SkImageFilter* input) - : INHERITED(1, &input), fLocalM(localM) -{} + : INHERITED(1, &input) + , fLocalM(localM) { +} SkFlattenable* SkLocalMatrixImageFilter::CreateProc(SkReadBuffer& buffer) { SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1); @@ -38,11 +39,10 @@ void SkLocalMatrixImageFilter::flatten(SkWriteBuffer& buffer) const { buffer.writeMatrix(fLocalM); } -bool SkLocalMatrixImageFilter::onFilterImageDeprecated(Proxy* proxy, const SkBitmap& src, - const Context& ctx, - SkBitmap* result, SkIPoint* offset) const { +SkSpecialImage* SkLocalMatrixImageFilter::onFilterImage(SkSpecialImage* source, const Context& ctx, + SkIPoint* offset) const { Context localCtx(SkMatrix::Concat(ctx.ctm(), fLocalM), ctx.clipBounds(), ctx.cache()); - return this->filterInputDeprecated(0, proxy, src, localCtx, result, offset); + return this->filterInput(0, source, localCtx, offset); } SkIRect SkLocalMatrixImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& matrix, diff --git a/src/core/SkLocalMatrixImageFilter.h b/src/core/SkLocalMatrixImageFilter.h index da49df4932..f6bcb56773 100644 --- a/src/core/SkLocalMatrixImageFilter.h +++ b/src/core/SkLocalMatrixImageFilter.h @@ -9,8 +9,6 @@ #define SkLocalMatrixImageFilter_DEFINED #include "SkImageFilter.h" -#include "SkReadBuffer.h" -#include "SkString.h" /** * Wraps another imagefilter + matrix, such that using this filter will give the same result @@ -25,14 +23,14 @@ public: protected: void flatten(SkWriteBuffer&) const override; - bool onFilterImageDeprecated(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* offset) const override; + SkSpecialImage* onFilterImage(SkSpecialImage* source, const Context&, + SkIPoint* offset) const override; SkIRect onFilterBounds(const SkIRect& src, const SkMatrix&, MapDirection) const override; private: SkLocalMatrixImageFilter(const SkMatrix& localM, SkImageFilter* input); - SkMatrix fLocalM; + SkMatrix fLocalM; typedef SkImageFilter INHERITED; };