add src-rect-constraint to drawImageRect

src/core/SkMiniRecorder.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkLazyPtr.h"
 #include "SkMiniRecorder.h"
@@ skipping 54 matching lines @@
     }
     SkASSERT(fState == State::kEmpty);
 }
 
 #define TRY_TO_STORE(Type, ...)                    \
     if (fState != State::kEmpty) { return false; } \
     fState = State::k##Type;                       \
     new (fBuffer.get()) Type(__VA_ARGS__);         \
     return true
 
-bool SkMiniRecorder::drawBitmapRectToRect(const SkBitmap& bm, const SkRect* src, const SkRect& dst,
-                                          const SkPaint* p, SkCanvas::DrawBitmapRectFlags flags) {
+bool SkMiniRecorder::drawBitmapRect(const SkBitmap& bm, const SkRect* src, const SkRect& dst,
+                                    const SkPaint* p, SkCanvas::SrcRectConstraint constraint) {
     SkRect bounds;
     if (!src) {
         bm.getBounds(&bounds);
         src = &bounds;
     }
     SkTLazy<SkPaint> defaultPaint;
     if (!p) {
         p = defaultPaint.init();
     }
-    TRY_TO_STORE(DrawBitmapRectToRectFixedSize, *p, bm, *src, dst, flags);
+    TRY_TO_STORE(DrawBitmapRectFixedSize, *p, bm, *src, dst, constraint);
 }
 
 bool SkMiniRecorder::drawRect(const SkRect& rect, const SkPaint& paint) {
     TRY_TO_STORE(DrawRect, paint, rect);
 }
 
 bool SkMiniRecorder::drawPath(const SkPath& path, const SkPaint& paint) {
     TRY_TO_STORE(DrawPath, paint, path);
 }
 
 bool SkMiniRecorder::drawTextBlob(const SkTextBlob* b, SkScalar x, SkScalar y, const SkPaint& p) {
     TRY_TO_STORE(DrawTextBlob, p, b, x, y);
 }
 #undef TRY_TO_STORE
 
 
 SkPicture* SkMiniRecorder::detachAsPicture(const SkRect& cull) {
 #define CASE(Type)               \
     case State::k##Type:         \
         fState = State::kEmpty;  \
         return SkNEW_ARGS(SkMiniPicture<Type>, (cull, reinterpret_cast<Type*>(fBuffer.get())))
 
     switch (fState) {
         case State::kEmpty: return SkRef(gEmptyPicture.get());
-        CASE(DrawBitmapRectToRectFixedSize);
+        CASE(DrawBitmapRectFixedSize);
         CASE(DrawPath);
         CASE(DrawRect);
         CASE(DrawTextBlob);
     }
     SkASSERT(false);
     return nullptr;
 #undef CASE
 }
 
 void SkMiniRecorder::flushAndReset(SkCanvas* canvas) {
 #define CASE(Type)                                                  \
     case State::k##Type: {                                          \
         fState = State::kEmpty;                                     \
         Type* op = reinterpret_cast<Type*>(fBuffer.get());          \
         SkRecords::Draw(canvas, nullptr, nullptr, 0, nullptr)(*op); \
         op->~Type();                                                \
     } return
 
     switch (fState) {
         case State::kEmpty: return;
-        CASE(DrawBitmapRectToRectFixedSize);
+        CASE(DrawBitmapRectFixedSize);
         CASE(DrawPath);
         CASE(DrawRect);
         CASE(DrawTextBlob);
     }
     SkASSERT(false);
 #undef CASE
 }