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

gm/blurquickreject.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"
 
 // This GM tests out the quick reject bounds of the blur mask filter. It draws
 // four blurred rects around a central clip. The blurred rect geometry outset
 // by the blur radius does not overlap the clip rect so, if the blur clipping
 // just uses the radius, they will be clipped out (and the result will differ
 // from the result if quick reject were disabled. If the blur clipping uses
 // the correct 3 sigma bound then the images with and without quick rejecting
 // will be the same.
 class BlurQuickRejectGM : public skiagm::GM {
 public:
@@ skipping 27 matching lines @@
         };
         SkASSERT(SK_ARRAY_COUNT(colors) == SK_ARRAY_COUNT(blurRects));
 
         SkPaint hairlinePaint;
         hairlinePaint.setStyle(SkPaint::kStroke_Style);
         hairlinePaint.setColor(SK_ColorWHITE);
         hairlinePaint.setStrokeWidth(0);
 
         SkPaint blurPaint;
         blurPaint.setFilterBitmap(true);
-        SkMaskFilter* mf = SkBlurMaskFilter::Create(kBlurRadius,
-                                                    SkBlurMaskFilter::kNormal_BlurStyle);
+        SkMaskFilter* mf = SkBlurMaskFilter::Create(SkBlurMaskFilter::kNormal_BlurStyle,
+                                                    SkBlurMask::ConvertRadiusToSigma(kBlurRadius));
         blurPaint.setMaskFilter(mf)->unref();
 
         canvas->clear(SK_ColorBLACK);
         canvas->save();
         canvas->translate(kBoxSize, kBoxSize);
         canvas->drawRect(clipRect, hairlinePaint);
         canvas->clipRect(clipRect);
         for (size_t i = 0; i < SK_ARRAY_COUNT(blurRects); ++i) {
             blurPaint.setColor(colors[i]);
             canvas->drawRect(blurRects[i], blurPaint);
             canvas->drawRect(blurRects[i], hairlinePaint);
         }
         canvas->restore();
     }
 
 private:
     static const int kWidth = 300;
     static const int kHeight = 300;
 
     typedef GM INHERITED;
 };
 
 DEF_GM( return new BlurQuickRejectGM(); )