Ignore blur margin fix flag for backward bug compatibility.

http://codereview.appspot.com/4981046/


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

1 files changed, 13 insertions, 0 deletions

diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp
index 9fdd127879..3bc89aefcc 100644
--- a/src/effects/SkBlurMaskFilter.cpp
+++ b/src/effects/SkBlurMaskFilter.cpp
@@ -93,8 +93,21 @@ 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) {