Now that layout tests are fixed, remove flag to ignore margin fix.

http://codereview.appspot.com/5186044/

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

diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp
index 3bc89ae..9fdd127 100644 (file)
--- a/src/effects/SkBlurMaskFilter.cpp
+++ b/src/effects/SkBlurMaskFilter.cpp
@@ -93,21 +93,8 @@ bool SkBlurMaskFilterImpl::filterMask(SkMask* dst, const SkMask& src,
         (fBlurFlags & SkBlurMaskFilter::kHighQuality_BlurFlag) ? 
             SkBlurMask::kHigh_Quality : SkBlurMask::kLow_Quality;
 
-#if defined(SK_BLUR_MASK_FILTER_IGNORE_MARGIN_FIX)
-    if (SkBlurMask::Blur(dst, src, radius, (SkBlurMask::Style)fBlurStyle,
-                         blurQuality)) {
-        if (margin) {
-            // we need to integralize radius for our margin, so take the ceil
-            // just to be safe.
-            margin->set(SkScalarCeil(radius), SkScalarCeil(radius));
-        }
-        return true;
-    }
-    return false;
-#else
     return SkBlurMask::Blur(dst, src, radius, (SkBlurMask::Style)fBlurStyle,
                             blurQuality, margin);
-#endif
 }
 
 SkFlattenable* SkBlurMaskFilterImpl::CreateProc(SkFlattenableReadBuffer& buffer) {