From 96fcdcc219d2a0d3579719b84b28bede76efba64 Mon Sep 17 00:00:00 2001 From: halcanary Date: Thu, 27 Aug 2015 07:41:13 -0700 Subject: Style Change: NULL->nullptr DOCS_PREVIEW= https://skia.org/?cl=1316233002 Review URL: https://codereview.chromium.org/1316233002 --- tests/BitmapTest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/BitmapTest.cpp') diff --git a/tests/BitmapTest.cpp b/tests/BitmapTest.cpp index 2567256667..4d68e73dbe 100644 --- a/tests/BitmapTest.cpp +++ b/tests/BitmapTest.cpp @@ -16,17 +16,17 @@ static void test_peekpixels(skiatest::Reporter* reporter) { SkBitmap bm; // empty should return false - REPORTER_ASSERT(reporter, !bm.peekPixels(NULL)); + REPORTER_ASSERT(reporter, !bm.peekPixels(nullptr)); REPORTER_ASSERT(reporter, !bm.peekPixels(&pmap)); // no pixels should return false bm.setInfo(SkImageInfo::MakeN32Premul(10, 10)); - REPORTER_ASSERT(reporter, !bm.peekPixels(NULL)); + REPORTER_ASSERT(reporter, !bm.peekPixels(nullptr)); REPORTER_ASSERT(reporter, !bm.peekPixels(&pmap)); // real pixels should return true bm.allocPixels(info); - REPORTER_ASSERT(reporter, bm.peekPixels(NULL)); + REPORTER_ASSERT(reporter, bm.peekPixels(nullptr)); REPORTER_ASSERT(reporter, bm.peekPixels(&pmap)); REPORTER_ASSERT(reporter, pmap.info() == bm.info()); REPORTER_ASSERT(reporter, pmap.addr() == bm.getPixels()); @@ -43,7 +43,7 @@ static void test_bigalloc(skiatest::Reporter* reporter) { SkBitmap bm; REPORTER_ASSERT(reporter, !bm.tryAllocPixels(info)); - SkPixelRef* pr = SkMallocPixelRef::NewAllocate(info, info.minRowBytes(), NULL); + SkPixelRef* pr = SkMallocPixelRef::NewAllocate(info, info.minRowBytes(), nullptr); REPORTER_ASSERT(reporter, !pr); } -- cgit v1.2.3