Add filtermode to drawnine

Bug: skia:7650, skia:11099
Change-Id: I1e603099d30bd4672cbb6783209bacf4678fa0f3
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/345156
Reviewed-by: Kevin Lubick <[email protected]>
Commit-Queue: Mike Reed <[email protected]>

Author: reed-at-google

gm/ninepatchstretch.cpp

@@ -91,17 +91,16 @@ class NinePatchStretchGM : public skiagm::GM {
         SkScalar y = SkIntToScalar(100);
 
         SkPaint paint;
-        for (int filter = 0; filter < 2; filter++) {
-            paint.setFilterQuality(filter == 0 ? kLow_SkFilterQuality : kNone_SkFilterQuality);
-            canvas->translate(0, filter * SkIntToScalar(400));
+        for (auto fm : {SkFilterMode::kLinear, SkFilterMode::kNearest}) {
             for (int iy = 0; iy < 2; ++iy) {
                 for (int ix = 0; ix < 2; ++ix) {
                     int i = ix * 2 + iy;
                     SkRect r = SkRect::MakeXYWH(x + ix * fixed, y + iy * fixed,
                                                 size[i].width(), size[i].height());
-                    canvas->drawImageNine(fImage.get(), fCenter, r, &paint);
+                    canvas->drawImageNine(fImage.get(), fCenter, r, fm);
                 }
             }
+            canvas->translate(0, 400);
         }
     }
 

include/core/SkCanvas.h

@@ -20,6 +20,7 @@
 #include "include/core/SkRasterHandleAllocator.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
+#include "include/core/SkSamplingOptions.h"
 #include "include/core/SkScalar.h"
 #include "include/core/SkSize.h"
 #include "include/core/SkString.h"
@@ -55,7 +56,6 @@ class SkPixmap;
 class SkRegion;
 class SkRRect;
 struct SkRSXform;
-struct SkSamplingOptions;
 class SkSurface;
 class SkSurface_Base;
 class SkTextBlob;
@@ -1668,36 +1668,18 @@ class SK_API SkCanvas {
         @param image   SkImage containing pixels, dimensions, and format
         @param center  SkIRect edge of image corners and sides
         @param dst     destination SkRect of image to draw to
+        @param filter  what technique to use when sampling the image
         @param paint   SkPaint containing SkBlendMode, SkColorFilter, SkImageFilter,
                        and so on; or nullptr
     */
     void drawImageNine(const SkImage* image, const SkIRect& center, const SkRect& dst,
-                       const SkPaint* paint = nullptr);
-
-    /** Draws SkImage image stretched proportionally to fit into SkRect dst.
-        SkIRect center divides the image into nine sections: four sides, four corners, and
-        the center. Corners are not scaled, or scaled down proportionately if their sides
-        are larger than dst; center and four sides are scaled to fit remaining space, if any.
-
-        Additionally transform draw using clip, SkMatrix, and optional SkPaint paint.
-
-        If SkPaint paint is supplied, apply SkColorFilter, alpha, SkImageFilter, and
-        SkBlendMode. If image is kAlpha_8_SkColorType, apply SkShader.
-        If paint contains SkMaskFilter, generate mask from image bounds. If paint
-        SkFilterQuality set to kNone_SkFilterQuality, disable pixel filtering. For all
-        other values of paint SkFilterQuality, use kLow_SkFilterQuality to filter pixels.
-        Any SkMaskFilter on paint is ignored as is paint anti-aliasing state.
+                       SkFilterMode filter, const SkPaint* paint = nullptr);
 
-        If generated mask extends beyond image bounds, replicate image edge colors, just
-        as SkShader made from SkImage::makeShader with SkShader::kClamp_TileMode set
-        replicates the image edge color when it samples outside of its bounds.
+    // DEPRECATED -- pass filtermode explicitly
+    void drawImageNine(const SkImage* image, const SkIRect& center, const SkRect& dst,
+                       const SkPaint* paint = nullptr);
 
-        @param image   SkImage containing pixels, dimensions, and format
-        @param center  SkIRect edge of image corners and sides
-        @param dst     destination SkRect of image to draw to
-        @param paint   SkPaint containing SkBlendMode, SkColorFilter, SkImageFilter,
-                       and so on; or nullptr
-    */
+    // DEPRECATED -- pass filtermode explicitly
     void drawImageNine(const sk_sp<SkImage>& image, const SkIRect& center, const SkRect& dst,
                        const SkPaint* paint = nullptr) {
         this->drawImageNine(image.get(), center, dst, paint);
@@ -1860,9 +1842,14 @@ class SK_API SkCanvas {
         @param image    SkImage containing pixels, dimensions, and format
         @param lattice  division of bitmap into fixed and variable rectangles
         @param dst      destination SkRect of image to draw to
+        @param filter   what technique to use when sampling the image
         @param paint    SkPaint containing SkBlendMode, SkColorFilter, SkImageFilter,
                         and so on; or nullptr
     */
+    void drawImageLattice(const SkImage* image, const Lattice& lattice, const SkRect& dst,
+                          SkFilterMode filter, const SkPaint* paint = nullptr);
+
+    // DEPRECATED -- pass filtermode explicitly
     void drawImageLattice(const SkImage* image, const Lattice& lattice, const SkRect& dst,
                           const SkPaint* paint = nullptr);
 

src/core/SkCanvas.cpp

@@ -1886,6 +1886,24 @@ static SkPaint clean_paint_for_lattice(const SkPaint* paint) {
     return cleaned;
 }
 
+void SkCanvas::drawImageNine(const SkImage* image, const SkIRect& center, const SkRect& dst,
+                             SkFilterMode filter, const SkPaint* paint) {
+    SkPaint latticePaint = clean_paint_for_lattice(paint);
+    // use filterquality until we can update our virtuals to take SkFilterMode
+    latticePaint.setFilterQuality(filter == SkFilterMode::kNearest ? kNone_SkFilterQuality
+                                                                   : kLow_SkFilterQuality);
+    this->drawImageNine(image, center, dst, &latticePaint);
+}
+
+void SkCanvas::drawImageLattice(const SkImage* image, const Lattice& lattice, const SkRect& dst,
+                                SkFilterMode filter, const SkPaint* paint) {
+    SkPaint latticePaint = clean_paint_for_lattice(paint);
+    // use filterquality until we can update our virtuals to take SkFilterMode
+    latticePaint.setFilterQuality(filter == SkFilterMode::kNearest ? kNone_SkFilterQuality
+                                                                   : kLow_SkFilterQuality);
+    this->drawImageLattice(image, lattice, dst, &latticePaint);
+}
+
 void SkCanvas::drawImageNine(const SkImage* image, const SkIRect& center, const SkRect& dst,
                              const SkPaint* paint) {
     TRACE_EVENT0("skia", TRACE_FUNC);