Revert[4] of "stop using drawSprite (at least w/ no filters) as it is going away"

src/images/SkImageDecoder.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkImageDecoder.h"
 #include "SkBitmap.h"
@@ skipping 188 matching lines @@
     if (dst->width() < w || dst->height() < h) {
         SkDEBUGF(("SkImageDecoder::cropBitmap does not have a large enough bitmap.\n"));
     }
 
     // Set the Src_Mode for the paint to prevent transparency issue in the
     // dest in the event that the dest was being re-used.
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
 
     SkCanvas canvas(*dst);
-    canvas.drawSprite(*src, (srcX - dstX) / sampleSize,
-                            (srcY - dstY) / sampleSize,
+    canvas.drawBitmap(*src, SkIntToScalar((srcX - dstX) / sampleSize),
+                            SkIntToScalar((srcY - dstY) / sampleSize),
                             &paint);
     return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 bool SkImageDecoder::DecodeFile(const char file[], SkBitmap* bm, SkColorType pref,  Mode mode,
                                 Format* format) {
     SkASSERT(file);
     SkASSERT(bm);
@@ skipping 44 matching lines @@
     return success;
 }
 
 bool SkImageDecoder::decodeYUV8Planes(SkStream* stream, SkISize componentSizes[3], void* planes[3],
                                       size_t rowBytes[3], SkYUVColorSpace* colorSpace) {
     // we reset this to false before calling onDecodeYUV8Planes
     fShouldCancelDecode = false;
 
     return this->onDecodeYUV8Planes(stream, componentSizes, planes, rowBytes, colorSpace);
 }