move common blur types into central header

gm/blurroundrect.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 "gm.h"
 #include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
@@ skipping 45 matching lines @@
         SkLayerDrawLooper::Builder looperBuilder;
         {
             SkLayerDrawLooper::LayerInfo info;
             info.fPaintBits = SkLayerDrawLooper::kMaskFilter_Bit
                               | SkLayerDrawLooper::kColorFilter_Bit;
             info.fColorMode = SkXfermode::kSrc_Mode;
             info.fOffset = SkPoint::Make(SkIntToScalar(-1), SkIntToScalar(0));
             info.fPostTranslate = false;
             SkPaint* paint = looperBuilder.addLayerOnTop(info);
             SkMaskFilter* maskFilter = SkBlurMaskFilter::Create(
-                    SkBlurMaskFilter::kNormal_BlurStyle,
+                    kNormal_SkBlurStyle,
                     SkBlurMask::ConvertRadiusToSigma(SK_ScalarHalf),
                     SkBlurMaskFilter::kHighQuality_BlurFlag);
             paint->setMaskFilter(maskFilter)->unref();
             SkColorFilter* colorFilter = SkColorFilter::CreateModeFilter(SK_ColorLTGRAY,
                     SkXfermode::kSrcIn_Mode);
             paint->setColorFilter(colorFilter)->unref();
             paint->setColor(SK_ColorGRAY);
         }
         {
             SkLayerDrawLooper::LayerInfo info;
@@ skipping 37 matching lines @@
         canvas->translate(50,50);
 
         const float blurRadii[] = { 1,5,10,20 };
         const int cornerRadii[] = { 1,5,10,20 };
         const SkRect r = SkRect::MakeWH(SkIntToScalar(100), SkIntToScalar(100));
         for (size_t i = 0; i < SK_ARRAY_COUNT(blurRadii); ++i) {
             SkAutoCanvasRestore autoRestore(canvas, true);
             canvas->translate(0, (r.height() + SkIntToScalar(50)) * i);
             for (size_t j = 0; j < SK_ARRAY_COUNT(cornerRadii); ++j) {
                 SkMaskFilter* filter = SkBlurMaskFilter::Create(
-                    SkBlurMaskFilter::kNormal_BlurStyle,
+                    kNormal_SkBlurStyle,
                     SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(blurRadii[i])),
                     SkBlurMaskFilter::kHighQuality_BlurFlag);
                 SkPaint paint;
                 paint.setColor(SK_ColorBLACK);
                 paint.setMaskFilter(filter)->unref();
 
                 SkRRect rrect;
                 rrect.setRectXY(r, SkIntToScalar(cornerRadii[j]), SkIntToScalar(cornerRadii[j]));
                 canvas->drawRRect(rrect, paint);
                 canvas->translate(r.width() + SkIntToScalar(50), 0);
@@ skipping 11 matching lines @@
 // TODO(scroggo): Disabled in an attempt to rememdy
 // https://code.google.com/p/skia/issues/detail?id=1801 ('Win7 Test bots all failing GenerateGMs:
 // ran wrong number of tests')
 //DEF_GM(return new BlurRoundRectGM(600, 5514, 6);)
 
 // Rounded rect with two opposite corners with large radii, the other two
 // small.
 DEF_GM(return new BlurRoundRectGM(100, 100);)
 
 DEF_GM(return new SimpleBlurRoundRectGM();)