aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/ColorFilterTest.cpp
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2015-08-27 07:41:13 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-27 07:41:16 -0700
commit96fcdcc219d2a0d3579719b84b28bede76efba64 (patch)
tree0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /tests/ColorFilterTest.cpp
parent435af2f736c85c3274a0c6760a3523810750d237 (diff)
Style Change: NULL->nullptr
Diffstat (limited to 'tests/ColorFilterTest.cpp')
-rw-r--r--tests/ColorFilterTest.cpp8
1 files changed, 4 insertions, 4 deletions
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<SkColorFilter> 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;
}