diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-28 16:25:35 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-28 16:25:35 +0000 |
| commit | e396455d2d60ddf8e625b5037254f3c09fbcdcf5 (patch) | |
| tree | 9654912812c8b942b89124b1ae2aa36372818663 /bench/BlurBench.cpp | |
| parent | 2e0c32af0508a1e544c9953ea2fe128dbae7d429 (diff) | |
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
Diffstat (limited to 'bench/BlurBench.cpp')
| -rw-r--r-- | bench/BlurBench.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/bench/BlurBench.cpp b/bench/BlurBench.cpp index e7811d643d..ae31804deb 100644 --- a/bench/BlurBench.cpp +++ b/bench/BlurBench.cpp @@ -28,12 +28,12 @@ static const char* gStyleName[] = { class BlurBench : public SkBenchmark { SkScalar fRadius; - SkBlurMaskFilter::BlurStyle fStyle; - uint32_t fFlags; + SkBlurStyle fStyle; + uint32_t fFlags; SkString fName; public: - BlurBench(SkScalar rad, SkBlurMaskFilter::BlurStyle bs, uint32_t flags = 0) { + BlurBench(SkScalar rad, SkBlurStyle bs, uint32_t flags = 0) { fRadius = rad; fStyle = bs; fFlags = flags; @@ -78,32 +78,32 @@ private: typedef SkBenchmark INHERITED; }; -DEF_BENCH(return new BlurBench(SMALL, SkBlurMaskFilter::kNormal_BlurStyle);) -DEF_BENCH(return new BlurBench(SMALL, SkBlurMaskFilter::kSolid_BlurStyle);) -DEF_BENCH(return new BlurBench(SMALL, SkBlurMaskFilter::kOuter_BlurStyle);) -DEF_BENCH(return new BlurBench(SMALL, SkBlurMaskFilter::kInner_BlurStyle);) +DEF_BENCH(return new BlurBench(SMALL, kNormal_SkBlurStyle);) +DEF_BENCH(return new BlurBench(SMALL, kSolid_SkBlurStyle);) +DEF_BENCH(return new BlurBench(SMALL, kOuter_SkBlurStyle);) +DEF_BENCH(return new BlurBench(SMALL, kInner_SkBlurStyle);) -DEF_BENCH(return new BlurBench(BIG, SkBlurMaskFilter::kNormal_BlurStyle);) -DEF_BENCH(return new BlurBench(BIG, SkBlurMaskFilter::kSolid_BlurStyle);) -DEF_BENCH(return new BlurBench(BIG, SkBlurMaskFilter::kOuter_BlurStyle);) -DEF_BENCH(return new BlurBench(BIG, SkBlurMaskFilter::kInner_BlurStyle);) +DEF_BENCH(return new BlurBench(BIG, kNormal_SkBlurStyle);) +DEF_BENCH(return new BlurBench(BIG, kSolid_SkBlurStyle);) +DEF_BENCH(return new BlurBench(BIG, kOuter_SkBlurStyle);) +DEF_BENCH(return new BlurBench(BIG, kInner_SkBlurStyle);) -DEF_BENCH(return new BlurBench(REALBIG, SkBlurMaskFilter::kNormal_BlurStyle);) -DEF_BENCH(return new BlurBench(REALBIG, SkBlurMaskFilter::kSolid_BlurStyle);) -DEF_BENCH(return new BlurBench(REALBIG, SkBlurMaskFilter::kOuter_BlurStyle);) -DEF_BENCH(return new BlurBench(REALBIG, SkBlurMaskFilter::kInner_BlurStyle);) +DEF_BENCH(return new BlurBench(REALBIG, kNormal_SkBlurStyle);) +DEF_BENCH(return new BlurBench(REALBIG, kSolid_SkBlurStyle);) +DEF_BENCH(return new BlurBench(REALBIG, kOuter_SkBlurStyle);) +DEF_BENCH(return new BlurBench(REALBIG, kInner_SkBlurStyle);) -DEF_BENCH(return new BlurBench(REAL, SkBlurMaskFilter::kNormal_BlurStyle);) -DEF_BENCH(return new BlurBench(REAL, SkBlurMaskFilter::kSolid_BlurStyle);) -DEF_BENCH(return new BlurBench(REAL, SkBlurMaskFilter::kOuter_BlurStyle);) -DEF_BENCH(return new BlurBench(REAL, SkBlurMaskFilter::kInner_BlurStyle);) +DEF_BENCH(return new BlurBench(REAL, kNormal_SkBlurStyle);) +DEF_BENCH(return new BlurBench(REAL, kSolid_SkBlurStyle);) +DEF_BENCH(return new BlurBench(REAL, kOuter_SkBlurStyle);) +DEF_BENCH(return new BlurBench(REAL, kInner_SkBlurStyle);) -DEF_BENCH(return new BlurBench(SMALL, SkBlurMaskFilter::kNormal_BlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);) +DEF_BENCH(return new BlurBench(SMALL, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);) -DEF_BENCH(return new BlurBench(BIG, SkBlurMaskFilter::kNormal_BlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);) +DEF_BENCH(return new BlurBench(BIG, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);) -DEF_BENCH(return new BlurBench(REALBIG, SkBlurMaskFilter::kNormal_BlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);) +DEF_BENCH(return new BlurBench(REALBIG, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);) -DEF_BENCH(return new BlurBench(REAL, SkBlurMaskFilter::kNormal_BlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);) +DEF_BENCH(return new BlurBench(REAL, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);) -DEF_BENCH(return new BlurBench(0, SkBlurMaskFilter::kNormal_BlurStyle);) +DEF_BENCH(return new BlurBench(0, kNormal_SkBlurStyle);) |