diff options
| -rw-r--r-- | fuzz/FuzzCanvas.cpp | 3 | ||||
| -rw-r--r-- | gm/drawregionmodes.cpp | 4 | ||||
| -rw-r--r-- | include/core/SkImageFilter.h | 4 | ||||
| -rw-r--r-- | include/effects/SkBlurImageFilter.h | 4 | ||||
| -rw-r--r-- | src/core/SkBlurImageFilter.cpp | 10 |
5 files changed, 11 insertions, 14 deletions
diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp index cdca73118b..be79c97346 100644 --- a/fuzz/FuzzCanvas.cpp +++ b/fuzz/FuzzCanvas.cpp @@ -29,6 +29,7 @@ #include "SkAlphaThresholdFilter.h" #include "SkArcToPathEffect.h" #include "SkArithmeticImageFilter.h" +#include "SkBlurImageFilter.h" #include "SkBlurMaskFilter.h" #include "SkColorFilterImageFilter.h" #include "SkColorMatrixFilter.h" @@ -699,7 +700,7 @@ static sk_sp<SkImageFilter> make_fuzz_imageFilter(Fuzz* fuzz, int depth) { if (useCropRect) { fuzz->next(&cropRect); } - return SkImageFilter::MakeBlur(sigmaX, sigmaY, std::move(input), + return SkBlurImageFilter::Make(sigmaX, sigmaY, std::move(input), useCropRect ? &cropRect : nullptr); } case 2: { diff --git a/gm/drawregionmodes.cpp b/gm/drawregionmodes.cpp index efccc88ace..88e320085a 100644 --- a/gm/drawregionmodes.cpp +++ b/gm/drawregionmodes.cpp @@ -6,11 +6,11 @@ */ #include "gm.h" +#include "SkBlurImageFilter.h" #include "SkBlurMaskFilter.h" #include "SkCanvas.h" #include "SkDashPathEffect.h" #include "SkGradientShader.h" -#include "SkImageFilter.h" #include "SkRegion.h" class DrawRegionModesGM : public skiagm::GM { @@ -44,7 +44,7 @@ protected: canvas->drawRegion(fRegion, paint); canvas->translate(125.0f, 125.0f); - paint.setImageFilter(SkImageFilter::MakeBlur(5.0f, 5.0f, nullptr, nullptr)); + paint.setImageFilter(SkBlurImageFilter::Make(5.0f, 5.0f, nullptr, nullptr)); canvas->drawRegion(fRegion, paint); canvas->translate(-125.0f, 125.0f); diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h index 7999a95e41..ee3abbd067 100644 --- a/include/core/SkImageFilter.h +++ b/include/core/SkImageFilter.h @@ -173,10 +173,6 @@ public: return this->isColorFilterNode(filterPtr); } - static sk_sp<SkImageFilter> MakeBlur(SkScalar sigmaX, SkScalar sigmaY, - sk_sp<SkImageFilter> input, - const CropRect* cropRect = nullptr); - /** * Returns true (and optionally returns a ref'd filter) if this imagefilter can be completely * replaced by the returned colorfilter. i.e. the two effects will affect drawing in the diff --git a/include/effects/SkBlurImageFilter.h b/include/effects/SkBlurImageFilter.h index 085a13b5b3..0cb864c145 100644 --- a/include/effects/SkBlurImageFilter.h +++ b/include/effects/SkBlurImageFilter.h @@ -14,9 +14,7 @@ class SK_API SkBlurImageFilter { public: static sk_sp<SkImageFilter> Make(SkScalar sigmaX, SkScalar sigmaY, sk_sp<SkImageFilter> input, - const SkImageFilter::CropRect* cropRect = nullptr) { - return SkImageFilter::MakeBlur(sigmaX, sigmaY, input, cropRect); - } + const SkImageFilter::CropRect* cropRect = nullptr); }; #endif diff --git a/src/core/SkBlurImageFilter.cpp b/src/core/SkBlurImageFilter.cpp index 320097bdd0..6c18962fba 100644 --- a/src/core/SkBlurImageFilter.cpp +++ b/src/core/SkBlurImageFilter.cpp @@ -5,6 +5,8 @@ * found in the LICENSE file. */ +#include "SkBlurImageFilter.h" + #include "SkAutoPixmapStorage.h" #include "SkColorPriv.h" #include "SkGpuBlurUtils.h" @@ -51,9 +53,9 @@ SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END /////////////////////////////////////////////////////////////////////////////// -sk_sp<SkImageFilter> SkImageFilter::MakeBlur(SkScalar sigmaX, SkScalar sigmaY, +sk_sp<SkImageFilter> SkBlurImageFilter::Make(SkScalar sigmaX, SkScalar sigmaY, sk_sp<SkImageFilter> input, - const CropRect* cropRect) { + const SkImageFilter::CropRect* cropRect) { if (0 == sigmaX && 0 == sigmaY && !cropRect) { return input; } @@ -83,7 +85,7 @@ sk_sp<SkFlattenable> SkBlurImageFilterImpl::CreateProc(SkReadBuffer& buffer) { SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1); SkScalar sigmaX = buffer.readScalar(); SkScalar sigmaY = buffer.readScalar(); - return SkImageFilter::MakeBlur(sigmaX, sigmaY, common.getInput(0), &common.cropRect()); + return SkBlurImageFilter::Make(sigmaX, sigmaY, common.getInput(0), &common.cropRect()); } void SkBlurImageFilterImpl::flatten(SkWriteBuffer& buffer) const { @@ -276,7 +278,7 @@ const { } sk_sp<SkImageFilter> input = this->getInput(0)->makeColorSpace(xformer); - return SkImageFilter::MakeBlur(fSigma.width(), fSigma.height(), std::move(input), + return SkBlurImageFilter::Make(fSigma.width(), fSigma.height(), std::move(input), this->getCropRectIfSet()); } |