diff options
author | reed <reed@chromium.org> | 2015-07-16 06:10:02 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-16 06:10:02 -0700 |
commit | 6fb0b6779e40ce05c20cf279f0ecff31fa3cd60d (patch) | |
tree | bd36f1f0315eae23db39853f1a17917cc680fc20 /samplecode | |
parent | 18a240d15ca132fab01ba179bd1165d6a182f1cf (diff) |
guard to remove DrawBitmapRectFlags
BUG=skia:
Review URL: https://codereview.chromium.org/1235393003
Diffstat (limited to 'samplecode')
-rw-r--r-- | samplecode/SampleApp.cpp | 2 | ||||
-rw-r--r-- | samplecode/SampleBitmapRect.cpp | 4 | ||||
-rw-r--r-- | samplecode/SampleTextureDomain.cpp | 7 |
3 files changed, 6 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..b6e629c9f7 100644 --- a/samplecode/SampleBitmapRect.cpp +++ b/samplecode/SampleBitmapRect.cpp @@ -131,7 +131,7 @@ 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); canvas->drawRect(fDstR[i], paint); } } @@ -225,7 +225,7 @@ 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); canvas->drawRect(fDstR[i], paint); } } diff --git a/samplecode/SampleTextureDomain.cpp b/samplecode/SampleTextureDomain.cpp index 2794a06956..c798f42922 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); // Test that bitmap draws across separate devices also respect // the constrainted texture domain. @@ -64,8 +64,7 @@ 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); SkAutoTUnref<SkImage> image(surface->newImageSnapshot()); @@ -98,7 +97,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; |