commit 82abeceef966279e0f33d7d1b8cf8ebf4a298d3d
author Mike Reed <reed@google.com> Sat Dec 12 09:51:11 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sat Dec 12 15:36:21 2020 +0000
tree 039b6dbf3eb017eac24cd38be3fc584e432c0c4a
parent 1aa1f5fcbac60351ea0a3cb76480c63a1b61f511

Bitmap should use sampling options

Change-Id: I611969d4707009411f20b74debad7655ac364eb8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/343596
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>

samplecode/SampleAARectModes.cpp

diff --git a/samplecode/SampleAARectModes.cpp b/samplecode/SampleAARectModes.cpp
index a3c5ea3..99d8f77 100644
--- a/samplecode/SampleAARectModes.cpp
+++ b/samplecode/SampleAARectModes.cpp
@@ -62,10 +62,8 @@
     *bm.getAddr32(1, 0) = *bm.getAddr32(0, 1) = SkPackARGB32(0xFF, 0xCC,
                                                              0xCC, 0xCC);
 
-    SkMatrix m;
-    m.setScale(SkIntToScalar(6), SkIntToScalar(6));
-
-    return bm.makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat, &m);
+    return bm.makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat, SkSamplingOptions(),
+                         SkMatrix::Scale(6, 6));
 }
 
 class AARectsModesView : public Sample {

samplecode/SampleAARects.cpp

diff --git a/samplecode/SampleAARects.cpp b/samplecode/SampleAARects.cpp
index d22eb7a..b7cc5e8 100644
--- a/samplecode/SampleAARects.cpp
+++ b/samplecode/SampleAARects.cpp
@@ -49,7 +49,8 @@
         SkPaint bluePaint;
         bluePaint.setARGB(0xff, 0x0, 0x0, 0xff);
         SkPaint bmpPaint;
-        bmpPaint.setShader(fBitmap.makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat));
+        bmpPaint.setShader(fBitmap.makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat,
+                                              SkSamplingOptions()));
         bluePaint.setStrokeWidth(3);
         bmpPaint.setStrokeWidth(3);
 

samplecode/SampleCamera.cpp

diff --git a/samplecode/SampleCamera.cpp b/samplecode/SampleCamera.cpp
index 38201eb..d150a63 100644
--- a/samplecode/SampleCamera.cpp
+++ b/samplecode/SampleCamera.cpp
@@ -37,7 +37,9 @@
                 SkRect dst = { -150, -150, 150, 150 };
                 SkMatrix matrix;
                 matrix.setRectToRect(src, dst, SkMatrix::kFill_ScaleToFit);
-                fShaders.push_back(bm.makeShader(&matrix));
+                fShaders.push_back(bm.makeShader(SkSamplingOptions(SkFilterMode::kLinear,
+                                                                   SkMipmapMode::kNone),
+                                                 matrix));
             }
         }
         this->setBGColor(0xFFDDDDDD);
@@ -61,7 +63,6 @@
             SkPaint paint;
             paint.setAntiAlias(true);
             paint.setShader(fShaders[fShaderIndex]);
-            paint.setFilterQuality(kLow_SkFilterQuality);
             SkRect r = { -150, -150, 150, 150 };
             canvas->drawRoundRect(r, 30, 30, paint);
         }

samplecode/SampleHairModes.cpp

diff --git a/samplecode/SampleHairModes.cpp b/samplecode/SampleHairModes.cpp
index 359f388..6e05fbc 100644
--- a/samplecode/SampleHairModes.cpp
+++ b/samplecode/SampleHairModes.cpp
@@ -61,10 +61,8 @@
     *bm.getAddr32(0, 0) = *bm.getAddr32(1, 1) = 0xFFFFFFFF;
     *bm.getAddr32(1, 0) = *bm.getAddr32(0, 1) = SkPackARGB32(0xFF, 0xCC, 0xCC, 0xCC);
 
-    SkMatrix m;
-    m.setScale(SkIntToScalar(6), SkIntToScalar(6));
-
-    return bm.makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat, &m);
+    return bm.makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat, SkSamplingOptions(),
+                         SkMatrix::Scale(6, 6));
 }
 
 class HairModesView : public Sample {

samplecode/SampleRepeatTile.cpp

diff --git a/samplecode/SampleRepeatTile.cpp b/samplecode/SampleRepeatTile.cpp
index c12a274..4022db6 100644
--- a/samplecode/SampleRepeatTile.cpp
+++ b/samplecode/SampleRepeatTile.cpp
@@ -35,7 +35,7 @@
     SkBitmap bm;
     make_bitmap(&bm);
 
-    paint->setShader(bm.makeShader(tm, tm));
+    paint->setShader(bm.makeShader(tm, tm, SkSamplingOptions()));
 }
 
 class RepeatTileView : public Sample {

samplecode/SampleShaders.cpp

diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp
index fb3fec9..0fde608 100644
--- a/samplecode/SampleShaders.cpp
+++ b/samplecode/SampleShaders.cpp
@@ -23,7 +23,7 @@
         SkColorSetARGB(0,   0, 0, 0),
     };
     return SkShaders::Blend(SkBlendMode::kDstIn,
-                            bm.makeShader(),
+                            bm.makeShader(SkSamplingOptions()),
                             SkGradientShader::MakeLinear(pts, colors, nullptr, 2,
                                                          SkTileMode::kClamp));
 }