diff options
| author |  halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
| commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
| tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /tests/ClipStackTest.cpp | |
| parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) | |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'tests/ClipStackTest.cpp')
| -rw-r--r-- | tests/ClipStackTest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp index 662e68040e..a18d1efe06 100644 --- a/tests/ClipStackTest.cpp +++ b/tests/ClipStackTest.cpp @@ -144,7 +144,7 @@ static void test_iterators(skiatest::Reporter* reporter) { // bottom to top iteration { - const SkClipStack::Element* element = NULL; + const SkClipStack::Element* element = nullptr; SkClipStack::B2TIter iter(stack); int i; @@ -159,7 +159,7 @@ static void test_iterators(skiatest::Reporter* reporter) { // top to bottom iteration { - const SkClipStack::Element* element = NULL; + const SkClipStack::Element* element = nullptr; SkClipStack::Iter iter(stack, SkClipStack::Iter::kTop_IterStart); int i; @@ -174,7 +174,7 @@ static void test_iterators(skiatest::Reporter* reporter) { // skipToTopmost { - const SkClipStack::Element* element = NULL; + const SkClipStack::Element* element = nullptr; SkClipStack::Iter iter(stack, SkClipStack::Iter::kBottom_IterStart); @@ -383,7 +383,7 @@ static int count(const SkClipStack& stack) { SkClipStack::Iter iter(stack, SkClipStack::Iter::kTop_IterStart); - const SkClipStack::Element* element = NULL; + const SkClipStack::Element* element = nullptr; int count = 0; for (element = iter.prev(); element; element = iter.prev(), ++count) { @@ -964,7 +964,7 @@ static void test_reduced_clip_stack(skiatest::Reporter* reporter) { int32_t reducedGenID; GrReducedClip::InitialState initial; SkIRect tBounds(inflatedIBounds); - SkIRect* tightBounds = r.nextBool() ? &tBounds : NULL; + SkIRect* tightBounds = r.nextBool() ? &tBounds : nullptr; GrReducedClip::ReduceClipStack(stack, inflatedIBounds, &reducedClips, @@ -1129,7 +1129,7 @@ static void test_reduced_clip_stack_genid(skiatest::Reporter* reporter) { &reducedClips, &reducedGenID, &initial, - testCases[i].tighterBounds.isEmpty() ? NULL : &tightBounds); + testCases[i].tighterBounds.isEmpty() ? nullptr : &tightBounds); REPORTER_ASSERT(reporter, reducedClips.count() == testCases[i].reducedClipCount); SkASSERT(reducedClips.count() == testCases[i].reducedClipCount); |