Working plumb of image scaling:

src/core/SkBitmapProcState_matrixProcs.cpp

Index: src/core/SkBitmapProcState_matrixProcs.cpp
diff --git a/src/core/SkBitmapProcState_matrixProcs.cpp b/src/core/SkBitmapProcState_matrixProcs.cpp
index 15c17b67dca3a458787beeff47305c515c847aac..959bbf440beb8eb34b6c9eb503216255e7e66361 100644
--- a/src/core/SkBitmapProcState_matrixProcs.cpp
+++ b/src/core/SkBitmapProcState_matrixProcs.cpp
@@ -472,7 +472,7 @@ SkBitmapProcState::chooseMatrixProc(bool trivial_matrix) {
 //    test_int_tileprocs();
     // check for our special case when there is no scale/affine/perspective
     if (trivial_matrix) {
-        SkASSERT(!fDoFilter);
+        SkASSERT(kNone_BitmapFilter == fFilterQuality);
         fIntTileProcY = choose_int_tile_proc(fTileModeY);
         switch (fTileModeX) {
             case SkShader::kClamp_TileMode:
@@ -485,7 +485,7 @@ SkBitmapProcState::chooseMatrixProc(bool trivial_matrix) {
     }
 
     int index = 0;
-    if (fDoFilter) {
+    if (fFilterQuality != kNone_BitmapFilter) {
         index = 1;
     }
     if (fInvType & SkMatrix::kPerspective_Mask) {