move common blur types into central header

bench/BlurRectBench.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 "SkBenchmark.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
@@ skipping 73 matching lines @@
         } else {
             name.printf("blurrect_direct_%d", SkScalarRoundToInt(rad));
         }
 
         this->setName(name);
     }
 protected:
     virtual void makeBlurryRect(const SkRect& r) SK_OVERRIDE {
         SkMask mask;
         SkBlurMask::BlurRect(SkBlurMask::ConvertRadiusToSigma(this->radius()),
-                             &mask, r, SkBlurMask::kNormal_Style);
+                             &mask, r, kNormal_SkBlurStyle);
         SkMask::FreeImage(mask.fImage);
     }
 private:
     typedef BlurRectBench INHERITED;
 };
 
 class BlurRectSeparableBench: public BlurRectBench {
 
 public:
     BlurRectSeparableBench(SkScalar rad) : INHERITED(rad) {
@@ skipping 34 matching lines @@
 
         this->setName(name);
     }
 
 protected:
 
     virtual void makeBlurryRect(const SkRect&) SK_OVERRIDE {
         SkMask mask;
         mask.fImage = NULL;
         SkBlurMask::BoxBlur(&mask, fSrcMask, SkBlurMask::ConvertRadiusToSigma(this->radius()),
-                            SkBlurMask::kNormal_Style,
-                            SkBlurMask::kHigh_Quality);
+                            kNormal_SkBlurStyle, kHigh_SkBlurQuality);
         SkMask::FreeImage(mask.fImage);
     }
 private:
     typedef BlurRectSeparableBench INHERITED;
 };
 
 class BlurRectGaussianBench: public BlurRectSeparableBench {
 public:
     BlurRectGaussianBench(SkScalar rad) : INHERITED(rad) {
         SkString name;
 
         if (SkScalarFraction(rad) != 0) {
             name.printf("blurrect_gaussian_%.2f", SkScalarToFloat(rad));
         } else {
             name.printf("blurrect_gaussian_%d", SkScalarRoundToInt(rad));
         }
 
         this->setName(name);
     }
 
 protected:
 
     virtual void makeBlurryRect(const SkRect&) SK_OVERRIDE {
         SkMask mask;
         mask.fImage = NULL;
         SkBlurMask::BlurGroundTruth(SkBlurMask::ConvertRadiusToSigma(this->radius()),
-                                    &mask, fSrcMask, SkBlurMask::kNormal_Style);
+                                    &mask, fSrcMask, kNormal_SkBlurStyle);
         SkMask::FreeImage(mask.fImage);
     }
 private:
     typedef BlurRectSeparableBench INHERITED;
 };
 
 DEF_BENCH(return new BlurRectBoxFilterBench(SMALL);)
 DEF_BENCH(return new BlurRectBoxFilterBench(BIG);)
 DEF_BENCH(return new BlurRectBoxFilterBench(REALBIG);)
 DEF_BENCH(return new BlurRectBoxFilterBench(REAL);)
@@ skipping 32 matching lines @@
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(12));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(13));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(14));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(15));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(16));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(17));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(18));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(19));)
 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(20));)
 #endif