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/tests/BlurTest.cpp b/tests/BlurTest.cpp
index 1e9f314..028b509 100644
--- a/tests/BlurTest.cpp
+++ b/tests/BlurTest.cpp
@@ -103,9 +103,8 @@
paint.setStrokeWidth(SkIntToScalar(strokeWidth));
SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(5));
- for (int style = 0; style < SkBlurMaskFilter::kBlurStyleCount; ++style) {
- SkBlurMaskFilter::BlurStyle blurStyle =
- static_cast<SkBlurMaskFilter::BlurStyle>(style);
+ for (int style = 0; style <= kLastEnum_SkBlurStyle; ++style) {
+ SkBlurStyle blurStyle = static_cast<SkBlurStyle>(style);
const uint32_t flagPermutations = SkBlurMaskFilter::kAll_BlurFlag;
for (uint32_t flags = 0; flags < flagPermutations; ++flags) {
@@ -169,7 +168,7 @@
memset(src.fImage, 0xff, src.computeTotalImageSize());
dst.fImage = NULL;
- SkBlurMask::BlurGroundTruth(sigma, &dst, src, SkBlurMask::kNormal_Style);
+ SkBlurMask::BlurGroundTruth(sigma, &dst, src, kNormal_SkBlurStyle);
int midX = dst.fBounds.centerX();
int midY = dst.fBounds.centerY();
@@ -231,7 +230,7 @@
SkPaint blurPaint;
blurPaint.setColor(SK_ColorWHITE);
- SkMaskFilter* filter = SkBlurMaskFilter::Create(SkBlurMaskFilter::kNormal_BlurStyle,
+ SkMaskFilter* filter = SkBlurMaskFilter::Create(kNormal_SkBlurStyle,
gaussianSigma,
SkBlurMaskFilter::kHighQuality_BlurFlag);
blurPaint.setMaskFilter(filter)->unref();