Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning"
This reverts commit 1d22c4aaf9d8f053f25194a1ed74b137bfb19497.
git-svn-id: http://skia.googlecode.com/svn/trunk@12056 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/BitmapRectBench.cpp b/bench/BitmapRectBench.cpp
index 6029aeb..104cb24 100644
--- a/bench/BitmapRectBench.cpp
+++ b/bench/BitmapRectBench.cpp
@@ -39,20 +39,18 @@
*/
class BitmapRectBench : public SkBenchmark {
- SkBitmap fBitmap;
- bool fSlightMatrix;
- uint8_t fAlpha;
- SkPaint::FilterLevel fFilterLevel;
- SkString fName;
- SkRect fSrcR, fDstR;
-
+ SkBitmap fBitmap;
+ bool fDoFilter;
+ bool fSlightMatrix;
+ uint8_t fAlpha;
+ SkString fName;
+ SkRect fSrcR, fDstR;
static const int kWidth = 128;
static const int kHeight = 128;
public:
- BitmapRectBench(U8CPU alpha, SkPaint::FilterLevel filterLevel,
- bool slightMatrix) {
+ BitmapRectBench(U8CPU alpha, bool doFilter, bool slightMatrix) {
fAlpha = SkToU8(alpha);
- fFilterLevel = filterLevel;
+ fDoFilter = doFilter;
fSlightMatrix = slightMatrix;
fBitmap.setConfig(SkBitmap::kARGB_8888_Config, kWidth, kHeight);
@@ -61,8 +59,7 @@
protected:
virtual const char* onGetName() SK_OVERRIDE {
fName.printf("bitmaprect_%02X_%sfilter_%s",
- fAlpha,
- SkPaint::kNone_FilterLevel == fFilterLevel ? "no" : "",
+ fAlpha, fDoFilter ? "" : "no",
fSlightMatrix ? "trans" : "identity");
return fName.c_str();
}
@@ -92,7 +89,7 @@
SkPaint paint;
this->setupPaint(&paint);
- paint.setFilterLevel(fFilterLevel);
+ paint.setFilterBitmap(fDoFilter);
paint.setAlpha(fAlpha);
for (int i = 0; i < this->getLoops(); i++) {
@@ -104,10 +101,10 @@
typedef SkBenchmark 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, 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, true))
-DEF_BENCH(return new BitmapRectBench(0xFF, SkPaint::kLow_FilterLevel, true))
+DEF_BENCH(return new BitmapRectBench(0xFF, false, true))
+DEF_BENCH(return new BitmapRectBench(0xFF, true, true))