diff options
| author | reed <reed@google.com> | 2015-03-17 06:16:24 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-17 13:16:49 +0000 |
| commit | 55801f247a04f03828e72619cb3d45d694d8d025 (patch) | |
| tree | 8919fdf20391cfe3d332b794181ae3a3c3359147 /skia | |
| parent | 168f3dccd82fc0274ac3f573f1607d23b3fe8181 (diff) | |
| download | chromium_src-55801f247a04f03828e72619cb3d45d694d8d025.zip chromium_src-55801f247a04f03828e72619cb3d45d694d8d025.tar.gz chromium_src-55801f247a04f03828e72619cb3d45d694d8d025.tar.bz2 | |
stop using deprecated SkPaint::FilterLevel
needs https://codereview.chromium.org/1013803002/ to land and roll into chrome.
BUG=
Review URL: https://codereview.chromium.org/1011683006
Cr-Commit-Position: refs/heads/master@{#320909}
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/config/SkUserConfig.h | 4 | ||||
| -rw-r--r-- | skia/ext/benchmarking_canvas.cc | 13 | ||||
| -rw-r--r-- | skia/ext/opacity_draw_filter.cc | 2 |
3 files changed, 8 insertions, 11 deletions
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h index f9ab633..6db5919 100644 --- a/skia/config/SkUserConfig.h +++ b/skia/config/SkUserConfig.h @@ -261,10 +261,6 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal, # define SK_IGNORE_ETC1_SUPPORT #endif -#ifndef SK_SUPPORT_LEGACY_FILTERLEVEL_ENUM -# define SK_SUPPORT_LEGACY_FILTERLEVEL_ENUM -#endif - #ifndef SK_IGNORE_GPU_DITHER # define SK_IGNORE_GPU_DITHER #endif diff --git a/skia/ext/benchmarking_canvas.cc b/skia/ext/benchmarking_canvas.cc index dbe851a..fb6f7ad 100644 --- a/skia/ext/benchmarking_canvas.cc +++ b/skia/ext/benchmarking_canvas.cc @@ -244,12 +244,13 @@ scoped_ptr<base::Value> AsValue(const SkPaint& paint) { val->SetString("Flags", builder.str()); } - if (paint.getFilterLevel() != default_paint.getFilterLevel()) { - static const char* gFilterLevelStrings[] = - { "None", "Low", "Medium", "High" }; - DCHECK_LT(static_cast<size_t>(paint.getFilterLevel()), - SK_ARRAY_COUNT(gFilterLevelStrings)); - val->SetString("FilterLevel", gFilterLevelStrings[paint.getFilterLevel()]); + if (paint.getFilterQuality() != default_paint.getFilterQuality()) { + static const char* gFilterQualityStrings[] = { + "None", "Low", "Medium", "High"}; + DCHECK_LT(static_cast<size_t>(paint.getFilterQuality()), + SK_ARRAY_COUNT(gFilterQualityStrings)); + val->SetString("FilterLevel", + gFilterQualityStrings[paint.getFilterQuality()]); } if (paint.getTextSize() != default_paint.getTextSize()) diff --git a/skia/ext/opacity_draw_filter.cc b/skia/ext/opacity_draw_filter.cc index 99736f3..10ed9e8 100644 --- a/skia/ext/opacity_draw_filter.cc +++ b/skia/ext/opacity_draw_filter.cc @@ -18,7 +18,7 @@ bool OpacityDrawFilter::filter(SkPaint* paint, Type type) { if (alpha_ < 255) paint->setAlpha(alpha_); if (disable_image_filtering_) - paint->setFilterLevel(SkPaint::kNone_FilterLevel); + paint->setFilterQuality(kNone_SkFilterQuality); return true; } |