add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning

bench/BitmapRectBench.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 "SkBenchmark.h"
 #include "SkBitmap.h"
 #include "SkPaint.h"
@@ skipping 21 matching lines @@
     canvas.drawRect(r, p);
 }
 
 /*  Variants for bitmaprect
     src : entire bitmap, subset, fractional subset
     dst : same size as src, diff size
     paint : filter-p
  */
 
 class BitmapRectBench : public SkBenchmark {
-    SkBitmap    fBitmap;
-    bool        fDoFilter;
-    bool        fSlightMatrix;
-    uint8_t     fAlpha;
-    SkString    fName;
-    SkRect      fSrcR, fDstR;
+    SkBitmap                fBitmap;
+    bool                    fSlightMatrix;
+    uint8_t                 fAlpha;
+    SkPaint::FilterLevel    fFilterLevel;
+    SkString                fName;
+    SkRect                  fSrcR, fDstR;
+
     static const int kWidth = 128;
     static const int kHeight = 128;
 public:
-    BitmapRectBench(U8CPU alpha, bool doFilter, bool slightMatrix)  {
+    BitmapRectBench(U8CPU alpha, SkPaint::FilterLevel filterLevel,
+                    bool slightMatrix)  {
         fAlpha = SkToU8(alpha);
-        fDoFilter = doFilter;
+        fFilterLevel = filterLevel;
         fSlightMatrix = slightMatrix;
 
         fBitmap.setConfig(SkBitmap::kARGB_8888_Config, kWidth, kHeight);
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         fName.printf("bitmaprect_%02X_%sfilter_%s",
-                     fAlpha, fDoFilter ? "" : "no",
+                     fAlpha,
+                     SkPaint::kNone_FilterLevel == fFilterLevel ? "no" : "",
                      fSlightMatrix ? "trans" : "identity");
         return fName.c_str();
     }
 
     virtual void onPreDraw() SK_OVERRIDE {
         fBitmap.allocPixels();
         fBitmap.setAlphaType(kOpaque_SkAlphaType);
         fBitmap.eraseColor(SK_ColorBLACK);
         draw_into_bitmap(fBitmap);
 
         fSrcR.iset(0, 0, kWidth, kHeight);
         fDstR.iset(0, 0, kWidth, kHeight);
 
         if (fSlightMatrix) {
             // want fractional translate
             fDstR.offset(SK_Scalar1 / 3, SK_Scalar1 * 5 / 7);
             // want enough to create a scale matrix, but not enough to scare
             // off our sniffer which tries to see if the matrix is "effectively"
             // translate-only.
             fDstR.fRight += SK_Scalar1 / (kWidth * 60);
         }
     }
 
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkRandom rand;
 
         SkPaint paint;
         this->setupPaint(&paint);
-        paint.setFilterBitmap(fDoFilter);
+        paint.setFilterLevel(fFilterLevel);
         paint.setAlpha(fAlpha);
 
         for (int i = 0; i < this->getLoops(); i++) {
             canvas->drawBitmapRectToRect(fBitmap, &fSrcR, fDstR, &paint);
         }
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
-DEF_BENCH(return new BitmapRectBench(0xFF, false, false))
-DEF_BENCH(return new BitmapRectBench(0x80, false, false))
-DEF_BENCH(return new BitmapRectBench(0xFF, true, false))
-DEF_BENCH(return new BitmapRectBench(0x80, true, false))
+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, false, true))
-DEF_BENCH(return new BitmapRectBench(0xFF, true, true))
+DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kNone_FilterLevel, true))
+DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kLow_FilterLevel, true))