commit e02d7f844bd057adba04a9aa5eddeee822af16e5
author Mike Reed <reed@google.com> Thu Jan 21 22:25:21 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 22 13:53:42 2021 +0000
tree 991acc73c66b51848b1f7b9922c989086620a1d5
parent 372791761157114400b92fd9a896d06814ef2a75

More hiding of legacy drawImage calls

Also cleanup some of the duplicate code in SkRecords

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

gm/bitmaprect.cpp

diff --git a/gm/bitmaprect.cpp b/gm/bitmaprect.cpp
index 474c8c5..ada6918 100644
--- a/gm/bitmaprect.cpp
+++ b/gm/bitmaprect.cpp
@@ -65,6 +65,7 @@
 
         SkPaint paint;
         paint.setStyle(SkPaint::kStroke_Style);
+        auto sampling = SkSamplingOptions();
 
         auto image = make_image();
 
@@ -75,12 +76,13 @@
             SkRect srcR;
             srcR.set(src[i]);
 
-            canvas->drawImage(image, 0, 0, &paint);
+            canvas->drawImage(image, 0, 0, sampling, &paint);
             if (!fUseIRect) {
-                canvas->drawImageRect(image, srcR, dstR, &paint,
+                canvas->drawImageRect(image.get(), srcR, dstR, sampling, &paint,
                                       SkCanvas::kStrict_SrcRectConstraint);
             } else {
-                canvas->drawImageRect(image, src[i], dstR, &paint);
+                canvas->drawImageRect(image.get(), SkRect::Make(src[i]), dstR, sampling, &paint,
+                                      SkCanvas::kStrict_SrcRectConstraint);
             }
 
             canvas->drawRect(dstR, paint);