SkPaint::FilterLevel -> SkFilterQuality

gm/downsamplebitmap.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 
 #include "Resources.h"
@@ skipping 21 matching lines @@
 
 static void setTypeface(SkPaint* paint, const char name[], SkTypeface::Style style) {
     sk_tool_utils::set_portable_typeface(paint, name, style);
 }
 
 class DownsampleBitmapGM : public skiagm::GM {
 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:
 
     SkString onShortName() SK_OVERRIDE {
         return fName;
     }
 
     SkISize onISize() SK_OVERRIDE {
         make_bitmap_wrapper();
@@ skipping 14 matching lines @@
 
         int curY = 0;
         int curHeight;
         float curScale = 1;
         do {
 
             SkMatrix matrix;
             matrix.setScale( curScale, curScale );
 
             SkPaint paint;
-            paint.setFilterLevel(fFilterLevel);
+            paint.setFilterQuality(fFilterQuality);
 
             canvas->save();
             canvas->translate(0, (SkScalar)curY);
             canvas->concat(matrix);
             canvas->drawBitmap(fBM, 0, 0, &paint);
             canvas->restore();
 
             curHeight = (int) (fBM.height() * curScale + 2);
             curY += curHeight;
             curScale *= 0.75f;
         } while (curHeight >= 2 && curY < 4*fBM.height());
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 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:
       float fTextSize;
 
       void make_bitmap() SK_OVERRIDE {
           fBM.allocN32Pixels(int(fTextSize * 8), int(fTextSize * 6));
           SkCanvas canvas(fBM);
           canvas.drawColor(SK_ColorWHITE);
 
@@ skipping 10 matching lines @@
           canvas.drawText("Hamburgefons", 12, fTextSize/2, 3.6f*fTextSize, paint);
           setTypeface(&paint, "Times", SkTypeface::kBoldItalic);
           canvas.drawText("Hamburgefons", 12, fTextSize/2, 4.8f*fTextSize, paint);
       }
   private:
       typedef DownsampleBitmapGM INHERITED;
 };
 
 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:
       int fSize;
       int fNumChecks;
 
       void make_bitmap() SK_OVERRIDE {
           make_checker(&fBM, fSize, fNumChecks);
       }
   private:
       typedef DownsampleBitmapGM INHERITED;
 };
 
 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:
       SkString fFilename;
       int fSize;
 
       void make_bitmap() SK_OVERRIDE {
           SkImageDecoder* codec = NULL;
           SkString resourcePath = GetResourcePath(fFilename.c_str());
           SkFILEStream stream(resourcePath.c_str());
@@ skipping 64 matching lines @@
         }
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 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); )