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

samplecode/SampleStrokePath.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 "SkParsePath.h"
 #include "SkPath.h"
 #include "SkRandom.h"
 #include "SkView.h"
 
-#include "SkBlurMaskFilter.h"
 
 static void test_huge_stroke(SkCanvas* canvas) {
     SkRect srcR = { 0, 0, 72000, 54000 };
     SkRect dstR = { 0, 0, 640, 480 };
 
     SkPath path;
     path.moveTo(17600, 8000);
     path.lineTo(52800, 8000);
     path.lineTo(52800, 41600);
     path.lineTo(17600, 41600);
     path.close();
 
     SkPaint paint;
     paint.setAntiAlias(true);
     paint.setStrokeWidth(8000);
     paint.setStrokeMiter(10);
     paint.setStrokeCap(SkPaint::kButt_Cap);
     paint.setStrokeJoin(SkPaint::kRound_Join);
     paint.setStyle(SkPaint::kStroke_Style);
 
     SkMatrix matrix;
     matrix.setRectToRect(srcR, dstR, SkMatrix::kCenter_ScaleToFit);
     canvas->concat(matrix);
 
     canvas->drawPath(path, paint);
 }
 
 #if 0
-#include "SkBlurMask.h"
 static void test_blur() {
     uint8_t cell[9];
     memset(cell, 0xFF, sizeof(cell));
     SkMask src;
     src.fImage = cell;
     src.fFormat = SkMask::kA8_Format;
     SkMask dst;
 
     for (int y = 1; y <= 3; y++) {
         for (int x = 1; x <= 3; x++) {
@@ skipping 106 matching lines @@
             canvas->translate(10, 30);
 
             static const SkBlurMaskFilter::BlurStyle gStyle[] = {
                 SkBlurMaskFilter::kNormal_BlurStyle,
                 SkBlurMaskFilter::kInner_BlurStyle,
                 SkBlurMaskFilter::kOuter_BlurStyle,
                 SkBlurMaskFilter::kSolid_BlurStyle,
             };
             for (int x = 0; x < 5; x++) {
                 SkMaskFilter* mf;
-                SkScalar radius = 4;
+                SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(4));
                 for (int y = 0; y < 10; y++) {
                     if (x) {
-                        mf = SkBlurMaskFilter::Create(radius, gStyle[x - 1]);
+                        mf = SkBlurMaskFilter::Create(gStyle[x - 1], sigma);
                         paint.setMaskFilter(mf)->unref();
                     }
                     canvas->drawText("Title Bar", 9, x*SkIntToScalar(100), y*SkIntToScalar(30), paint);
-                    radius *= 0.75f;
+                    sigma *= 0.75f;
                 }
 
             }
             return;
         }
 
         paint.setColor(SK_ColorBLUE);
 
 #if 1
         SkPath p;
@@ skipping 26 matching lines @@
         return this->INHERITED::onFindClickHandler(x, y, modi);
     }
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new StrokePathView; }
 static SkViewRegister reg(MyFactory);