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

tests/PixelRefTest.cpp

diff --git a/tests/PixelRefTest.cpp b/tests/PixelRefTest.cpp
index 775354c..01e2ce5 100644
--- a/tests/PixelRefTest.cpp
+++ b/tests/PixelRefTest.cpp
@@ -23,21 +23,21 @@
 
     info = SkImageInfo::MakeN32Premul(0, 0);
     release_counter = 1;
-    success = bm.installPixels(info, NULL, 0, NULL, decrement_counter_proc, &release_counter);
+    success = bm.installPixels(info, nullptr, 0, nullptr, decrement_counter_proc, &release_counter);
     REPORTER_ASSERT(reporter, true == success);
     bm.reset();
     REPORTER_ASSERT(reporter, 0 == release_counter);
 
     info = SkImageInfo::MakeN32Premul(10, 10);
     release_counter = 1;
-    success = bm.installPixels(info, NULL, 0, NULL, decrement_counter_proc, &release_counter);
+    success = bm.installPixels(info, nullptr, 0, nullptr, decrement_counter_proc, &release_counter);
     REPORTER_ASSERT(reporter, true == success);
     bm.reset();
     REPORTER_ASSERT(reporter, 0 == release_counter);
 
     info = SkImageInfo::MakeN32Premul(-10, -10);
     release_counter = 1;
-    success = bm.installPixels(info, NULL, 0, NULL, decrement_counter_proc, &release_counter);
+    success = bm.installPixels(info, nullptr, 0, nullptr, decrement_counter_proc, &release_counter);
     REPORTER_ASSERT(reporter, false == success);
     bm.reset();
     REPORTER_ASSERT(reporter, 0 == release_counter);
@@ -48,12 +48,12 @@
     SkImageInfo info = SkImageInfo::MakeN32Premul(0, 0);
     SkBitmap bm;
     // make sure we don't assert on an empty install
-    success = bm.installPixels(info, NULL, 0);
+    success = bm.installPixels(info, nullptr, 0);
     REPORTER_ASSERT(reporter, success);
 
     // no pixels should be the same as setInfo()
     info = SkImageInfo::MakeN32Premul(10, 10);
-    success = bm.installPixels(info, NULL, 0);
+    success = bm.installPixels(info, nullptr, 0);
     REPORTER_ASSERT(reporter, success);
 
 }
@@ -69,7 +69,7 @@
 DEF_TEST(PixelRef_GenIDChange, r) {
     SkImageInfo info = SkImageInfo::MakeN32Premul(10, 10);
 
-    SkAutoTUnref<SkPixelRef> pixelRef(SkMallocPixelRef::NewAllocate(info, 0, NULL));
+    SkAutoTUnref<SkPixelRef> pixelRef(SkMallocPixelRef::NewAllocate(info, 0, nullptr));
 
     // Register a listener.
     int count = 0;
@@ -94,9 +94,9 @@
     pixelRef->notifyPixelsChanged();
     REPORTER_ASSERT(r, 1 == count);
 
-    // Quick check that NULL is safe.
+    // Quick check that nullptr is safe.
     REPORTER_ASSERT(r, 0 != pixelRef->getGenerationID());
-    pixelRef->addGenIDChangeListener(NULL);
+    pixelRef->addGenIDChangeListener(nullptr);
     pixelRef->notifyPixelsChanged();
 
     test_install(r);