1 files changed, 12 insertions, 19 deletions
diff --git a/chromium/third_party/skia/include/effects/SkBlurMaskFilter.h b/chromium/third_party/skia/include/effects/SkBlurMaskFilter.h
index 9b352dc1e45..356475ed4c4 100644
--- a/chromium/third_party/skia/include/effects/SkBlurMaskFilter.h
+++ b/chromium/third_party/skia/include/effects/SkBlurMaskFilter.h
@@ -11,17 +11,15 @@
 // we include this since our callers will need to at least be able to ref/unref
 #include "SkMaskFilter.h"
 #include "SkScalar.h"
+#include "SkBlurTypes.h"
 
 class SK_API SkBlurMaskFilter {
 public:
-    enum BlurStyle {
-        kNormal_BlurStyle,  //!< fuzzy inside and outside
-        kSolid_BlurStyle,   //!< solid inside, fuzzy outside
-        kOuter_BlurStyle,   //!< nothing inside, fuzzy outside
-        kInner_BlurStyle,   //!< fuzzy inside, nothing outside
-
-        kBlurStyleCount
-    };
+    /**
+     *  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,
@@ -33,18 +31,13 @@ public:
         kAll_BlurFlag = 0x03
     };
 
-    SK_ATTR_DEPRECATED("use sigma version")
-    static SkMaskFilter* Create(SkScalar radius, BlurStyle style,
-                                uint32_t flags = kNone_BlurFlag);
-
     /** Create a blur maskfilter.
-        @param style    The BlurStyle to use
-        @param sigma    Standard deviation of the Gaussian blur to apply. Must be > 0.
-        @param flags    Flags to use - defaults to none
-        @return The new blur maskfilter
-    */
-    static SkMaskFilter* Create(BlurStyle style, SkScalar sigma,
-                                uint32_t flags = kNone_BlurFlag);
+     *  @param style    The SkBlurStyle to use
+     *  @param sigma    Standard deviation of the Gaussian blur to apply. Must be > 0.
+     *  @param flags    Flags to use - defaults to none
+     *  @return The new blur maskfilter
+     */
+    static SkMaskFilter* Create(SkBlurStyle style, SkScalar sigma, uint32_t flags = kNone_BlurFlag);
 
     /** Create an emboss maskfilter
         @param blurSigma    standard deviation of the Gaussian blur to apply