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
diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp
index 102216d..ab87274 100644
--- a/tools/PictureRenderer.cpp
+++ b/tools/PictureRenderer.cpp
@@ -62,17 +62,11 @@
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 ada7bd4..262e899 100644
--- a/tools/PictureRenderer.h
+++ b/tools/PictureRenderer.h
@@ -55,10 +55,9 @@
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 3e3bc33..65fc42a 100644
--- a/tools/bench_pictures_main.cpp
+++ b/tools/bench_pictures_main.cpp
@@ -50,7 +50,6 @@
"verticalText",
"genA8FromLCD",
"blur",
- "lowBlur",
"hinting",
"slightHinting",
"AAClip",