diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkBlurMask.cpp (renamed from src/effects/SkBlurMask.cpp) | 0 | ||||
-rw-r--r-- | src/core/SkBlurMask.h (renamed from src/effects/SkBlurMask.h) | 0 | ||||
-rw-r--r-- | src/effects/SkBlurMaskFilter.cpp | 4 | ||||
-rw-r--r-- | src/gpu/effects/GrRectBlurEffect.h | 2 | ||||
-rw-r--r-- | src/utils/SkShadowUtils.cpp | 5 |
5 files changed, 4 insertions, 7 deletions
diff --git a/src/effects/SkBlurMask.cpp b/src/core/SkBlurMask.cpp index 086977528b..086977528b 100644 --- a/src/effects/SkBlurMask.cpp +++ b/src/core/SkBlurMask.cpp diff --git a/src/effects/SkBlurMask.h b/src/core/SkBlurMask.h index 67009b0bb5..67009b0bb5 100644 --- a/src/effects/SkBlurMask.h +++ b/src/core/SkBlurMask.h diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 302d16e67b..c71cbc6491 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -39,10 +39,6 @@ #include "glsl/GrGLSLUniformHandler.h" #endif -SkScalar SkBlurMaskFilter::ConvertRadiusToSigma(SkScalar radius) { - return SkBlurMask::ConvertRadiusToSigma(radius); -} - class SkBlurMaskFilterImpl : public SkMaskFilterBase { public: SkBlurMaskFilterImpl(SkScalar sigma, SkBlurStyle, const SkRect& occluder, uint32_t flags); diff --git a/src/gpu/effects/GrRectBlurEffect.h b/src/gpu/effects/GrRectBlurEffect.h index 44f54bba95..80c801761a 100644 --- a/src/gpu/effects/GrRectBlurEffect.h +++ b/src/gpu/effects/GrRectBlurEffect.h @@ -11,10 +11,10 @@ #ifndef GrRectBlurEffect_DEFINED #define GrRectBlurEffect_DEFINED #include "SkTypes.h" +#include "SkBlurMask.h" #if SK_SUPPORT_GPU #include "GrProxyProvider.h" -#include "../effects/SkBlurMask.h" #include "GrFragmentProcessor.h" #include "GrCoordTransform.h" class GrRectBlurEffect : public GrFragmentProcessor { diff --git a/src/utils/SkShadowUtils.cpp b/src/utils/SkShadowUtils.cpp index 26ef2adfc5..928bdee103 100644 --- a/src/utils/SkShadowUtils.cpp +++ b/src/utils/SkShadowUtils.cpp @@ -6,6 +6,7 @@ */ #include "SkShadowUtils.h" +#include "SkBlurMask.h" #include "SkBlurMaskFilter.h" #include "SkCanvas.h" #include "SkColorFilter.h" @@ -640,7 +641,7 @@ void SkBaseDevice::drawShadow(const SkPath& path, const SkDrawShadowRec& rec) { paint.setColor(rec.fAmbientColor); paint.setStrokeWidth(strokeWidth); paint.setStyle(SkPaint::kStrokeAndFill_Style); - SkScalar sigma = SkBlurMaskFilter::ConvertRadiusToSigma(blurRadius); + SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(blurRadius); uint32_t flags = SkBlurMaskFilter::kIgnoreTransform_BlurFlag; paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, sigma, flags)); this->drawPath(devSpacePath, paint); @@ -725,7 +726,7 @@ void SkBaseDevice::drawShadow(const SkPath& path, const SkDrawShadowRec& rec) { SkPaint paint; paint.setColor(rec.fSpotColor); - SkScalar sigma = SkBlurMaskFilter::ConvertRadiusToSigma(radius); + SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(radius); uint32_t flags = SkBlurMaskFilter::kIgnoreTransform_BlurFlag; paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, sigma, flags)); this->drawPath(path, paint); |