remove all guards for changes to drawBitmapRect / drawImageRect

include/core/SkBitmapDevice.h

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkBitmapDevice_DEFINED
 #define SkBitmapDevice_DEFINED
@@ skipping 64 matching lines @@
     virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap,
                             const SkMatrix& matrix, const SkPaint& paint) override;
     virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap,
                             int x, int y, const SkPaint& paint) override;
 
     /**
      *  The default impl. will create a bitmap-shader from the bitmap,
      *  and call drawRect with it.
      */
     void drawBitmapRect(const SkDraw&, const SkBitmap&, const SkRect*, const SkRect&,
-                        const SkPaint&, SK_VIRTUAL_CONSTRAINT_TYPE) override;
+                        const SkPaint&, SkCanvas::SrcRectConstraint) override;
 
     /**
      *  Does not handle text decoration.
      *  Decorations (underline and stike-thru) will be handled by SkCanvas.
      */
     virtual void drawText(const SkDraw&, const void* text, size_t len,
                           SkScalar x, SkScalar y, const SkPaint& paint) override;
     virtual void drawPosText(const SkDraw&, const void* text, size_t len,
                              const SkScalar pos[], int scalarsPerPos,
                              const SkPoint& offset, const SkPaint& paint) override;
@@ skipping 48 matching lines @@
     SkImageFilter::Cache* getImageFilterCache() override;
 
     SkBitmap    fBitmap;
 
     void setNewSize(const SkISize&);  // Used by SkCanvas for resetForNextPicture().
 
     typedef SkBaseDevice INHERITED;
 };
 
 #endif // SkBitmapDevice_DEFINED