diff options
author | reed <reed@google.com> | 2015-03-16 10:08:34 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-16 10:08:34 -0700 |
commit | 93a1215fe0ab007ce941c721f1fd3e9dcb5d4754 (patch) | |
tree | d6dfbb67e08a7f3163008787a10c1ec9b492e291 /gm/downsamplebitmap.cpp | |
parent | 903dcb08b146cbaf81420a734a64692038b467ca (diff) |
SkPaint::FilterLevel -> SkFilterQuality
clone (+rebase) of https://codereview.chromium.org/1009183002/
BUG=skia:
TBR=scroggo@google.com
Review URL: https://codereview.chromium.org/1014533004
Diffstat (limited to 'gm/downsamplebitmap.cpp')
-rw-r--r-- | gm/downsamplebitmap.cpp | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/gm/downsamplebitmap.cpp b/gm/downsamplebitmap.cpp index 15280f23e3..9523e068a4 100644 --- a/gm/downsamplebitmap.cpp +++ b/gm/downsamplebitmap.cpp @@ -39,20 +39,20 @@ public: SkBitmap fBM; SkString fName; bool fBitmapMade; - SkPaint::FilterLevel fFilterLevel; + SkFilterQuality fFilterQuality; - DownsampleBitmapGM(SkPaint::FilterLevel filterLevel) - : fFilterLevel(filterLevel) + DownsampleBitmapGM(SkFilterQuality filterQuality) + : fFilterQuality(filterQuality) { this->setBGColor(0xFFDDDDDD); fBitmapMade = false; } - const char* filterLevelToString() { - static const char *filterLevelNames[] = { + const char* filterQualityToString() { + static const char *filterQualityNames[] = { "none", "low", "medium", "high" }; - return filterLevelNames[fFilterLevel]; + return filterQualityNames[fFilterQuality]; } protected: @@ -87,7 +87,7 @@ protected: matrix.setScale( curScale, curScale ); SkPaint paint; - paint.setFilterLevel(fFilterLevel); + paint.setFilterQuality(fFilterQuality); canvas->save(); canvas->translate(0, (SkScalar)curY); @@ -107,10 +107,10 @@ private: class DownsampleBitmapTextGM: public DownsampleBitmapGM { public: - DownsampleBitmapTextGM(float textSize, SkPaint::FilterLevel filterLevel) - : INHERITED(filterLevel), fTextSize(textSize) + DownsampleBitmapTextGM(float textSize, SkFilterQuality filterQuality) + : INHERITED(filterQuality), fTextSize(textSize) { - fName.printf("downsamplebitmap_text_%s_%.2fpt", this->filterLevelToString(), fTextSize); + fName.printf("downsamplebitmap_text_%s_%.2fpt", this->filterQualityToString(), fTextSize); } protected: @@ -141,10 +141,10 @@ class DownsampleBitmapTextGM: public DownsampleBitmapGM { class DownsampleBitmapCheckerboardGM: public DownsampleBitmapGM { public: - DownsampleBitmapCheckerboardGM(int size, int numChecks, SkPaint::FilterLevel filterLevel) - : INHERITED(filterLevel), fSize(size), fNumChecks(numChecks) + DownsampleBitmapCheckerboardGM(int size, int numChecks, SkFilterQuality filterQuality) + : INHERITED(filterQuality), fSize(size), fNumChecks(numChecks) { - fName.printf("downsamplebitmap_checkerboard_%s_%d_%d", this->filterLevelToString(), fSize, fNumChecks); + fName.printf("downsamplebitmap_checkerboard_%s_%d_%d", this->filterQualityToString(), fSize, fNumChecks); } protected: @@ -160,10 +160,10 @@ class DownsampleBitmapCheckerboardGM: public DownsampleBitmapGM { class DownsampleBitmapImageGM: public DownsampleBitmapGM { public: - DownsampleBitmapImageGM(const char filename[], SkPaint::FilterLevel filterLevel) - : INHERITED(filterLevel), fFilename(filename) + DownsampleBitmapImageGM(const char filename[], SkFilterQuality filterQuality) + : INHERITED(filterQuality), fFilename(filename) { - fName.printf("downsamplebitmap_image_%s_%s", this->filterLevelToString(), filename); + fName.printf("downsamplebitmap_image_%s_%s", this->filterQualityToString(), filename); } protected: @@ -248,26 +248,26 @@ DEF_GM( return new ShowMipLevels; ) ////////////////////////////////////////////////////////////////////////////// -DEF_GM( return new DownsampleBitmapTextGM(72, SkPaint::kHigh_FilterLevel); ) -DEF_GM( return new DownsampleBitmapCheckerboardGM(512,256, SkPaint::kHigh_FilterLevel); ) -DEF_GM( return new DownsampleBitmapImageGM("mandrill_512.png", SkPaint::kHigh_FilterLevel); ) +DEF_GM( return new DownsampleBitmapTextGM(72, kHigh_SkFilterQuality); ) +DEF_GM( return new DownsampleBitmapCheckerboardGM(512,256, kHigh_SkFilterQuality); ) +DEF_GM( return new DownsampleBitmapImageGM("mandrill_512.png", kHigh_SkFilterQuality); ) DEF_GM( return new DownsampleBitmapImageGM("mandrill_132x132_12x12.astc", - SkPaint::kHigh_FilterLevel); ) + kHigh_SkFilterQuality); ) -DEF_GM( return new DownsampleBitmapTextGM(72, SkPaint::kMedium_FilterLevel); ) -DEF_GM( return new DownsampleBitmapCheckerboardGM(512,256, SkPaint::kMedium_FilterLevel); ) -DEF_GM( return new DownsampleBitmapImageGM("mandrill_512.png", SkPaint::kMedium_FilterLevel); ) +DEF_GM( return new DownsampleBitmapTextGM(72, kMedium_SkFilterQuality); ) +DEF_GM( return new DownsampleBitmapCheckerboardGM(512,256, kMedium_SkFilterQuality); ) +DEF_GM( return new DownsampleBitmapImageGM("mandrill_512.png", kMedium_SkFilterQuality); ) DEF_GM( return new DownsampleBitmapImageGM("mandrill_132x132_12x12.astc", - SkPaint::kMedium_FilterLevel); ) + kMedium_SkFilterQuality); ) -DEF_GM( return new DownsampleBitmapTextGM(72, SkPaint::kLow_FilterLevel); ) -DEF_GM( return new DownsampleBitmapCheckerboardGM(512,256, SkPaint::kLow_FilterLevel); ) -DEF_GM( return new DownsampleBitmapImageGM("mandrill_512.png", SkPaint::kLow_FilterLevel); ) +DEF_GM( return new DownsampleBitmapTextGM(72, kLow_SkFilterQuality); ) +DEF_GM( return new DownsampleBitmapCheckerboardGM(512,256, kLow_SkFilterQuality); ) +DEF_GM( return new DownsampleBitmapImageGM("mandrill_512.png", kLow_SkFilterQuality); ) DEF_GM( return new DownsampleBitmapImageGM("mandrill_132x132_12x12.astc", - SkPaint::kLow_FilterLevel); ) + kLow_SkFilterQuality); ) -DEF_GM( return new DownsampleBitmapTextGM(72, SkPaint::kNone_FilterLevel); ) -DEF_GM( return new DownsampleBitmapCheckerboardGM(512,256, SkPaint::kNone_FilterLevel); ) -DEF_GM( return new DownsampleBitmapImageGM("mandrill_512.png", SkPaint::kNone_FilterLevel); ) +DEF_GM( return new DownsampleBitmapTextGM(72, kNone_SkFilterQuality); ) +DEF_GM( return new DownsampleBitmapCheckerboardGM(512,256, kNone_SkFilterQuality); ) +DEF_GM( return new DownsampleBitmapImageGM("mandrill_512.png", kNone_SkFilterQuality); ) DEF_GM( return new DownsampleBitmapImageGM("mandrill_132x132_12x12.astc", - SkPaint::kNone_FilterLevel); ) + kNone_SkFilterQuality); ) |