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

samplecode/SampleAnimBlur.cpp

 
 /*
  * Copyright 2012 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 "SkBlurMaskFilter.h"
 #include "SkColorPriv.h"
@@ skipping 10 matching lines @@
     virtual bool onQuery(SkEvent* evt) {
         if (SampleCode::TitleQ(*evt)) {
             SampleCode::TitleR(evt, "AnimBlur");
             return true;
         }
         return this->INHERITED::onQuery(evt);
     }
 
     virtual void onDrawContent(SkCanvas* canvas) {
 
-        SkScalar blurRadius = SampleCode::GetAnimSinScalar(100 * SK_Scalar1,
-                                                           4 * SK_Scalar1,
-                                                           5 * SK_Scalar1);
+        SkScalar blurSigma = SampleCode::GetAnimSinScalar(100 * SK_Scalar1,
+                                                          4 * SK_Scalar1,
+                                                          5 * SK_Scalar1);
 
         SkScalar circleRadius = 3 * SK_Scalar1 +
                                 SampleCode::GetAnimSinScalar(150 * SK_Scalar1,
                                                              25 * SK_Scalar1,
                                                              3 * SK_Scalar1);
 
         static const SkBlurMaskFilter::BlurStyle gStyles[] = {
             SkBlurMaskFilter::kNormal_BlurStyle,
             SkBlurMaskFilter::kInner_BlurStyle,
             SkBlurMaskFilter::kSolid_BlurStyle,
             SkBlurMaskFilter::kOuter_BlurStyle,
         };
         SkRandom random;
 
         for (size_t i = 0; i < SK_ARRAY_COUNT(gStyles); ++i) {
-            SkMaskFilter* mf = SkBlurMaskFilter::Create(blurRadius,
+            SkMaskFilter* mf = SkBlurMaskFilter::Create(
                                        gStyles[i],
+                                       blurSigma,
                                        SkBlurMaskFilter::kHighQuality_BlurFlag);
             SkPaint paint;
             SkSafeUnref(paint.setMaskFilter(mf));
             paint.setColor(random.nextU() | 0xff000000);
             canvas->drawCircle(200 * SK_Scalar1 + 400 * (i % 2) * SK_Scalar1,
                                200 * SK_Scalar1 + i / 2 * 400 * SK_Scalar1,
                                circleRadius, paint);
         }
         this->inval(NULL);
     }
 
 private:
     typedef SkView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new AnimBlurView; }
 static SkViewRegister reg(MyFactory);