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

samplecode/SamplePicture.cpp

diff --git a/samplecode/SamplePicture.cpp b/samplecode/SamplePicture.cpp
index 638af05..eb2cd73 100644
--- a/samplecode/SamplePicture.cpp
+++ b/samplecode/SamplePicture.cpp
@@ -39,7 +39,7 @@
     SkBitmap bm;
     SkString pngFilename = GetResourcePath("mandrill_512.png");
     SkAutoDataUnref data(SkData::NewFromFileName(pngFilename.c_str()));
-    if (data.get() != NULL) {
+    if (data.get() != nullptr) {
         SkInstallDiscardablePixelRef(data, &bm);
     }
     return bm;
@@ -63,14 +63,14 @@
 
         SkPictureRecorder recorder;
 
-        recorder.beginRecording(100, 100, NULL, 0);
+        recorder.beginRecording(100, 100, nullptr, 0);
         fSubPicture = recorder.endRecording();
 
-        SkCanvas* canvas = recorder.beginRecording(100, 100, NULL, 0);
+        SkCanvas* canvas = recorder.beginRecording(100, 100, nullptr, 0);
         SkPaint paint;
         paint.setAntiAlias(true);
 
-        canvas->drawBitmap(fBitmap, 0, 0, NULL);
+        canvas->drawBitmap(fBitmap, 0, 0, nullptr);
 
         drawCircle(canvas, 50, SK_ColorBLACK);
         canvas->drawPicture(fSubPicture);
@@ -108,7 +108,7 @@
 
         canvas->save();
         canvas->scale(0.5f, 0.5f);
-        canvas->drawBitmap(fBitmap, 0, 0, NULL);
+        canvas->drawBitmap(fBitmap, 0, 0, nullptr);
         canvas->restore();
 
         paint.setAntiAlias(true);
@@ -127,7 +127,7 @@
         this->drawSomething(canvas);
 
         SkPictureRecorder recorder;
-        this->drawSomething(recorder.beginRecording(100, 100, NULL, 0));
+        this->drawSomething(recorder.beginRecording(100, 100, nullptr, 0));
         SkAutoTUnref<SkPicture> pict(recorder.endRecording());
 
         canvas->save();
@@ -161,7 +161,7 @@
 
     bool onEvent(const SkEvent& evt) override {
         if (evt.isType(INVAL_ALL_TYPE)) {
-            this->inval(NULL);
+            this->inval(nullptr);
             return true;
         }
         return this->INHERITED::onEvent(evt);