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 /samplecode | |
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 'samplecode')
-rw-r--r-- | samplecode/SampleApp.cpp | 2 | ||||
-rw-r--r-- | samplecode/SampleBitmapRect.cpp | 6 | ||||
-rw-r--r-- | samplecode/SampleTextureDomain.cpp | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index a80ccd95b8..508ff63052 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -1116,7 +1116,7 @@ void SampleWindow::showZoomer(SkCanvas* canvas) { // Clear the background behind our zoomed in view paint.setColor(SK_ColorWHITE); canvas->drawRect(dest, paint); - canvas->drawBitmapRect(bitmap, &src, dest); + canvas->drawBitmapRect(bitmap, src, dest, NULL); paint.setColor(SK_ColorBLACK); paint.setStyle(SkPaint::kStroke_Style); // Draw a border around the pixel in the middle diff --git a/samplecode/SampleBitmapRect.cpp b/samplecode/SampleBitmapRect.cpp index 123bfb8b12..c69fcf4ceb 100644 --- a/samplecode/SampleBitmapRect.cpp +++ b/samplecode/SampleBitmapRect.cpp @@ -131,7 +131,8 @@ protected: for (int i = 0; i < 2; ++i) { paint.setFilterQuality(1 == i ? kLow_SkFilterQuality : kNone_SkFilterQuality); - canvas->drawBitmapRectToRect(bitmap, &srcR, fDstR[i], &paint); + canvas->drawBitmapRect(bitmap, &srcR, fDstR[i], &paint, + SkCanvas::kStrict_SrcRectConstraint); canvas->drawRect(fDstR[i], paint); } } @@ -225,7 +226,8 @@ protected: for (int i = 0; i < 2; ++i) { paint.setFilterQuality(1 == i ? kLow_SkFilterQuality : kNone_SkFilterQuality); - canvas->drawBitmapRectToRect(fBitmap, &fSrcR, fDstR[i], &paint); + canvas->drawBitmapRect(fBitmap, &fSrcR, fDstR[i], &paint, + SkCanvas::kStrict_SrcRectConstraint); canvas->drawRect(fDstR[i], paint); } } diff --git a/samplecode/SampleTextureDomain.cpp b/samplecode/SampleTextureDomain.cpp index 2794a06956..dad1e0e07a 100644 --- a/samplecode/SampleTextureDomain.cpp +++ b/samplecode/SampleTextureDomain.cpp @@ -53,7 +53,7 @@ protected: // the constrained texture domain. srcRect.setXYWH(1, 1, 3, 3); dstRect.setXYWH(5, 5, 305, 305); - canvas->drawBitmapRectToRect(fBM, &srcRect, dstRect, &paint); + canvas->drawBitmapRect(fBM, &srcRect, dstRect, &paint, SkCanvas::kStrict_SrcRectConstraint); // Test that bitmap draws across separate devices also respect // the constrainted texture domain. @@ -64,8 +64,8 @@ protected: srcRect.setXYWH(1, 1, 3, 3); dstRect.setXYWH(1, 1, 3, 3); - surface->getCanvas()->drawBitmapRectToRect(fBM, &srcRect, dstRect, - &paint); + surface->getCanvas()->drawBitmapRect(fBM, &srcRect, dstRect, &paint, + SkCanvas::kStrict_SrcRectConstraint); SkAutoTUnref<SkImage> image(surface->newImageSnapshot()); @@ -98,7 +98,7 @@ protected: dstRect.setXYWH(-150, -150, 300, 300); canvas->translate(550, 550); canvas->rotate(45); - canvas->drawBitmapRectToRect(fBM, NULL, dstRect, &paint); + canvas->drawBitmapRect(fBM, dstRect, &paint); } private: typedef SkView INHERITED; |