diff options
| author |  halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
| commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
| tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /gm/drawatlascolor.cpp | |
| parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) | |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'gm/drawatlascolor.cpp')
| -rw-r--r-- | gm/drawatlascolor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/drawatlascolor.cpp b/gm/drawatlascolor.cpp index a04822f033..b5f9d7a285 100644 --- a/gm/drawatlascolor.cpp +++ b/gm/drawatlascolor.cpp @@ -20,7 +20,7 @@ static SkImage* make_atlas(SkCanvas* caller, int atlasSize) { SkImageInfo info = SkImageInfo::MakeN32Premul(atlasSize, atlasSize); SkAutoTUnref<SkSurface> surface(caller->newSurface(info)); - if (NULL == surface) { + if (nullptr == surface) { surface.reset(SkSurface::NewRaster(info)); } SkCanvas* canvas = surface->getCanvas(); @@ -72,7 +72,7 @@ protected: void onDraw(SkCanvas* canvas) override { const SkRect target = SkRect::MakeWH(SkIntToScalar(kAtlasSize), SkIntToScalar(kAtlasSize)); - if (NULL == fAtlas) { + if (nullptr == fAtlas) { fAtlas.reset(make_atlas(canvas, kAtlasSize)); } @@ -138,7 +138,7 @@ protected: SkPaint textP; textP.setTextSize(SkIntToScalar(kTextPad)); textP.setAntiAlias(true); - sk_tool_utils::set_portable_typeface(&textP, NULL); + sk_tool_utils::set_portable_typeface(&textP, nullptr); for (int i = 0; i < numModes; ++i) { canvas->drawText(gModes[i].fLabel, strlen(gModes[i].fLabel), @@ -152,11 +152,11 @@ protected: SkIntToScalar(kTextPad+kPad)); // w/o a paint canvas->drawAtlas(fAtlas, xforms, rects, quadColors, numColors, - gModes[i].fMode, NULL, NULL); + gModes[i].fMode, nullptr, nullptr); canvas->translate(0.0f, numColors*(target.height()+kPad)); // w a paint canvas->drawAtlas(fAtlas, xforms, rects, quadColors, numColors, - gModes[i].fMode, NULL, &paint); + gModes[i].fMode, nullptr, &paint); canvas->restore(); } } |