Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: tests/ClipStackTest.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tests/ClipCacheTest.cpp ('k') | tests/CodexTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/ClipStackTest.cpp
diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp
index 662e68040e71db3a1064235f3195d223c385f87f..a18d1efe06656e6d2dbcfd8f43ea59b28225d410 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);
« no previous file with comments | « tests/ClipCacheTest.cpp ('k') | tests/CodexTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698