Remove SkCanvas::drawBitmapMatrix()

gm/xfermodes.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 "SkBitmap.h"
 #include "SkShader.h"
@@ skipping 66 matching lines @@
      * uses the implied shape of the drawing command and these modes
      * demonstrate that.
      */
     void draw_mode(SkCanvas* canvas, SkXfermode* mode, SrcType srcType,
                    SkScalar x, SkScalar y) {
         SkPaint p;
         SkMatrix m;
         bool restoreNeeded = false;
         m.setTranslate(x, y);
 
-        canvas->drawBitmapMatrix(fSrcB, m, &p);
+        canvas->drawBitmap(fSrcB, x, y, &p);
         p.setXfermode(mode);
         switch (srcType) {
-            case kSmallTransparentImage_SrcType:
+            case kSmallTransparentImage_SrcType: {
                 m.postScale(SK_ScalarHalf, SK_ScalarHalf, x, y);
-                canvas->drawBitmapMatrix(fTransparent, m, &p);
+
+                SkAutoCanvasRestore acr(canvas, true);
+                canvas->concat(m);
+                canvas->drawBitmap(fTransparent, 0, 0, &p);
                 break;
+            }
             case kQuarterClearInLayer_SrcType: {
                 SkRect bounds = SkRect::MakeXYWH(x, y, SkIntToScalar(W),
                                                  SkIntToScalar(H));
                 canvas->saveLayer(&bounds, &p);
                 restoreNeeded = true;
                 p.setXfermodeMode(SkXfermode::kSrcOver_Mode);
                 // Fall through.
             }
             case kQuarterClear_SrcType: {
                 SkScalar halfW = SkIntToScalar(W) / 2;
@@ skipping 24 matching lines @@
                 p.setColor(0xFF66AAFF);
                 canvas->drawRect(r, p);
                 break;
             }
             case kSmallRectangleImageWithAlpha_SrcType:
                 m.postScale(SK_ScalarHalf, SK_ScalarHalf, x, y);
                 // Fall through.
             case kRectangleImageWithAlpha_SrcType:
                 p.setAlpha(0x88);
                 // Fall through.
-            case kRectangleImage_SrcType:
-                canvas->drawBitmapMatrix(fDstB, m, &p);
+            case kRectangleImage_SrcType: {
+                SkAutoCanvasRestore acr(canvas, true);
+                canvas->concat(m);
+                canvas->drawBitmap(fDstB, 0, 0, &p);
                 break;
+            }
             default:
                 break;
         }
 
         if (restoreNeeded) {
             canvas->restore();
         }
     }
 
     virtual void onOnceBeforeDraw() SK_OVERRIDE {
@@ skipping 133 matching lines @@
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new XfermodesGM; }
 static GMRegistry reg(MyFactory);
 
 }