SkPaint::FilterLevel -> SkFilterQuality

clone (+rebase) of https://codereview.chromium.org/1009183002/

BUG=skia:
TBR=scroggo@google.com

Review URL: https://codereview.chromium.org/1014533004

7 files changed, 24 insertions, 24 deletions

diff --git a/bench/AlternatingColorPatternBench.cpp b/bench/AlternatingColorPatternBench.cpp
index fccc494e69..3d812aa65a 100644
--- a/bench/AlternatingColorPatternBench.cpp
+++ b/bench/AlternatingColorPatternBench.cpp
@@ -149,7 +149,7 @@ protected:
     void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         paint.setAntiAlias(false);
-        paint.setFilterLevel(SkPaint::kLow_FilterLevel);
+        paint.setFilterQuality(kLow_SkFilterQuality);
 
         for (int i = 0; i < loops; ++i) {
             for (int j = 0; j < NUM_DRAWS; ++j) {
diff --git a/bench/Benchmark.cpp b/bench/Benchmark.cpp
index 6040f913ef..bf622b0683 100644
--- a/bench/Benchmark.cpp
+++ b/bench/Benchmark.cpp
@@ -53,7 +53,7 @@ void Benchmark::draw(const int loops, SkCanvas* canvas) {
 void Benchmark::setupPaint(SkPaint* paint) {
     paint->setAlpha(fForceAlpha);
     paint->setAntiAlias(true);
-    paint->setFilterLevel(SkPaint::kNone_FilterLevel);
+    paint->setFilterQuality(kNone_SkFilterQuality);
 
     paint->setFlags((paint->getFlags() & ~fClearMask) | fOrMask);
 
diff --git a/bench/BitmapBench.cpp b/bench/BitmapBench.cpp
index c5efe9e9b8..1ac1992ab6 100644
--- a/bench/BitmapBench.cpp
+++ b/bench/BitmapBench.cpp
@@ -257,13 +257,13 @@ protected:
         if (fFlags & kBicubic_Flag) {
             index |= 2;
         }
-        static const SkPaint::FilterLevel gLevels[] = {
-            SkPaint::kNone_FilterLevel,
-            SkPaint::kLow_FilterLevel,
-            SkPaint::kMedium_FilterLevel,
-            SkPaint::kHigh_FilterLevel
+        static const SkFilterQuality gQualitys[] = {
+            kNone_SkFilterQuality,
+            kLow_SkFilterQuality,
+            kMedium_SkFilterQuality,
+            kHigh_SkFilterQuality
         };
-        paint->setFilterLevel(gLevels[index]);
+        paint->setFilterQuality(gQualitys[index]);
 }
 
 private:
diff --git a/bench/BitmapRectBench.cpp b/bench/BitmapRectBench.cpp
index fb3ebdaf15..e2c2e345fc 100644
--- a/bench/BitmapRectBench.cpp
+++ b/bench/BitmapRectBench.cpp
@@ -42,17 +42,17 @@ class BitmapRectBench : public Benchmark {
     SkBitmap                fBitmap;
     bool                    fSlightMatrix;
     uint8_t                 fAlpha;
-    SkPaint::FilterLevel    fFilterLevel;
+    SkFilterQuality         fFilterQuality;
     SkString                fName;
     SkRect                  fSrcR, fDstR;
 
     static const int kWidth = 128;
     static const int kHeight = 128;
 public:
-    BitmapRectBench(U8CPU alpha, SkPaint::FilterLevel filterLevel,
+    BitmapRectBench(U8CPU alpha, SkFilterQuality filterQuality,
                     bool slightMatrix)  {
         fAlpha = SkToU8(alpha);
-        fFilterLevel = filterLevel;
+        fFilterQuality = filterQuality;
         fSlightMatrix = slightMatrix;
 
         fBitmap.setInfo(SkImageInfo::MakeN32Premul(kWidth, kHeight));
@@ -62,7 +62,7 @@ protected:
     const char* onGetName() SK_OVERRIDE {
         fName.printf("bitmaprect_%02X_%sfilter_%s",
                      fAlpha,
-                     SkPaint::kNone_FilterLevel == fFilterLevel ? "no" : "",
+                     kNone_SkFilterQuality == fFilterQuality ? "no" : "",
                      fSlightMatrix ? "trans" : "identity");
         return fName.c_str();
     }
@@ -92,7 +92,7 @@ protected:
 
         SkPaint paint;
         this->setupPaint(&paint);
-        paint.setFilterLevel(fFilterLevel);
+        paint.setFilterQuality(fFilterQuality);
         paint.setAlpha(fAlpha);
 
         for (int i = 0; i < loops; i++) {
@@ -104,10 +104,10 @@ private:
     typedef Benchmark INHERITED;
 };
 
-DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kNone_FilterLevel, false))
-DEF_BENCH(return new BitmapRectBench(0x80, SkPaint::kNone_FilterLevel, false))
-DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kLow_FilterLevel, false))
-DEF_BENCH(return new BitmapRectBench(0x80, SkPaint::kLow_FilterLevel, false))
+DEF_BENCH(return new BitmapRectBench(0xFF, kNone_SkFilterQuality, false))
+DEF_BENCH(return new BitmapRectBench(0x80, kNone_SkFilterQuality, false))
+DEF_BENCH(return new BitmapRectBench(0xFF, kLow_SkFilterQuality, false))
+DEF_BENCH(return new BitmapRectBench(0x80, kLow_SkFilterQuality, false))
 
-DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kNone_FilterLevel, true))
-DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kLow_FilterLevel, true))
+DEF_BENCH(return new BitmapRectBench(0xFF, kNone_SkFilterQuality, true))
+DEF_BENCH(return new BitmapRectBench(0xFF, kLow_SkFilterQuality, true))
diff --git a/bench/BitmapScaleBench.cpp b/bench/BitmapScaleBench.cpp
index e5cd5873a1..5bd5b522d9 100644
--- a/bench/BitmapScaleBench.cpp
+++ b/bench/BitmapScaleBench.cpp
@@ -92,7 +92,7 @@ protected:
         SkCanvas canvas( fOutputBitmap );
         SkPaint paint;
 
