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>
diff --git a/fuzz/FuzzDrawFunctions.cpp b/fuzz/FuzzDrawFunctions.cpp
index 30fdbf8..f81ea75 100644
--- a/fuzz/FuzzDrawFunctions.cpp
+++ b/fuzz/FuzzDrawFunctions.cpp
@@ -278,7 +278,7 @@
     SkScalar a, b;
     fuzz->next(&a, &b);
     if (bl) {
-        surface->getCanvas()->drawImage(image, a, b, &p);
+        surface->getCanvas()->drawImage(image, a, b, SkSamplingOptions(), &p);
     }
     else {
         SkRect dst = SkRect::MakeWH(a, b);
@@ -287,7 +287,7 @@
         uint8_t x;
         fuzz->nextRange(&x, 0, 1);
         SkCanvas::SrcRectConstraint cst = (SkCanvas::SrcRectConstraint)x;
-        surface->getCanvas()->drawImageRect(image, src, dst, &p, cst);
+        surface->getCanvas()->drawImageRect(image.get(), src, dst, SkSamplingOptions(), &p, cst);
     }
 }