Revert of SkTreatAsSprite should take AA into account

src/core/SkMatrix.cpp

Index: src/core/SkMatrix.cpp
diff --git a/src/core/SkMatrix.cpp b/src/core/SkMatrix.cpp
index 13c626af474d57203d95888c554d7030937d7c6c..dfeb721d45e68394f4bf2db1906c11d708f044e3 100644
--- a/src/core/SkMatrix.cpp
+++ b/src/core/SkMatrix.cpp
@@ -1623,14 +1623,8 @@
 
 #include "SkMatrixUtils.h"
 
-bool SkTreatAsSprite(const SkMatrix& mat, const SkISize& size, const SkPaint& paint) {
-    // Our path aa is 2-bits, and our rect aa is 8, so we could use 8,
-    // but in practice 4 seems enough (still looks smooth) and allows
-    // more slightly fractional cases to fall into the fast (sprite) case.
-    static const unsigned kAntiAliasSubpixelBits = 4;
-
-    const unsigned subpixelBits = paint.isAntiAlias() ? kAntiAliasSubpixelBits : 0;
-
+bool SkTreatAsSprite(const SkMatrix& mat, int width, int height,
+                     unsigned subpixelBits) {
     // quick reject on affine or perspective
     if (mat.getType() & ~(SkMatrix::kScale_Mask | SkMatrix::kTranslate_Mask)) {
         return false;
@@ -1647,7 +1641,7 @@
     }
 
     SkRect dst;
-    SkIRect isrc = SkIRect::MakeSize(size);
+    SkIRect isrc = { 0, 0, width, height };
 
     {
         SkRect src;