Revert[2] of guard to remove DrawBitmapRectFlags

include/core/SkCanvas.h

 /*
  * 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.
  */
 
 #ifndef SkCanvas_DEFINED
 #define SkCanvas_DEFINED
 
@@ skipping 17 matching lines @@
 class SkMetaData;
 class SkPicture;
 class SkRRect;
 struct SkRSXform;
 class SkSurface;
 class SkSurface_Base;
 class SkTextBlob;
 class GrContext;
 class GrRenderTarget;
 
-//#define SK_SUPPORT_LEGACY_ONDRAWIMAGERECT
+//#define SK_SUPPORT_LEGACY_DRAWBITMAPRECTFLAGS_TYPE
 
 class SkCanvasState;
 
 #ifdef SK_SUPPORT_LEGACY_ONDRAWIMAGERECT
     #define SK_VIRTUAL_CONSTRAINT_TYPE          SkCanvas::DrawBitmapRectFlags
     #define SRC_RECT_CONSTRAINT_PARAM(param)
     #define SRC_RECT_CONSTRAINT_ARG(arg)
     #define SRC_RECT_CONSTRAINT_LOCAL_DEFAULT(var)  SkCanvas::SrcRectConstraint var = SkCanvas::kStrict_SrcRectConstraint;
 #else
     #define SK_VIRTUAL_CONSTRAINT_TYPE          SkCanvas::SrcRectConstraint
@@ skipping 778 matching lines @@
      *  and drawn.
      *
      *  @param image      The image to be drawn
      *  @param src        Optional: specify the subset of the image to be drawn
      *  @param dst        The destination rectangle where the scaled/translated
      *                    image will be drawn
      *  @param paint      The paint used to draw the image, or NULL
      *  @param constraint Control the tradeoff between speed and exactness w.r.t. the src-rect.
      */
     void drawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
-                       const SkPaint* paint, SrcRectConstraint);
+                       const SkPaint* paint, SrcRectConstraint = kStrict_SrcRectConstraint);
 
-    void drawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
-                       const SkPaint* paint = NULL) {
-        this->drawImageRect(image, src, dst, paint, kStrict_SrcRectConstraint);
+    void drawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst) {
+        this->drawImageRect(image, src, dst, NULL, kStrict_SrcRectConstraint);
     }
 
     void drawImageRect(const SkImage* image, const SkRect& dst, const SkPaint* paint = NULL) {
         // With no src-rect, the constraint value is ignored, so we just use the default.
         this->drawImageRect(image, NULL, dst, paint, kStrict_SrcRectConstraint);
     }
 
+    void drawImageRect(const SkImage* image, const SkIRect& isrc, const SkRect& dst,
+                       const SkPaint* paint, SrcRectConstraint = kStrict_SrcRectConstraint);
+
     /**
      *  Draw the image stretched differentially to fit into dst.
      *  center is a rect within the image, and logically divides the image
      *  into 9 sections (3x3). For example, if the middle pixel of a [5x5]
      *  image is the "center", then the center-rect should be [2, 2, 3, 3].
      *
      *  If the dst is >= the image size, then...
      *  - The 4 corners are not stretched at all.
      *  - The sides are stretched in only one axis.
      *  - The center is stretched in both axes.
@@ skipping 27 matching lines @@
      *  dst rect. If the src rect is non-null, only that subset of the bitmap is transformed
      *  and drawn.
      *
      *  @param bitmap     The bitmap to be drawn
      *  @param src        Optional: specify the subset of the bitmap to be drawn
      *  @param dst        The destination rectangle where the scaled/translated
      *                    bitmap will be drawn
      *  @param paint      The paint used to draw the bitmap, or NULL
      *  @param constraint Control the tradeoff between speed and exactness w.r.t. the src-rect.
      */
+#ifdef SK_SUPPORT_LEGACY_DRAWBITMAPRECTFLAGS_TYPE
     void drawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
                         const SkPaint* paint, SrcRectConstraint);
+#else
+    void drawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
+                        const SkPaint* paint, SrcRectConstraint = kStrict_SrcRectConstraint);
+#endif
 
     void drawBitmapRect(const SkBitmap& bitmap, const SkRect& dst, const SkPaint* paint = NULL) {
         this->drawBitmapRect(bitmap, NULL, dst, paint, kStrict_SrcRectConstraint);
     }
 
+    void drawBitmapRect(const SkBitmap& bitmap, const SkIRect& isrc, const SkRect& dst,
+                        const SkPaint* paint, SrcRectConstraint = kStrict_SrcRectConstraint);
+
+#ifdef SK_SUPPORT_LEGACY_DRAWBITMAPRECTFLAGS_TYPE
     // IMPORTANT that thse be value-equal with SrcRectConstraint (during transition period)
     enum DrawBitmapRectFlags {
         kNone_DrawBitmapRectFlag            = 0x0,
         /**
          *  When filtering is enabled, allow the color samples outside of
          *  the src rect (but still in the src bitmap) to bleed into the
          *  drawn portion
          */
         kBleed_DrawBitmapRectFlag           = 0x1,
     };
@@ skipping 14 matching lines @@
                         const SkRect& dst, const SkPaint* paint = NULL,
                         DrawBitmapRectFlags flags = kNone_DrawBitmapRectFlag) {
         SkRect realSrcStorage;
         SkRect* realSrcPtr = NULL;
         if (isrc) {
             realSrcStorage.set(*isrc);
             realSrcPtr = &realSrcStorage;
         }
         this->drawBitmapRectToRect(bitmap, realSrcPtr, dst, paint, flags);
     }
+#endif
 
     /**
      *  Draw the bitmap stretched differentially to fit into dst.
      *  center is a rect within the bitmap, and logically divides the bitmap
      *  into 9 sections (3x3). For example, if the middle pixel of a [5x5]
      *  bitmap is the "center", then the center-rect should be [2, 2, 3, 3].
      *
      *  If the dst is >= the bitmap size, then...
      *  - The 4 corners are not stretched at all.
      *  - The sides are stretched in only one axis.
@@ skipping 658 matching lines @@
 
 class SkCanvasClipVisitor {
 public:
     virtual ~SkCanvasClipVisitor();
     virtual void clipRect(const SkRect&, SkRegion::Op, bool antialias) = 0;
     virtual void clipRRect(const SkRRect&, SkRegion::Op, bool antialias) = 0;
     virtual void clipPath(const SkPath&, SkRegion::Op, bool antialias) = 0;
 };
 
 #endif