diff options
| author |  halcanary <halcanary@google.com> | 2015-08-26 13:07:48 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-26 13:07:49 -0700 |
| commit | 385fe4d4b62d7d1dd76116dd570df3290a2f487b (patch) | |
| tree | 53d982ff238828331e86acd44071a44162a8688c /gm/multipicturedraw.cpp | |
| parent | 5015176adf046ef906a2313b6e6b64b72cc84898 (diff) | |
Style Change: SkNEW->new; SkDELETE->delete
DOCS_PREVIEW= https://skia.org/?cl=1316123003
Review URL: https://codereview.chromium.org/1316123003
Diffstat (limited to 'gm/multipicturedraw.cpp')
| -rw-r--r-- | gm/multipicturedraw.cpp | 65 |
1 files changed, 34 insertions, 31 deletions
diff --git a/gm/multipicturedraw.cpp b/gm/multipicturedraw.cpp index 21c9d187b3..3a0b0fa7d9 100644 --- a/gm/multipicturedraw.cpp +++ b/gm/multipicturedraw.cpp @@ -258,7 +258,10 @@ static SkSurface* create_compat_surface(SkCanvas* canvas, int width, int height) class ComposeStep { public: ComposeStep() : fSurf(NULL), fX(0.0f), fY(0.0f), fPaint(NULL) { } - ~ComposeStep() { SkSafeUnref(fSurf); SkDELETE(fPaint); } + ~ComposeStep() { + SkSafeUnref(fSurf); + delete fPaint; + } SkSurface* fSurf; SkScalar fX; @@ -415,7 +418,7 @@ static void tiled(SkCanvas* finalCanvas, SkMultiPictureDraw* mpd, step.fX = SkIntToScalar(x*kTileWidth); step.fY = SkIntToScalar(y*kTileHeight); - step.fPaint = SkNEW(SkPaint); + step.fPaint = new SkPaint; step.fPaint->setColorFilter( SkColorFilter::CreateModeFilter(colors[x][y], SkXfermode::kModulate_Mode))->unref(); @@ -540,33 +543,33 @@ namespace skiagm { typedef GM INHERITED; }; - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kNoClipSingle_Content, - MultiPictureDraw::kSimple_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kRectClipMulti_Content, - MultiPictureDraw::kSimple_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kRRectClipMulti_Content, - MultiPictureDraw::kSimple_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kPathClipMulti_Content, - MultiPictureDraw::kSimple_Layout));) - 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::kBigLayer_Content, - MultiPictureDraw::kSimple_Layout));) - - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kNoClipSingle_Content, - MultiPictureDraw::kTiled_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kRectClipMulti_Content, - MultiPictureDraw::kTiled_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kRRectClipMulti_Content, - MultiPictureDraw::kTiled_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kPathClipMulti_Content, - MultiPictureDraw::kTiled_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kInvPathClipMulti_Content, - MultiPictureDraw::kTiled_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kSierpinski_Content, - MultiPictureDraw::kTiled_Layout));) - DEF_GM(return SkNEW_ARGS(MultiPictureDraw, (MultiPictureDraw::kBigLayer_Content, - MultiPictureDraw::kTiled_Layout));) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kNoClipSingle_Content, + MultiPictureDraw::kSimple_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kRectClipMulti_Content, + MultiPictureDraw::kSimple_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kRRectClipMulti_Content, + MultiPictureDraw::kSimple_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kPathClipMulti_Content, + MultiPictureDraw::kSimple_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kInvPathClipMulti_Content, + MultiPictureDraw::kSimple_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kSierpinski_Content, + MultiPictureDraw::kSimple_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kBigLayer_Content, + MultiPictureDraw::kSimple_Layout);) + + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kNoClipSingle_Content, + MultiPictureDraw::kTiled_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kRectClipMulti_Content, + MultiPictureDraw::kTiled_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kRRectClipMulti_Content, + MultiPictureDraw::kTiled_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kPathClipMulti_Content, + MultiPictureDraw::kTiled_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kInvPathClipMulti_Content, + MultiPictureDraw::kTiled_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kSierpinski_Content, + MultiPictureDraw::kTiled_Layout);) + DEF_GM(return new MultiPictureDraw(MultiPictureDraw::kBigLayer_Content, + MultiPictureDraw::kTiled_Layout);) } |