diff options
| author |  reed <reed@google.com> | 2015-07-17 07:09:43 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-17 07:09:43 -0700 |
| commit | 84984efeb64787b88c5f8bd6929cfe2d58a3ba06 (patch) | |
| tree | 79645557c20ff0e6e6bf75a0e92df1c7fece039f /src/core/SkCanvas.cpp | |
| parent | b9efc79015599db1b95a304210d119947bedb8de (diff) | |
Revert[2] of guard to remove DrawBitmapRectFlags
This reverts commit 91110195a2eee170c11885da9d16f94b00a39f87.
BUG=skia:
TBR=
Review URL: https://codereview.chromium.org/1240753003
Diffstat (limited to 'src/core/SkCanvas.cpp')
| -rw-r--r-- | src/core/SkCanvas.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 403a12d6a2..570435869b 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1853,6 +1853,12 @@ void SkCanvas::drawImageRect(const SkImage* image, const SkRect* src, const SkRe this->onDrawImageRect(image, src, dst, paint SRC_RECT_CONSTRAINT_ARG(constraint)); } +void SkCanvas::drawImageRect(const SkImage* image, const SkIRect& isrc, const SkRect& dst, + const SkPaint* paint, SrcRectConstraint constraint) { + SkRect src = SkRect::Make(isrc); + this->drawImageRect(image, &src, dst, paint, constraint); +} + void SkCanvas::drawImageNine(const SkImage* image, const SkIRect& center, const SkRect& dst, const SkPaint* paint) { if (dst.isEmpty()) { @@ -1871,6 +1877,7 @@ void SkCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar dx, SkScalar dy, cons this->onDrawBitmap(bitmap, dx, dy, paint); } +#ifdef SK_SUPPORT_LEGACY_DRAWBITMAPRECTFLAGS_TYPE void SkCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, const SkPaint* paint, DrawBitmapRectFlags flags) { if (bitmap.drawsNothing() || dst.isEmpty()) { @@ -1878,6 +1885,7 @@ void SkCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src, c } this->onDrawBitmapRect(bitmap, src, dst, paint, (SK_VIRTUAL_CONSTRAINT_TYPE)flags); } +#endif void SkCanvas::drawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, const SkPaint* paint, SrcRectConstraint constraint) { @@ -1887,6 +1895,12 @@ void SkCanvas::drawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const S this->onDrawBitmapRect(bitmap, src, dst, paint, (SK_VIRTUAL_CONSTRAINT_TYPE)constraint); } +void SkCanvas::drawBitmapRect(const SkBitmap& bitmap, const SkIRect& isrc, const SkRect& dst, + const SkPaint* paint, SrcRectConstraint constraint) { + SkRect src = SkRect::Make(isrc); + this->drawBitmapRect(bitmap, &src, dst, paint, constraint); +} + void SkCanvas::drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, const SkRect& dst, const SkPaint* paint) { if (bitmap.drawsNothing() || dst.isEmpty()) { |