move common blur types into central header
BUG=skia:
R=scroggo@google.com, djsollen@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/253833002
git-svn-id: http://skia.googlecode.com/svn/trunk@14411 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/blurs.cpp b/gm/blurs.cpp
index c2a1c17..822d488 100644
--- a/gm/blurs.cpp
+++ b/gm/blurs.cpp
@@ -27,16 +27,16 @@
}
virtual void onDraw(SkCanvas* canvas) {
- SkBlurMaskFilter::BlurStyle NONE = SkBlurMaskFilter::BlurStyle(-999);
+ SkBlurStyle NONE = SkBlurStyle(-999);
static const struct {
- SkBlurMaskFilter::BlurStyle fStyle;
- int fCx, fCy;
+ SkBlurStyle fStyle;
+ int fCx, fCy;
} gRecs[] = {
- { NONE, 0, 0 },
- { SkBlurMaskFilter::kInner_BlurStyle, -1, 0 },
- { SkBlurMaskFilter::kNormal_BlurStyle, 0, 1 },
- { SkBlurMaskFilter::kSolid_BlurStyle, 0, -1 },
- { SkBlurMaskFilter::kOuter_BlurStyle, 1, 0 },
+ { NONE, 0, 0 },
+ { kInner_SkBlurStyle, -1, 0 },
+ { kNormal_SkBlurStyle, 0, 1 },
+ { kSolid_SkBlurStyle, 0, -1 },
+ { kOuter_SkBlurStyle, 1, 0 },
};
SkPaint paint;
@@ -64,7 +64,7 @@
}
// draw text
{
- SkMaskFilter* mf = SkBlurMaskFilter::Create(SkBlurMaskFilter::kNormal_BlurStyle,
+ SkMaskFilter* mf = SkBlurMaskFilter::Create(kNormal_SkBlurStyle,
SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(4)),
flags);
paint.setMaskFilter(mf)->unref();