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 /tools/PictureRenderer.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 'tools/PictureRenderer.cpp')
-rw-r--r-- | tools/PictureRenderer.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp index 34b08f567c..ee8e981a39 100644 --- a/tools/PictureRenderer.cpp +++ b/tools/PictureRenderer.cpp @@ -131,7 +131,7 @@ SkCanvas* PictureRenderer::setupCanvas(int width, int height) { case kBitmap_DeviceType: { SkBitmap bitmap; sk_tools::setup_bitmap(&bitmap, width, height); - canvas.reset(SkNEW_ARGS(SkCanvas, (bitmap))); + canvas.reset(new SkCanvas(bitmap)); } break; #if SK_SUPPORT_GPU @@ -165,7 +165,7 @@ SkCanvas* PictureRenderer::setupCanvas(int width, int height) { if (!device) { return NULL; } - canvas.reset(SkNEW_ARGS(SkCanvas, (device))); + canvas.reset(new SkCanvas(device)); break; } #endif @@ -179,7 +179,7 @@ SkCanvas* PictureRenderer::setupCanvas(int width, int height) { canvas->setAllowSoftClip(false); } - canvas.reset(SkNEW_ARGS(FlagsFilterCanvas, (canvas.get(), fDrawFilters))); + canvas.reset(new FlagsFilterCanvas(canvas.get(), fDrawFilters)); } this->scaleToScaleFactor(canvas); @@ -408,7 +408,7 @@ bool PipePictureRenderer::render(SkBitmap** out) { writer.endRecording(); fCanvas->flush(); if (out) { - *out = SkNEW(SkBitmap); + *out = new SkBitmap; setup_bitmap(*out, SkScalarCeilToInt(fPicture->cullRect().width()), SkScalarCeilToInt(fPicture->cullRect().height())); fCanvas->readPixels(*out, 0, 0); @@ -453,7 +453,7 @@ bool SimplePictureRenderer::render(SkBitmap** out) { } fCanvas->flush(); if (out) { - *out = SkNEW(SkBitmap); + *out = new SkBitmap; setup_bitmap(*out, SkScalarCeilToInt(fPicture->cullRect().width()), SkScalarCeilToInt(fPicture->cullRect().height())); fCanvas->readPixels(*out, 0, 0); @@ -694,7 +694,7 @@ bool TiledPictureRenderer::render(SkBitmap** out) { SkBitmap bitmap; if (out) { - *out = SkNEW(SkBitmap); + *out = new SkBitmap; setup_bitmap(*out, SkScalarCeilToInt(fPicture->cullRect().width()), SkScalarCeilToInt(fPicture->cullRect().height())); setup_bitmap(&bitmap, fTileWidth, fTileHeight); @@ -794,7 +794,7 @@ SkString TiledPictureRenderer::getConfigNameInternal() { void PlaybackCreationRenderer::setup() { SkAutoTDelete<SkBBHFactory> factory(this->getFactory()); - fRecorder.reset(SkNEW(SkPictureRecorder)); + fRecorder.reset(new SkPictureRecorder); SkCanvas* canvas = fRecorder->beginRecording(SkIntToScalar(this->getViewWidth()), SkIntToScalar(this->getViewHeight()), factory.get(), @@ -821,7 +821,7 @@ SkBBHFactory* PictureRenderer::getFactory() { case kNone_BBoxHierarchyType: return NULL; case kRTree_BBoxHierarchyType: - return SkNEW(SkRTreeFactory); + return new SkRTreeFactory; } SkASSERT(0); // invalid bbhType return NULL; |