commit b088947f27496a9b9dc48a7cfb170f9d59589825
author humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 09 21:37:14 2013 +0000
committer humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 09 21:37:14 2013 +0000
tree 4606872b30204e59a7e227850fc517add07b8ee3
parent 6e8b7ddefdac3793307782f8bdca8cf011288a06

New bitmap filter checkin; this time with less build breakage

BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@9944 2bbb7eff-a529-9590-31e7-b0007b416f81

bench/BitmapBench.cpp

diff --git a/bench/BitmapBench.cpp b/bench/BitmapBench.cpp
index 3bf6b77..d8363fc 100644
--- a/bench/BitmapBench.cpp
+++ b/bench/BitmapBench.cpp
@@ -149,7 +149,7 @@
         int count = N;
 #ifdef SK_RELEASE
         // in DEBUG, N is always 1
-        if (paint.getFlags() & SkPaint::kBicubicFilterBitmap_Flag) {
+        if (paint.getFlags() & SkPaint::kHighQualityFilterBitmap_Flag) {
             count /= BICUBIC_DUR_SCALE;
         }
 #endif
@@ -170,7 +170,7 @@
 #ifdef SK_DEBUG
         return 1;
 #else
-        return (paint.getFlags() & SkPaint::kBicubicFilterBitmap_Flag) ?
+        return (paint.getFlags() & SkPaint::kHighQualityFilterBitmap_Flag) ?
                 (float)BICUBIC_DUR_SCALE : 1;
 #endif
     }
@@ -266,12 +266,12 @@
         }
 
         uint32_t orMask = 0;
-        uint32_t clearMask = SkPaint::kFilterBitmap_Flag | SkPaint::kBicubicFilterBitmap_Flag;
+        uint32_t clearMask = SkPaint::kFilterBitmap_Flag | SkPaint::kHighQualityFilterBitmap_Flag;
         if (fFlags & kBilerp_Flag) {
             orMask |= SkPaint::kFilterBitmap_Flag;
         }
         if (fFlags & kBicubic_Flag) {
-            orMask |= SkPaint::kBicubicFilterBitmap_Flag;
+            orMask |= SkPaint::kHighQualityFilterBitmap_Flag;
         }
         this->setPaintMasks(orMask, clearMask);