remove SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE

R=scroggo@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/308953002

git-svn-id: http://skia.googlecode.com/svn/trunk@15016 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/gyp/skia_for_android_framework_defines.gypi b/gyp/skia_for_android_framework_defines.gypi
index 1f6a2fc..7dc6c97 100644 (file)
--- a/gyp/skia_for_android_framework_defines.gypi
+++ b/gyp/skia_for_android_framework_defines.gypi
@@ -13,7 +13,6 @@
     # If these become 'permanent', they should be moved into common_variables.gypi
     #
     'skia_for_android_framework_defines': [
-      'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE',
       'SK_SUPPORT_LEGACY_SETCONFIG_INFO',
       # Needed until we fix skbug.com/2440.
       'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',

diff --git a/include/effects/SkBlurMaskFilter.h b/include/effects/SkBlurMaskFilter.h
index 5fcf463..356475e 100644 (file)
--- a/include/effects/SkBlurMaskFilter.h
+++ b/include/effects/SkBlurMaskFilter.h
@@ -15,17 +15,6 @@
 
 class SK_API SkBlurMaskFilter {
 public:
-#ifdef SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE
-    enum BlurStyle {
-        kNormal_BlurStyle = kNormal_SkBlurStyle,  //!< fuzzy inside and outside
-        kSolid_BlurStyle = kSolid_SkBlurStyle,   //!< solid inside, fuzzy outside
-        kOuter_BlurStyle = kOuter_SkBlurStyle,   //!< nothing inside, fuzzy outside
-        kInner_BlurStyle = kInner_SkBlurStyle,   //!< fuzzy inside, nothing outside
-
-        kBlurStyleCount
-    };
-#endif
-
     /**
      *  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.
@@ -42,21 +31,6 @@ public:
         kAll_BlurFlag = 0x03
     };
 
-#ifdef SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE
-    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);
-#endif
-
     /** Create a blur maskfilter.
      *  @param style    The SkBlurStyle to use
      *  @param sigma    Standard deviation of the Gaussian blur to apply. Must be > 0.

diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp
index aaf4235..e808885 100644 (file)
--- a/src/effects/SkBlurMaskFilter.cpp
+++ b/src/effects/SkBlurMaskFilter.cpp
@@ -125,21 +125,6 @@ SkMaskFilter* SkBlurMaskFilter::Create(SkBlurStyle style, SkScalar sigma, uint32
     return SkNEW_ARGS(SkBlurMaskFilterImpl, (sigma, style, flags));
 }
 
-#ifdef SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE
-SkMaskFilter* SkBlurMaskFilter::Create(SkScalar radius,
-                                       SkBlurMaskFilter::BlurStyle style,
-                                       uint32_t flags) {
-    SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(radius);
-    return Create((SkBlurStyle)style, sigma, flags);
-}
-
-SkMaskFilter* SkBlurMaskFilter::Create(SkBlurMaskFilter::BlurStyle style,
-                                       SkScalar sigma,
-                                       uint32_t flags) {
-    return Create((SkBlurStyle)style, sigma, flags);
-}
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 
 SkBlurMaskFilterImpl::SkBlurMaskFilterImpl(SkScalar sigma, SkBlurStyle style, uint32_t flags)