remove unused ConvertRadiusToSigma from SkBlurMaskFilter

Bug: skia:
Change-Id: I1726f22fc40ad61b1b0485bcda6d383614da1fdb
Reviewed-on: https://skia-review.googlesource.com/113463
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>

8 files changed, 6 insertions, 15 deletions

diff --git a/gn/core.gni b/gn/core.gni
index 3d1b399313..6adeab35df 100644
--- a/gn/core.gni
+++ b/gn/core.gni
@@ -56,6 +56,8 @@ skia_core_sources = [
   "$_src/core/SkBlitter_RGB565.cpp",
   "$_src/core/SkBlitter_Sprite.cpp",
   "$_src/core/SkBlurImageFilter.cpp",
+  "$_src/core/SkBlurMask.cpp",
+  "$_src/core/SkBlurMask.h",
   "$_src/core/SkBuffer.cpp",
   "$_src/core/SkCachedData.cpp",
   "$_src/core/SkCanvas.cpp",
diff --git a/gn/effects.gni b/gn/effects.gni
index 5b6a5fe21b..aeaf766ace 100644
--- a/gn/effects.gni
+++ b/gn/effects.gni
@@ -19,8 +19,6 @@ skia_effects_sources = [
   "$_src/effects/Sk2DPathEffect.cpp",
   "$_src/effects/SkAlphaThresholdFilter.cpp",
   "$_src/effects/SkArithmeticImageFilter.cpp",
-  "$_src/effects/SkBlurMask.cpp",
-  "$_src/effects/SkBlurMask.h",
   "$_src/effects/SkBlurMaskFilter.cpp",
   "$_src/effects/SkColorFilterImageFilter.cpp",
   "$_src/effects/SkColorMatrix.cpp",
diff --git a/include/effects/SkBlurMaskFilter.h b/include/effects/SkBlurMaskFilter.h
index c861f648ab..bc5e1a2dcc 100644
--- a/include/effects/SkBlurMaskFilter.h
+++ b/include/effects/SkBlurMaskFilter.h
@@ -18,12 +18,6 @@ class SkRRect;
 
 class SK_API SkBlurMaskFilter {
 public:
-    /**
-     *  If radius > 0, return the corresponding sigma, else return 0. Use this to convert from the
-     *  (legacy) idea of specify the blur "radius" to the standard notion of specifying its sigma.
-     */
-    static SkScalar ConvertRadiusToSigma(SkScalar radius);
-
     enum BlurFlags {
         kNone_BlurFlag              = 0x00,
         /** The blur layer's radius is not affected by transforms */
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);