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 /gm/bitmaprect.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 'gm/bitmaprect.cpp')
-rw-r--r-- | gm/bitmaprect.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/gm/bitmaprect.cpp b/gm/bitmaprect.cpp index ff52c15e5d..8c7ba9bd57 100644 --- a/gm/bitmaprect.cpp +++ b/gm/bitmaprect.cpp @@ -73,7 +73,7 @@ protected: canvas->drawBitmapRect(bitmap, &srcR, dstR, &paint, SkCanvas::kStrict_SrcRectConstraint); } else { - canvas->drawBitmapRect(bitmap, &src[i], dstR, &paint); + canvas->drawBitmapRect(bitmap, src[i], dstR, &paint); } canvas->drawRect(dstR, paint); @@ -143,7 +143,7 @@ protected: SkRect srcR = { 0.5f, 0.5f, 2.5f, 2.5f }; SkRect dstR = { 100, 100, 300, 200 }; - canvas->drawBitmapRectToRect(bitmap, &srcR, dstR, NULL); + canvas->drawBitmapRect(bitmap, &srcR, dstR, NULL, SkCanvas::kStrict_SrcRectConstraint); } private: @@ -213,16 +213,13 @@ protected: SkRect dstR2 = { 10, 410, 30, 430 }; if (!fUseIRect) { - canvas->drawBitmapRectToRect(fBigBitmap, &srcR1, dstR1, &paint); - canvas->drawBitmapRectToRect(fBigBitmap, &srcR2, dstR2, &paint); + canvas->drawBitmapRect(fBigBitmap, &srcR1, dstR1, &paint, + SkCanvas::kStrict_SrcRectConstraint); + canvas->drawBitmapRect(fBigBitmap, &srcR2, dstR2, &paint, + SkCanvas::kStrict_SrcRectConstraint); } else { - SkIRect iSrcR1, iSrcR2; - - srcR1.roundOut(&iSrcR1); - srcR2.roundOut(&iSrcR2); - - canvas->drawBitmapRect(fBigBitmap, &iSrcR1, dstR1, &paint); - canvas->drawBitmapRect(fBigBitmap, &iSrcR2, dstR2, &paint); + canvas->drawBitmapRect(fBigBitmap, srcR1.roundOut(), dstR1, &paint); + canvas->drawBitmapRect(fBigBitmap, srcR2.roundOut(), dstR2, &paint); } } |