Reland of move drawSprite from canvas

gm/dropshadowimagefilter.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkColorFilter.h"
 
@@ skipping 49 matching lines @@
     SkCanvas c(bm);
     draw_path(&c, r, nullptr);
 
     paint.setImageFilter(imf);
     canvas->save();
     canvas->clipRect(r);
     canvas->drawBitmap(bm, 0, 0, &paint);
     canvas->restore();
 }
 
-static void draw_sprite(SkCanvas* canvas, const SkRect& r, SkImageFilter* imf) {
-    SkPaint paint;
-
-    SkIRect bounds;
-    r.roundOut(&bounds);
-
-    SkBitmap bm;
-    bm.allocN32Pixels(bounds.width(), bounds.height());
-    bm.eraseColor(SK_ColorRED);
-    SkCanvas c(bm);
-
-    SkIRect cropRect = SkIRect::MakeXYWH(10, 10, 44, 44);
-    paint.setColor(SK_ColorGREEN);
-    c.drawRect(SkRect::Make(cropRect), paint);
-
-    paint.setImageFilter(imf);
-    SkPoint loc = { r.fLeft, r.fTop };
-    canvas->getTotalMatrix().mapPoints(&loc, 1);
-    canvas->drawSprite(bm,
-                       SkScalarRoundToInt(loc.fX), SkScalarRoundToInt(loc.fY),
-                       &paint);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 class DropShadowImageFilterGM : public skiagm::GM {
 public:
     DropShadowImageFilterGM () {}
 
 protected:
 
     virtual SkString onShortName() {
         return SkString("dropshadowimagefilter");
     }
 
     virtual SkISize onISize() { return SkISize::Make(400, 656); }
 
     void draw_frame(SkCanvas* canvas, const SkRect& r) {
         SkPaint paint;
         paint.setStyle(SkPaint::kStroke_Style);
         paint.setColor(SK_ColorRED);
         canvas->drawRect(r, paint);
     }
 
     virtual void onDraw(SkCanvas* canvas) {
         void (*drawProc[])(SkCanvas*, const SkRect&, SkImageFilter*) = {
-            draw_sprite, draw_bitmap, draw_path, draw_paint, draw_text
+            draw_bitmap, draw_path, draw_paint, draw_text
         };
 
         SkAutoTUnref<SkColorFilter> cf(
             SkColorFilter::CreateModeFilter(SK_ColorMAGENTA, SkXfermode::kSrcIn_Mode));
         SkAutoTUnref<SkImageFilter> cfif(SkColorFilterImageFilter::Create(cf.get()));
         SkImageFilter::CropRect cropRect(SkRect::Make(SkIRect::MakeXYWH(10, 10, 44, 44)),
                                          SkImageFilter::CropRect::kHasAll_CropEdge);
         SkImageFilter::CropRect bogusRect(SkRect::Make(SkIRect::MakeXYWH(-100, -100, 10, 10)),
                                           SkImageFilter::CropRect::kHasAll_CropEdge);
 
@@ skipping 36 matching lines @@
         }
     }
 
 private:
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new DropShadowImageFilterGM; )