Revert[2] of guard to remove DrawBitmapRectFlags

src/utils/SkNinePatch.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 "SkNinePatch.h"
@@ skipping 118 matching lines @@
             numYDivs -= 1;
         }
     }
 
     Mesh mesh;
 
     const int numXStretch = (numXDivs + 1) >> 1;
     const int numYStretch = (numYDivs + 1) >> 1;
 
     if (numXStretch < 1 && numYStretch < 1) {
-        canvas->drawBitmapRect(bitmap, NULL, bounds, paint);
+        canvas->drawBitmapRect(bitmap, bounds, paint);
         return;
     }
 
     if (false) {
         int i;
         for (i = 0; i < numXDivs; i++) {
             SkDebugf("--- xdivs[%d] %d\n", i, xDivs[i]);
         }
         for (i = 0; i < numYDivs; i++) {
             SkDebugf("--- ydivs[%d] %d\n", i, yDivs[i]);
@@ skipping 136 matching lines @@
     for (int y = 0; y < 3; y++) {
         s.fTop = srcY[y];
         s.fBottom = srcY[y+1];
         d.fTop = dstY[y];
         d.fBottom = dstY[y+1];
         for (int x = 0; x < 3; x++) {
             s.fLeft = srcX[x];
             s.fRight = srcX[x+1];
             d.fLeft = dstX[x];
             d.fRight = dstX[x+1];
-            canvas->drawBitmapRect(bitmap, &s, d, paint);
+            canvas->drawBitmapRect(bitmap, s, d, paint);
         }
     }
 }
 
 void SkNinePatch::DrawNine(SkCanvas* canvas, const SkRect& bounds,
                            const SkBitmap& bitmap, const SkIRect& margins,
                            const SkPaint* paint) {
     /** Our vertices code has numerical precision problems if the transformed
      coordinates land directly on a 1/2 pixel boundary. To work around that
      for now, we only take the vertices case if we are in opengl. Also,
@@ skipping 19 matching lines @@
                 (margins.fTop + margins.fBottom);
             yDivs[1] = yDivs[0];
         }
 
         SkNinePatch::DrawMesh(canvas, bounds, bitmap,
                               xDivs, 2, yDivs, 2, paint);
     } else {
         drawNineViaRects(canvas, bounds, bitmap, margins, paint);
     }
 }