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/ColorFilterTest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/ColorFilterTest.cpp') diff --git a/tests/ColorFilterTest.cpp b/tests/ColorFilterTest.cpp index d0b0d77ed4..ee8f12b2fb 100644 --- a/tests/ColorFilterTest.cpp +++ b/tests/ColorFilterTest.cpp @@ -42,12 +42,12 @@ static void test_composecolorfilter_limit(skiatest::Reporter* reporter) { for (int i = 2; i < way_too_many; ++i) { SkAutoTUnref filter(make_filter()); parent.reset(SkColorFilter::CreateComposeFilter(parent, filter)); - if (NULL == parent) { + if (nullptr == parent) { REPORTER_ASSERT(reporter, i > 2); // we need to have succeeded at least once! return; } } - REPORTER_ASSERT(reporter, false); // we never saw a NULL :( + REPORTER_ASSERT(reporter, false); // we never saw a nullptr :( } #define ILLEGAL_MODE ((SkXfermode::Mode)-1) @@ -59,14 +59,14 @@ DEF_TEST(ColorFilter, reporter) { SkColor color = rand.nextU(); // ensure we always get a filter, by avoiding the possibility of a - // special case that would return NULL (if color's alpha is 0 or 0xFF) + // special case that would return nullptr (if color's alpha is 0 or 0xFF) color = SkColorSetA(color, 0x7F); SkColorFilter* cf = SkColorFilter::CreateModeFilter(color, (SkXfermode::Mode)mode); // allow for no filter if we're in Dst mode (its a no op) - if (SkXfermode::kDst_Mode == mode && NULL == cf) { + if (SkXfermode::kDst_Mode == mode && nullptr == cf) { continue; } -- cgit v1.2.3