Revert "Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning""
This reverts commit 1e787c38fa71f2a21fd728f1b1d620b9b09b0d3d.
BUG=
Review URL: https://codereview.chromium.org/54603004
git-svn-id: http://skia.googlecode.com/svn/trunk@12057 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/BitmapRectBench.cpp b/bench/BitmapRectBench.cpp
index 104cb24..6029aeb 100644
--- a/bench/BitmapRectBench.cpp
+++ b/bench/BitmapRectBench.cpp
@@ -39,18 +39,20 @@
*/
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);
@@ -59,7 +61,8 @@
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();
}
@@ -89,7 +92,7 @@
SkPaint paint;
this->setupPaint(&paint);
- paint.setFilterBitmap(fDoFilter);
+ paint.setFilterLevel(fFilterLevel);
paint.setAlpha(fAlpha);
for (int i = 0; i < this->getLoops(); i++) {
@@ -101,10 +104,10 @@
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))