commit 96fcdcc219d2a0d3579719b84b28bede76efba64
author halcanary <halcanary@google.com> Thu Aug 27 07:41:13 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 27 07:41:16 2015 -0700
tree 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd
parent 435af2f736c85c3274a0c6760a3523810750d237

Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002

Review URL: https://codereview.chromium.org/1316233002

gm/drawatlas.cpp

diff --git a/gm/drawatlas.cpp b/gm/drawatlas.cpp
index 89bd49c..858e4bf 100644
--- a/gm/drawatlas.cpp
+++ b/gm/drawatlas.cpp
@@ -14,7 +14,7 @@
     static SkImage* MakeAtlas(SkCanvas* caller, const SkRect& target) {
         SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100);
         SkAutoTUnref<SkSurface> surface(caller->newSurface(info));
-        if (NULL == surface) {
+        if (nullptr == surface) {
             surface.reset(SkSurface::NewRaster(info));
         }
         SkCanvas* canvas = surface->getCanvas();
@@ -28,7 +28,7 @@
         r.inset(-1, -1);
         // zero out a place (with a 1-pixel border) to land our drawing.
         canvas->drawRect(r, paint);
-        paint.setXfermode(NULL);
+        paint.setXfermode(nullptr);
         paint.setColor(SK_ColorBLUE);
         paint.setAntiAlias(true);
         canvas->drawOval(target, paint);
@@ -52,7 +52,7 @@
     
     void onDraw(SkCanvas* canvas) override {
         const SkRect target = { 50, 50, 80, 90 };
-        if (NULL == fAtlas) {
+        if (nullptr == fAtlas) {
             fAtlas.reset(MakeAtlas(canvas, target));
         }
 
@@ -91,9 +91,9 @@
         paint.setFilterQuality(kLow_SkFilterQuality);
         paint.setAntiAlias(true);
 
-        canvas->drawAtlas(fAtlas, xform, tex, N, NULL, &paint);
+        canvas->drawAtlas(fAtlas, xform, tex, N, nullptr, &paint);
         canvas->translate(0, 100);
-        canvas->drawAtlas(fAtlas, xform, tex, colors, N, SkXfermode::kSrcIn_Mode, NULL, &paint);
+        canvas->drawAtlas(fAtlas, xform, tex, colors, N, SkXfermode::kSrcIn_Mode, nullptr, &paint);
     }
     
 private: