add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning
BUG=
R=robertphillips@google.com, senorblanco@chromium.org, vandebo@chromium.org
Review URL: https://codereview.chromium.org/51033004
git-svn-id: http://skia.googlecode.com/svn/trunk@12055 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/bicubicfilter.cpp b/gm/bicubicfilter.cpp
index c3f80df..7eb0aee 100644
--- a/gm/bicubicfilter.cpp
+++ b/gm/bicubicfilter.cpp
@@ -57,7 +57,7 @@
SkSize scale = SkSize::Make(sk32, sk32);
canvas->save();
canvas->scale(sk32, sk32);
- bilinearPaint.setFilterBitmap(true);
+ bilinearPaint.setFilterLevel(SkPaint::kLow_FilterLevel);
canvas->drawBitmap(fCheckerboard, 0, 0, &bilinearPaint);
canvas->restore();
SkAutoTUnref<SkImageFilter> bicubic(SkBicubicImageFilter::CreateMitchell(scale));
diff --git a/gm/bigmatrix.cpp b/gm/bigmatrix.cpp
index d414486..9b49a64 100644
--- a/gm/bigmatrix.cpp
+++ b/gm/bigmatrix.cpp
@@ -80,7 +80,7 @@
shader->setLocalMatrix(s);
paint.setShader(shader)->unref();
paint.setAntiAlias(false);
- paint.setFilterBitmap(true);
+ paint.setFilterLevel(SkPaint::kLow_FilterLevel);
rect.setLTRB(pt.fX - small, pt.fY - small,
pt.fX + small, pt.fY + small);
canvas->drawRect(rect, paint);
diff --git a/gm/bitmapfilters.cpp b/gm/bitmapfilters.cpp
index d74dbf5..f0153e4 100644
--- a/gm/bitmapfilters.cpp
+++ b/gm/bitmapfilters.cpp
@@ -39,7 +39,7 @@
static SkScalar draw_set(SkCanvas* c, const SkBitmap& bm, SkScalar x,
SkPaint* p) {
x += draw_bm(c, bm, x, 0, p);
- p->setFilterBitmap(true);
+ p->setFilterLevel(SkPaint::kLow_FilterLevel);
x += draw_bm(c, bm, x, 0, p);
p->setDither(true);
return x + draw_bm(c, bm, x, 0, p);
diff --git a/gm/bitmapmatrix.cpp b/gm/bitmapmatrix.cpp
index f89cc97..4609891 100644
--- a/gm/bitmapmatrix.cpp
+++ b/gm/bitmapmatrix.cpp
@@ -81,7 +81,7 @@
// SkGpuDevice::drawPath() -> SkGpuDevice::drawWithMaskFilter()
SkPaint paint;
- paint.setFilterBitmap(true);
+ paint.setFilterLevel(SkPaint::kLow_FilterLevel);
SkMaskFilter* mf = SkBlurMaskFilter::Create(
SkBlurMaskFilter::kNormal_BlurStyle,
diff --git a/gm/bleed.cpp b/gm/bleed.cpp
index 0d09394..aaca62b 100644
--- a/gm/bleed.cpp
+++ b/gm/bleed.cpp
@@ -91,7 +91,7 @@
SkRect dst = SkRect::MakeXYWH(0, 0, SkIntToScalar(kBlockSize), SkIntToScalar(kBlockSize));
SkPaint paint;
- paint.setFilterBitmap(filter);
+ paint.setFilterLevel(filter ? SkPaint::kLow_FilterLevel : SkPaint::kNone_FilterLevel);
canvas->save();
canvas->translate(SkIntToScalar(transX), SkIntToScalar(transY));
@@ -108,7 +108,7 @@
SkRect dst = SkRect::MakeXYWH(0, 0, SkIntToScalar(kBlockSize), SkIntToScalar(kBlockSize));
SkPaint paint;
- paint.setFilterBitmap(filter);
+ paint.setFilterLevel(filter ? SkPaint::kLow_FilterLevel : SkPaint::kNone_FilterLevel);
canvas->save();
canvas->translate(SkIntToScalar(transX), SkIntToScalar(transY));
@@ -125,7 +125,7 @@
SkRect dst = SkRect::MakeXYWH(0, 0, SkIntToScalar(kBlockSize), SkIntToScalar(kBlockSize));
SkPaint paint;
- paint.setFilterBitmap(filter);
+ paint.setFilterLevel(filter ? SkPaint::kLow_FilterLevel : SkPaint::kNone_FilterLevel);
canvas->save();
canvas->translate(SkIntToScalar(transX), SkIntToScalar(transY));
@@ -142,7 +142,7 @@
SkRect dst = SkRect::MakeXYWH(0, 0, SkIntToScalar(kBlockSize), SkIntToScalar(kBlockSize));
SkPaint paint;
- paint.setFilterBitmap(filter);
+ paint.setFilterLevel(filter ? SkPaint::kLow_FilterLevel : SkPaint::kNone_FilterLevel);
SkMaskFilter* mf = SkBlurMaskFilter::Create(SkBlurMaskFilter::kNormal_BlurStyle,
SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(3)));
paint.setMaskFilter(mf)->unref();
diff --git a/gm/blurquickreject.cpp b/gm/blurquickreject.cpp
index 070a59c..431f022 100644
--- a/gm/blurquickreject.cpp
+++ b/gm/blurquickreject.cpp
@@ -55,7 +55,7 @@
hairlinePaint.setStrokeWidth(0);
SkPaint blurPaint;
- blurPaint.setFilterBitmap(true);
+ blurPaint.setFilterLevel(SkPaint::kLow_FilterLevel);
SkMaskFilter* mf = SkBlurMaskFilter::Create(SkBlurMaskFilter::kNormal_BlurStyle,
SkBlurMask::ConvertRadiusToSigma(kBlurRadius));
blurPaint.setMaskFilter(mf)->unref();
diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp
index 106f6d3..c880063 100644
--- a/gm/drawbitmaprect.cpp
+++ b/gm/drawbitmaprect.cpp
@@ -163,7 +163,7 @@
SkBitmap bm;
bm = make_chessbm(5, 5);
- paint.setFilterBitmap(true);
+ paint.setFilterLevel(SkPaint::kLow_FilterLevel);
srcRect.setXYWH(1, 1, 3, 3);
SkMaskFilter* mf = SkBlurMaskFilter::Create(
diff --git a/gm/giantbitmap.cpp b/gm/giantbitmap.cpp
index 0d342b8..ab75dc7 100644
--- a/gm/giantbitmap.cpp
+++ b/gm/giantbitmap.cpp
@@ -110,7 +110,7 @@
s->setLocalMatrix(m);
paint.setShader(s)->unref();
- paint.setFilterBitmap(fDoFilter);
+ paint.setFilterLevel(fDoFilter ? SkPaint::kLow_FilterLevel : SkPaint::kNone_FilterLevel);
canvas->translate(SkIntToScalar(50), SkIntToScalar(50));
diff --git a/gm/ninepatchstretch.cpp b/gm/ninepatchstretch.cpp
index 551f020..bc6f13d 100644
--- a/gm/ninepatchstretch.cpp
+++ b/gm/ninepatchstretch.cpp
@@ -93,7 +93,7 @@
SkScalar y = SkIntToScalar(100);
SkPaint paint;
- paint.setFilterBitmap(true);
+ paint.setFilterLevel(SkPaint::kLow_FilterLevel);
for (int iy = 0; iy < 2; ++iy) {
for (int ix = 0; ix < 2; ++ix) {
diff --git a/gm/shadertext2.cpp b/gm/shadertext2.cpp
index e760e54..a7da436 100644
--- a/gm/shadertext2.cpp
+++ b/gm/shadertext2.cpp
@@ -102,7 +102,7 @@
SkPaint fillPaint;
fillPaint.setAntiAlias(true);
fillPaint.setTextSize(SkIntToScalar(kPointSize));
- fillPaint.setFilterBitmap(true);
+ fillPaint.setFilterLevel(SkPaint::kLow_FilterLevel);
fillPaint.setShader(shader);
SkPaint outlinePaint;
diff --git a/gm/shadertext3.cpp b/gm/shadertext3.cpp
index fa327c8..36abf9f 100644
--- a/gm/shadertext3.cpp
+++ b/gm/shadertext3.cpp
@@ -74,7 +74,7 @@
SkPaint bmpPaint;
bmpPaint.setAntiAlias(true);
- bmpPaint.setFilterBitmap(true);
+ bmpPaint.setFilterLevel(SkPaint::kLow_FilterLevel);
bmpPaint.setAlpha(0x80);
canvas->drawBitmap(bmp, 5.f, 5.f, &bmpPaint);
@@ -113,7 +113,7 @@
SkPaint fillPaint;
fillPaint.setAntiAlias(true);
fillPaint.setTextSize(SkIntToScalar(kPointSize));
- fillPaint.setFilterBitmap(true);
+ fillPaint.setFilterLevel(SkPaint::kLow_FilterLevel);
fillPaint.setShader(shader);
canvas->drawText(kText, kTextLen, 0, 0, fillPaint);
diff --git a/gm/tilemodes.cpp b/gm/tilemodes.cpp
index 5a5fbbe..dcfc133 100644
--- a/gm/tilemodes.cpp
+++ b/gm/tilemodes.cpp
@@ -47,7 +47,7 @@
SkShader::TileMode tmx, SkShader::TileMode tmy) {
SkShader* shader = SkShader::CreateBitmapShader(bm, tmx, tmy);
paint->setShader(shader)->unref();
- paint->setFilterBitmap(filter);
+ paint->setFilterLevel(filter ? SkPaint::kLow_FilterLevel : SkPaint::kNone_FilterLevel);
}
static const SkBitmap::Config gConfigs[] = {