diff options
author | borenet <borenet@google.com> | 2014-09-24 11:03:35 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-24 11:03:35 -0700 |
commit | 2456b7681aea8d91072186b17f8209955846f2f7 (patch) | |
tree | 9dabc7c1da1747c5ceef289b14fa5f3ee5b56f46 /gm/multipicturedraw.cpp | |
parent | d632ea4b9eec5be3f83a9fa4982a30202e1239a7 (diff) |
Revert of SkCanvas::drawImage is the new way for drawing an SkImage to a Canvas (patchset #9 id:160001 of https://codereview.chromium.org/583453002/)
Reason for revert:
Broke ChromiumOS Ozone builder: http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Ozone%20Builder/builds/4087/steps/compile/logs/stdio
Reverting to unblock DEPS roll.
Original issue's description:
> SkCanvas::drawImage is the new way for drawing a SkImage to a Canvas
>
> BUG=skia:2947
>
> Committed: https://skia.googlesource.com/skia/+/432789972c1e1f8a66165c75a250dba1853efa08
R=junov@chromium.org, reed@google.com, bsalomon@google.com, piotaixr@chromium.org
TBR=bsalomon@google.com, junov@chromium.org, piotaixr@chromium.org, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2947
Author: borenet@google.com
Review URL: https://codereview.chromium.org/598133002
Diffstat (limited to 'gm/multipicturedraw.cpp')
-rw-r--r-- | gm/multipicturedraw.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/gm/multipicturedraw.cpp b/gm/multipicturedraw.cpp index 75a4c89196..a915acd625 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()); - canvas->drawImage(image, step.fX, step.fY, step.fPaint); + image->draw(canvas, 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));) |