diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-18 18:20:44 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-18 18:20:44 +0000 |
| commit | 457d8a77bed0160519fc5dfb67d0e02f9c3950a2 (patch) | |
| tree | 24ed1690145c2e9fa0bf2b5f6e658285361bab1f /tools | |
| parent | fdba4041c350b72791a1844ff0bc0af28cbb4199 (diff) | |
remove experimental setAsABlur, as it forces the instance to be mutable, and was
not adopted by chrome
Review URL: https://codereview.appspot.com/6939071
git-svn-id: http://skia.googlecode.com/svn/trunk@6879 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/PictureRenderer.cpp | 10 | ||||
| -rw-r--r-- | tools/PictureRenderer.h | 7 | ||||
| -rw-r--r-- | tools/bench_pictures_main.cpp | 1 |
3 files changed, 5 insertions, 13 deletions
diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp index 102216d595..ab8727470c 100644 --- a/tools/PictureRenderer.cpp +++ b/tools/PictureRenderer.cpp @@ -62,17 +62,11 @@ public: virtual bool filter(SkPaint* paint, Type t) { paint->setFlags(paint->getFlags() & ~fFlags[t] & SkPaint::kAllFlags); - if ((PictureRenderer::kBlur_DrawFilterFlag | PictureRenderer::kLowBlur_DrawFilterFlag) - & fFlags[t]) { + if (PictureRenderer::kBlur_DrawFilterFlag & fFlags[t]) { SkMaskFilter* maskFilter = paint->getMaskFilter(); SkMaskFilter::BlurInfo blurInfo; if (maskFilter && maskFilter->asABlur(&blurInfo)) { - if (PictureRenderer::kBlur_DrawFilterFlag & fFlags[t]) { - paint->setMaskFilter(NULL); - } else { - blurInfo.fHighQuality = false; - maskFilter->setAsABlur(blurInfo); - } + paint->setMaskFilter(NULL); } } if (PictureRenderer::kHinting_DrawFilterFlag & fFlags[t]) { diff --git a/tools/PictureRenderer.h b/tools/PictureRenderer.h index ada7bd4220..262e8997e6 100644 --- a/tools/PictureRenderer.h +++ b/tools/PictureRenderer.h @@ -55,10 +55,9 @@ public: enum DrawFilterFlags { kNone_DrawFilterFlag = 0, kBlur_DrawFilterFlag = 0x4000, // toggles between blur and no blur - kLowBlur_DrawFilterFlag = 0x8000, // toggles between low and high quality blur - kHinting_DrawFilterFlag = 0x10000, // toggles between no hinting and normal hinting - kSlightHinting_DrawFilterFlag = 0x20000, // toggles between slight and normal hinting - kAAClip_DrawFilterFlag = 0x40000, // toggles between soft and hard clip + kHinting_DrawFilterFlag = 0x8000, // toggles between no hinting and normal hinting + kSlightHinting_DrawFilterFlag = 0x10000, // toggles between slight and normal hinting + kAAClip_DrawFilterFlag = 0x20000, // toggles between soft and hard clip }; SK_COMPILE_ASSERT(!(kBlur_DrawFilterFlag & SkPaint::kAllFlags), blur_flag_must_be_greater); diff --git a/tools/bench_pictures_main.cpp b/tools/bench_pictures_main.cpp index 3e3bc33ad5..65fc42ad36 100644 --- a/tools/bench_pictures_main.cpp +++ b/tools/bench_pictures_main.cpp @@ -50,7 +50,6 @@ static char const * const gFilterFlags[] = { "verticalText", "genA8FromLCD", "blur", - "lowBlur", "hinting", "slightHinting", "AAClip", |