Push sigma-based blur interface into our GMs/benches/tests/samplecode

gm/bleed.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
+#include "SkBlurMask.h"
+#include "SkBlurMaskFilter.h"
 #include "SkCanvas.h"
-#include "SkBlurMaskFilter.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 
 namespace skiagm {
 extern GrContext* GetGr();
 };
 #endif
 
 // Create a black&white checked texture with a 1-pixel red ring
@@ skipping 118 matching lines @@
     // Draw the center of the small bitmap with a mask filter
     void drawCase4(SkCanvas* canvas, int transX, int transY,
                    SkCanvas::DrawBitmapRectFlags flags, bool filter) {
         SkRect src = SkRect::MakeXYWH(1, 1,
                                       kSmallTextureSize-2,
                                       kSmallTextureSize-2);
         SkRect dst = SkRect::MakeXYWH(0, 0, SkIntToScalar(kBlockSize), SkIntToScalar(kBlockSize));
 
         SkPaint paint;
         paint.setFilterBitmap(filter);
-        SkMaskFilter* mf = SkBlurMaskFilter::Create(SkIntToScalar(3),
-                                                    SkBlurMaskFilter::kNormal_BlurStyle);
+        SkMaskFilter* mf = SkBlurMaskFilter::Create(SkBlurMaskFilter::kNormal_BlurStyle,
+                                         SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(3)));
         paint.setMaskFilter(mf)->unref();
 
         canvas->save();
         canvas->translate(SkIntToScalar(transX), SkIntToScalar(transY));
         canvas->drawBitmapRectToRect(fBitmapSmall, &src, dst, &paint, flags);
         canvas->restore();
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
 
@@ skipping 60 matching lines @@
     static const int kSmallTextureSize = 4;
     static const int kMaxTextureSize = 32;
 
     SkBitmap fBitmapSmall;
     SkBitmap fBitmapBig;
 
     typedef GM INHERITED;
 };
 
 DEF_GM( return new BleedGM(); )