diff options
author | piotaixr <piotaixr@chromium.org> | 2014-09-23 14:10:50 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-23 14:10:50 -0700 |
commit | 432789972c1e1f8a66165c75a250dba1853efa08 (patch) | |
tree | 587fd2e2ae72baa63af8fcad67d2471980894dbe /gm | |
parent | 271a030f5d0d3c59715fbeffb31c761279f3f8ca (diff) |
SkCanvas::drawImage is the new way for drawing a SkImage to a Canvas
BUG=skia:2947
R=junov@chromium.org, reed@google.com, bsalomon@google.com
Author: piotaixr@chromium.org
Review URL: https://codereview.chromium.org/583453002
Diffstat (limited to 'gm')
-rwxr-xr-x | gm/dftext.cpp | 2 | ||||
-rw-r--r-- | gm/image.cpp | 14 | ||||
-rw-r--r-- | gm/multipicturedraw.cpp | 46 |
3 files changed, 31 insertions, 31 deletions
diff --git a/gm/dftext.cpp b/gm/dftext.cpp index 59106f7344..5f58cb91ff 100755 --- a/gm/dftext.cpp +++ b/gm/dftext.cpp @@ -176,7 +176,7 @@ protected: // render offscreen buffer if (surface) { SkImage* image = surface->newImageSnapshot(); - image->draw(inputCanvas, 0, 0, NULL); + inputCanvas->drawImage(image, 0, 0, NULL); image->unref(); } #endif diff --git a/gm/image.cpp b/gm/image.cpp index a0959b2fdd..05a3fab2b4 100644 --- a/gm/image.cpp +++ b/gm/image.cpp @@ -30,7 +30,7 @@ static void drawJpeg(SkCanvas* canvas, const SkISize& size) { SkAutoCanvasRestore acr(canvas, true); canvas->scale(size.width() * 1.0f / image->width(), size.height() * 1.0f / image->height()); - image->draw(canvas, 0, 0, NULL); + canvas->drawImage(image, 0, 0, NULL); image->unref(); } } @@ -77,8 +77,8 @@ static void test_surface(SkCanvas* canvas, SkSurface* surf, bool usePaint) { // paint.setFilterBitmap(true); // paint.setAlpha(0x80); - imgR->draw(canvas, 0, 0, usePaint ? &paint : NULL); - imgG->draw(canvas, 0, 80, usePaint ? &paint : NULL); + canvas->drawImage(imgR, 0, 0, usePaint ? &paint : NULL); + canvas->drawImage(imgG, 0, 80, usePaint ? &paint : NULL); surf->draw(canvas, 0, 160, usePaint ? &paint : NULL); SkRect src1, src2, src3; @@ -93,10 +93,10 @@ static void test_surface(SkCanvas* canvas, SkSurface* surf, bool usePaint) { dst3.set(0, 400, 65, 465); dst4.set(0, 480, 65, 545); - imgR->draw(canvas, &src1, dst1, usePaint ? &paint : NULL); - imgG->draw(canvas, &src2, dst2, usePaint ? &paint : NULL); - imgR->draw(canvas, &src3, dst3, usePaint ? &paint : NULL); - imgG->draw(canvas, NULL, dst4, usePaint ? &paint : NULL); + canvas->drawImageRect(imgR, &src1, dst1, usePaint ? &paint : NULL); + canvas->drawImageRect(imgG, &src2, dst2, usePaint ? &paint : NULL); + canvas->drawImageRect(imgR, &src3, dst3, usePaint ? &paint : NULL); + canvas->drawImageRect(imgG, NULL, dst4, usePaint ? &paint : NULL); imgG->unref(); imgR->unref(); diff --git a/gm/multipicturedraw.cpp b/gm/multipicturedraw.cpp index a915acd625..75a4c89196 100644 --- a/gm/multipicturedraw.cpp +++ b/gm/multipicturedraw.cpp @@ -56,7 +56,7 @@ static const SkPicture* make_hex_plane_picture(SkColor fillColor) { SkPictureRecorder recorder; - SkCanvas* canvas = recorder.beginRecording(SkIntToScalar(kPicWidth), + SkCanvas* canvas = recorder.beginRecording(SkIntToScalar(kPicWidth), SkIntToScalar(kPicHeight)); SkScalar xPos, yPos = 0; @@ -138,7 +138,7 @@ static const SkPicture* make_sub_picture(const SkPicture* tri) { } // Create a Sierpinkski-like picture that starts with a top row with a picture -// that just contains a triangle. Subsequent rows take the prior row's picture, +// that just contains a triangle. Subsequent rows take the prior row's picture, // shrinks it and replicates it 3 times then draws and appropriate number of // copies of it. static const SkPicture* make_sierpinski_picture() { @@ -217,7 +217,7 @@ static void rrect_clip(SkCanvas* canvas, const SkPicture* pictures[kNumPictures] SkRect rect = pictures[0]->cullRect(); rect.inset(kInset, kInset); - + SkRRect rrect; rrect.setRectXY(rect, kInset, kInset); @@ -280,7 +280,7 @@ static void create_content(SkMultiPictureDraw* mpd, PFContentMtd pfGen, { SkPictureRecorder recorder; - SkCanvas* pictureCanvas = recorder.beginRecording(SkIntToScalar(kPicWidth), + SkCanvas* pictureCanvas = recorder.beginRecording(SkIntToScalar(kPicWidth), SkIntToScalar(kPicHeight)); (*pfGen)(pictureCanvas, pictures); @@ -291,13 +291,13 @@ static void create_content(SkMultiPictureDraw* mpd, PFContentMtd pfGen, mpd->add(dest, composite, &xform); } -typedef void(*PFLayoutMtd)(SkCanvas* finalCanvas, SkMultiPictureDraw* mpd, +typedef void(*PFLayoutMtd)(SkCanvas* finalCanvas, SkMultiPictureDraw* mpd, PFContentMtd pfGen, const SkPicture* pictures[kNumPictures], SkTArray<ComposeStep>* composeSteps); // Draw the content into a single canvas -static void simple(SkCanvas* finalCanvas, SkMultiPictureDraw* mpd, - PFContentMtd pfGen, +static void simple(SkCanvas* finalCanvas, SkMultiPictureDraw* mpd, + PFContentMtd pfGen, const SkPicture* pictures[kNumPictures], SkTArray<ComposeStep> *composeSteps) { @@ -312,7 +312,7 @@ static void simple(SkCanvas* finalCanvas, SkMultiPictureDraw* mpd, // Draw the content into multiple canvases/tiles static void tiled(SkCanvas* finalCanvas, SkMultiPictureDraw* mpd, - PFContentMtd pfGen, + PFContentMtd pfGen, const SkPicture* pictures[kNumPictures], SkTArray<ComposeStep> *composeSteps) { static const int kNumTilesX = 2; @@ -324,7 +324,7 @@ static void tiled(SkCanvas* finalCanvas, SkMultiPictureDraw* mpd, SkASSERT(kPicHeight == kNumTilesY * kTileHeight); static const SkColor colors[kNumTilesX][kNumTilesY] = { - { SK_ColorCYAN, SK_ColorMAGENTA }, + { SK_ColorCYAN, SK_ColorMAGENTA }, { SK_ColorYELLOW, SK_ColorGREEN } }; @@ -415,8 +415,8 @@ namespace skiagm { SkTArray<ComposeStep> composeSteps; // Fill up the MultiPictureDraw - (*gLayoutMthds[fLayout])(canvas, &mpd, - gContentMthds[fContent], + (*gLayoutMthds[fLayout])(canvas, &mpd, + gContentMthds[fContent], fPictures, &composeSteps); mpd.draw(); @@ -427,14 +427,14 @@ namespace skiagm { SkAutoTUnref<SkImage> image(step.fSurf->newImageSnapshot()); - image->draw(canvas, step.fX, step.fY, step.fPaint); + canvas->drawImage(image, step.fX, step.fY, step.fPaint); } } virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(kPicWidth, kPicHeight); } virtual SkString onShortName() SK_OVERRIDE { - static const char* gContentNames[] = { + static const char* gContentNames[] = { "noclip", "rectclip", "rrectclip", "pathclip", "invpathclip", "sierpinski" }; static const char* gLayoutNames[] = { "simple", "tiled" }; @@ -456,28 +456,28 @@ namespace skiagm { typedef GM INHERITED; }; - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kNoClipSingle_Content, + DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kNoClipSingle_Content, MultiPictureDraw::kSimple_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kRectClipMulti_Content, + DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kRectClipMulti_Content, MultiPictureDraw::kSimple_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kRRectClipMulti_Content, + DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kRRectClipMulti_Content, MultiPictureDraw::kSimple_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kPathClipMulti_Content, + DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kPathClipMulti_Content, MultiPictureDraw::kSimple_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kInvPathClipMulti_Content, + DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kInvPathClipMulti_Content, MultiPictureDraw::kSimple_Layout));) DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kSierpinski_Content, MultiPictureDraw::kSimple_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kNoClipSingle_Content, + DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kNoClipSingle_Content, MultiPictureDraw::kTiled_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kRectClipMulti_Content, + DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kRectClipMulti_Content, MultiPictureDraw::kTiled_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kRRectClipMulti_Content, + DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kRRectClipMulti_Content, MultiPictureDraw::kTiled_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kPathClipMulti_Content, + DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kPathClipMulti_Content, MultiPictureDraw::kTiled_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kInvPathClipMulti_Content, + DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kInvPathClipMulti_Content, MultiPictureDraw::kTiled_Layout));) DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kSierpinski_Content, MultiPictureDraw::kTiled_Layout));) |