SkPaint::FilterLevel -> SkFilterQuality

gm/tilemodes_scaled.cpp

 
 /*
  * Copyright 2011 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 "SkPath.h"
 #include "SkRegion.h"
@@ skipping 17 matching lines @@
     SkColor     colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE };
     SkScalar    pos[] = { 0, SK_Scalar1/2, SK_Scalar1 };
     SkPaint     paint;
 
     paint.setDither(true);
     paint.setShader(SkGradientShader::CreateLinear(pts, colors, pos,
                 SK_ARRAY_COUNT(colors), SkShader::kClamp_TileMode))->unref();
     canvas.drawPaint(paint);
 }
 
-static void setup(SkPaint* paint, const SkBitmap& bm, SkPaint::FilterLevel filter_level,
+static void setup(SkPaint* paint, const SkBitmap& bm, SkFilterQuality filter_level,
                   SkShader::TileMode tmx, SkShader::TileMode tmy) {
     SkShader* shader = SkShader::CreateBitmapShader(bm, tmx, tmy);
     paint->setShader(shader)->unref();
-    paint->setFilterLevel(filter_level);
+    paint->setFilterQuality(filter_level);
 }
 
 static const SkColorType gColorTypes[] = {
     kN32_SkColorType,
     kRGB_565_SkColorType,
 };
 
 class ScaledTilingGM : public skiagm::GM {
     SkAutoTUnref<SkBlurDrawLooper> fLooper;
 public:
@@ skipping 31 matching lines @@
 
     void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         float scale = 32.f/kPOTSize;
 
         int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize;
 
         SkRect r = { 0, 0, SkIntToScalar(size*2), SkIntToScalar(size*2) };
 
         static const char* gColorTypeNames[] = { "8888" , "565", "4444" };
 
-        static const SkPaint::FilterLevel           gFilterLevels[] =
-            { SkPaint::kNone_FilterLevel,
-              SkPaint::kLow_FilterLevel,
-              SkPaint::kMedium_FilterLevel,
-              SkPaint::kHigh_FilterLevel };
-        static const char*          gFilterNames[] = { "None", "Low", "Medium", "High" };
+        static const SkFilterQuality gFilterQualitys[] =
+            { kNone_SkFilterQuality,
+              kLow_SkFilterQuality,
+              kMedium_SkFilterQuality,
+              kHigh_SkFilterQuality };
+        static const char* gFilterNames[] = { "None", "Low", "Medium", "High" };
 
         static const SkShader::TileMode gModes[] = { SkShader::kClamp_TileMode, SkShader::kRepeat_TileMode, SkShader::kMirror_TileMode };
         static const char*          gModeNames[] = {    "C",                    "R",                   "M" };
 
         SkScalar y = SkIntToScalar(24);
         SkScalar x = SkIntToScalar(10)/scale;
 
         for (size_t kx = 0; kx < SK_ARRAY_COUNT(gModes); kx++) {
             for (size_t ky = 0; ky < SK_ARRAY_COUNT(gModes); ky++) {
                 SkPaint p;
                 SkString str;
                 p.setAntiAlias(true);
                 sk_tool_utils::set_portable_typeface(&p);
                 p.setDither(true);
                 p.setLooper(fLooper);
                 str.printf("[%s,%s]", gModeNames[kx], gModeNames[ky]);
 
                 p.setTextAlign(SkPaint::kCenter_Align);
                 canvas->drawText(str.c_str(), str.size(), scale*(x + r.width()/2), y, p);
 
                 x += r.width() * 4 / 3;
             }
         }
 
         y = SkIntToScalar(40) / scale;
 
         for (size_t i = 0; i < SK_ARRAY_COUNT(gColorTypes); i++) {
-            for (size_t j = 0; j < SK_ARRAY_COUNT(gFilterLevels); j++) {
+            for (size_t j = 0; j < SK_ARRAY_COUNT(gFilterQualitys); j++) {
                 x = SkIntToScalar(10)/scale;
                 for (size_t kx = 0; kx < SK_ARRAY_COUNT(gModes); kx++) {
                     for (size_t ky = 0; ky < SK_ARRAY_COUNT(gModes); ky++) {
                         SkPaint paint;
 #if 1 // Temporary change to regen bitmap before each draw. This may help tracking down an issue
       // on SGX where resizing NPOT textures to POT textures exhibits a driver bug.
                         if (!fPowerOfTwoSize) {
                             makebm(&fTexture[i], gColorTypes[i], size, size);
                         }
 #endif
-                        setup(&paint, fTexture[i], gFilterLevels[j], gModes[kx], gModes[ky]);
+                        setup(&paint, fTexture[i], gFilterQualitys[j], gModes[kx], gModes[ky]);
                         paint.setDither(true);
 
                         canvas->save();
                         canvas->scale(scale,scale);
                         canvas->translate(x, y);
                         canvas->drawRect(r, paint);
                         canvas->restore();
 
                         x += r.width() * 4 / 3;
                     }
@@ skipping 120 matching lines @@
 private:
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new ScaledTilingGM(true); )
 DEF_GM( return new ScaledTilingGM(false); )
 DEF_GM( return new ScaledTiling2GM(make_bm, "bitmap"); )
 DEF_GM( return new ScaledTiling2GM(make_grad, "gradient"); )