-        paint.setFilterLevel(SkPaint::kHigh_FilterLevel);
+        paint.setFilterQuality(kHigh_SkFilterQuality);
         fInputBitmap.notifyPixelsChanged();
         canvas.concat(fMatrix);
         canvas.drawBitmap(fInputBitmap, 0, 0, &paint );
diff --git a/bench/GameBench.cpp b/bench/GameBench.cpp
index bf70b5c0bb..eb1d9b909a 100644
--- a/bench/GameBench.cpp
+++ b/bench/GameBench.cpp
@@ -134,11 +134,11 @@ protected:
 
         SkPaint p;
         p.setColor(0xFF000000);
-        p.setFilterLevel(SkPaint::kLow_FilterLevel);
+        p.setFilterQuality(kLow_SkFilterQuality);
 
         SkPaint p2;         // for drawVertices path
         p2.setColor(0xFF000000);
-        p2.setFilterLevel(SkPaint::kLow_FilterLevel);
+        p2.setFilterQuality(kLow_SkFilterQuality);
         p2.setShader(SkShader::CreateBitmapShader(fAtlas,
                                                   SkShader::kClamp_TileMode,
                                                   SkShader::kClamp_TileMode))->unref();
diff --git a/bench/TileBench.cpp b/bench/TileBench.cpp
index 9acef8cfe7..cf35760727 100644
--- a/bench/TileBench.cpp
+++ b/bench/TileBench.cpp
@@ -83,8 +83,8 @@ protected:
     virtual void onDraw(const int loops, SkCanvas* canvas) {
         SkPaint paint(fPaint);
         this->setupPaint(&paint);
-        paint.setFilterLevel(fDoFilter ? SkPaint::kLow_FilterLevel
-                                       : SkPaint::kNone_FilterLevel);
+        paint.setFilterQuality(fDoFilter ? kLow_SkFilterQuality
+                                         : kNone_SkFilterQuality);
         if (fDoTrans) {
             paint.setColor(SkColorSetARGBMacro(0x80, 0xFF, 0xFF, 0xFF));
         }