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

samplecode/SampleAll.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleCode.h"
 #include "SkBlurMask.h"
 #include "SkCanvas.h"
@@ skipping 422 matching lines @@
         // path
         canvas->translate(SkIntToScalar(50), 0);
         paint.setColor(SK_ColorRED);
         paint.setStyle(SkPaint::kStroke_Style);
         paint.setStrokeWidth(SkIntToScalar(5));
         paint.setShader(radial)->unref();
         paint.setMaskFilter(nullptr);
         canvas->drawPath(path, paint);
 
         paint.setShader(nullptr);
-        // bitmap, sprite
+        // bitmap
         canvas->translate(SkIntToScalar(50), 0);
         paint.setStyle(SkPaint::kFill_Style);
         canvas->drawBitmap(fBug, left, top, &paint);
-        canvas->translate(SkIntToScalar(30), 0);
-        canvas->drawSprite(fTb,
-            SkScalarRoundToInt(canvas->getTotalMatrix().getTranslateX()),
-            spriteOffset + 10, &paint);
 
         canvas->translate(-SkIntToScalar(30), SkIntToScalar(30));
         paint.setShader(shaderTest())->unref(); // test compose shader
         canvas->drawRect(rect2, paint);
         paint.setShader(nullptr);
 
         canvas->restore();
         // text
         canvas->translate(0, SkIntToScalar(60));
         canvas->save();
@@ skipping 114 matching lines @@
 private:
     SkPoint fClickPt;
     SkBitmap fBug, fTb, fTx;
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new DemoView; }
 static SkViewRegister reg(MyFactory);