Remove SkCanvas::drawBitmapMatrix()

gm/filterindiabox.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 "gm.h"
 
 #include "Resources.h"
 #include "SkBitmapProcState.h"
 #include "SkBitmapScaler.h"
 #include "SkGradientShader.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkStream.h"
 #include "SkTypeface.h"
 
 static SkSize computeSize(const SkBitmap& bm, const SkMatrix& mat) {
     SkRect bounds = SkRect::MakeWH(SkIntToScalar(bm.width()),
                                    SkIntToScalar(bm.height()));
     mat.mapRect(&bounds);
     return SkSize::Make(bounds.width(), bounds.height());
 }
 
-static void draw_row(SkCanvas* canvas, const SkBitmap& bm, const SkMatrix& mat, SkScalar dx) {
+static void draw_cell(SkCanvas* canvas, const SkBitmap& bm, const SkMatrix& mat, SkScalar dx,
+                      SkPaint::FilterLevel lvl) {
     SkPaint paint;
+    paint.setFilterLevel(lvl);
 
     SkAutoCanvasRestore acr(canvas, true);
 
-    canvas->drawBitmapMatrix(bm, mat, &paint);
+    canvas->translate(dx, 0);
+    canvas->concat(mat);
+    canvas->drawBitmap(bm, 0, 0, &paint);
+}
 
-    paint.setFilterLevel(SkPaint::kLow_FilterLevel);
-    canvas->translate(dx, 0);
-    canvas->drawBitmapMatrix(bm, mat, &paint);
-
-    paint.setFilterLevel(SkPaint::kMedium_FilterLevel);
-    canvas->translate(dx, 0);
-    canvas->drawBitmapMatrix(bm, mat, &paint);
-
-    paint.setFilterLevel(SkPaint::kHigh_FilterLevel);
-    canvas->translate(dx, 0);
-    canvas->drawBitmapMatrix(bm, mat, &paint);
+static void draw_row(SkCanvas* canvas, const SkBitmap& bm, const SkMatrix& mat, SkScalar dx) {
+    draw_cell(canvas, bm, mat, 0 * dx, SkPaint::kNone_FilterLevel);
+    draw_cell(canvas, bm, mat, 1 * dx, SkPaint::kLow_FilterLevel);
+    draw_cell(canvas, bm, mat, 2 * dx, SkPaint::kMedium_FilterLevel);
+    draw_cell(canvas, bm, mat, 3 * dx, SkPaint::kHigh_FilterLevel);
 }
 
 class FilterIndiaBoxGM : public skiagm::GM {
     void onOnceBeforeDraw() {
         this->makeBitmap();
 
         SkScalar cx = SkScalarHalf(fBM.width());
         SkScalar cy = SkScalarHalf(fBM.height());
 
         float vertScale = 30.0f/55.0f;
@@ skipping 70 matching lines @@
           fSize = fBM.height();
       }
   private:
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 
 DEF_GM( return new FilterIndiaBoxGM("box.gif"); )