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

samplecode/SampleEffects.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleCode.h"
+#include "SkBlurMask.h"
+#include "SkBlurMaskFilter.h"
 #include "SkCanvas.h"
+#include "SkColorMatrixFilter.h"
+#include "SkDiscretePathEffect.h"
+#include "SkGradientShader.h"
 #include "SkPaint.h"
 #include "SkView.h"
 
-#include "SkBlurMaskFilter.h"
-#include "SkColorMatrixFilter.h"
-#include "SkDiscretePathEffect.h"
-#include "SkGradientShader.h"
 
 //#define COLOR 0xFFFF8844
 #define COLOR 0xFF888888
 
 static void paint_proc0(SkPaint*) {
 }
 
 static void paint_proc1(SkPaint* paint) {
-    paint->setMaskFilter(SkBlurMaskFilter::Create(2,
-                                SkBlurMaskFilter::kNormal_BlurStyle))->unref();
+    paint->setMaskFilter(SkBlurMaskFilter::Create(
+                                SkBlurMaskFilter::kNormal_BlurStyle,
+                                SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(2))))->unref();
 }
 
 static void paint_proc2(SkPaint* paint) {
     SkScalar dir[3] = { 1, 1, 1};
     paint->setMaskFilter(
-                     SkBlurMaskFilter::CreateEmboss(dir, 0.1f, 0.05f, 1))->unref();
+            SkBlurMaskFilter::CreateEmboss(SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(1)), 
+                                           dir,
+                                           SkFloatToScalar(0.1f),
+                                           SkFloatToScalar(0.05f)))->unref();
 }
 
 static void paint_proc3(SkPaint* paint) {
     SkColor colors[] = { SK_ColorRED, COLOR, SK_ColorBLUE };
     SkPoint pts[] = { { 3, 0 }, { 7, 5 } };
     paint->setShader(SkGradientShader::CreateLinear(pts, colors, NULL, SK_ARRAY_COUNT(colors),
                                         SkShader::kMirror_TileMode))->unref();
 }
 
 static void paint_proc5(SkPaint* paint) {
@@ skipping 66 matching lines @@
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new EffectsView; }
 static SkViewRegister reg(MyFactory);