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

gm/circles.cpp

 
 /*
  * Copyright 2012 Intel 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 "SkTArray.h"
-#include "SkRandom.h"
-#include "SkMatrix.h"
+#include "SkBlurDrawLooper.h"
+#include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
 #include "SkGradientShader.h"
-#include "SkBlurDrawLooper.h"
+#include "SkMatrix.h"
+#include "SkRandom.h"
+#include "SkTArray.h"
 
 namespace skiagm {
 
 class CircleGM : public GM {
 public:
     CircleGM() {
         this->setBGColor(0xFF000000);
         this->makePaints();
         this->makeMatrices();
     }
@@ skipping 18 matching lines @@
         // AA
         SkPaint p;
         p.setAntiAlias(true);
         fPaints.push_back(p);
         }
 
         {
         // AA with mask filter
         SkPaint p;
         p.setAntiAlias(true);
-        SkMaskFilter* mf = SkBlurMaskFilter::Create(SkIntToScalar(5),
+        SkMaskFilter* mf = SkBlurMaskFilter::Create(
                                SkBlurMaskFilter::kNormal_BlurStyle,
+                               SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(5)),
                                SkBlurMaskFilter::kHighQuality_BlurFlag);
         p.setMaskFilter(mf)->unref();
         fPaints.push_back(p);
         }
 
         {
         // AA with radial shader
         SkPaint p;
         p.setAntiAlias(true);
         SkPoint center = SkPoint::Make(SkIntToScalar(40), SkIntToScalar(40));
         SkColor colors[] = { SK_ColorBLUE, SK_ColorRED, SK_ColorGREEN };
         SkScalar pos[] = { 0, SK_ScalarHalf, SK_Scalar1 };
         SkShader* s = SkGradientShader::CreateRadial(center,
                                                      SkIntToScalar(20),
                                                      colors,
                                                      pos,
                                                      SK_ARRAY_COUNT(colors),
                                                      SkShader::kClamp_TileMode);
         p.setShader(s)->unref();
         fPaints.push_back(p);
         }
 
         {
         // AA with blur
         SkPaint p;
         p.setAntiAlias(true);
         SkBlurDrawLooper* shadowLooper =
-            new SkBlurDrawLooper (SkIntToScalar(10), SkIntToScalar(5),
-                                  SkIntToScalar(10), 0xFF0000FF,
+            new SkBlurDrawLooper (SK_ColorBLUE, 
+                                  SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(10)), 
+                                  SkIntToScalar(5), SkIntToScalar(10),
                                   SkBlurDrawLooper::kIgnoreTransform_BlurFlag |
                                   SkBlurDrawLooper::kOverrideColor_BlurFlag |
                                   SkBlurDrawLooper::kHighQuality_BlurFlag);
         SkAutoUnref aurL0(shadowLooper);
         p.setLooper(shadowLooper);
         fPaints.push_back(p);
         }
 
         {
         // AA with stroke style
@@ skipping 102 matching lines @@
     SkTArray<SkPaint> fPaints;
     SkTArray<SkMatrix> fMatrices;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new CircleGM; }
 static GMRegistry reg(MyFactory);
 
 }